ntwb / wordpress

src/wp-includes/functions.php

Switch Indentation +20 added lines, -20 removed lines

@@ -2440,15 +2440,15 @@ 
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
-		case 0 :
-			$message = '';
-			break;
-		case 1 :
-			$message = "<p>{$errors[0]}</p>";
-			break;
-		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
-			break;
+			case 0 :
+				$message = '';
+				break;
+			case 1 :
+				$message = "<p>{$errors[0]}</p>";
+				break;
+			default :
+				$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+				break;
 		}
 	} elseif ( is_string( $message ) ) {
 		$message = "<p>$message</p>";
@@ -4447,17 +4447,17 @@ 
  */
 function _wp_mysql_week( $column ) {
 	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
-	case 1 :
-		return "WEEK( $column, 1 )";
-	case 2 :
-	case 3 :
-	case 4 :
-	case 5 :
-	case 6 :
-		return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
-	case 0 :
-	default :
-		return "WEEK( $column, 0 )";
+		case 1 :
+			return "WEEK( $column, 1 )";
+		case 2 :
+		case 3 :
+		case 4 :
+		case 5 :
+		case 6 :
+			return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+		case 0 :
+		default :
+			return "WEEK( $column, 0 )";
 	}
 }
 

Indentation +29 added lines, -29 removed lines

@@ -3245,7 +3245,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",
@@ -3254,36 +3254,36 @@ 
 		   ':razz:' => "\xf0\x9f\x98\x9b",
 		   ':roll:' => "\xf0\x9f\x99\x84",
 		   ':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",
 		);
 	}
 

Doc Comments +8 added lines, -11 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 ) {
@@ -436,7 +436,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 ) )
@@ -771,9 +771,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() {
@@ -1428,7 +1425,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.
  */
@@ -1457,7 +1454,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.
@@ -1549,7 +1546,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'] ) ) {
@@ -1861,7 +1858,7 @@ 
  * @param bool   $create_dir Optional. Whether to check and create the uploads directory.
  *                           Default true for backward compatibility.
  * @param bool   $refresh_cache Optional. Whether to refresh the cache. Default false.
- * @return array See above for description.
+ * @return callable|null See above for description.
  */
 function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false ) {
 	static $cache = array(), $tested_paths = array();
@@ -4692,7 +4689,7 @@ 
  *
  * @see __return_false()
  *
- * @return true True.
+ * @return boolean True.
  */
 function __return_true() {
 	return true;
@@ -4814,7 +4811,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() ) {

Spacing +1058 added lines, -1058 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,12 +86,12 @@ 
  *
  * @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 ) {
-		$i = current_time( 'timestamp', $gmt );
+	if (false === $i) {
+		$i = current_time('timestamp', $gmt);
 	}
 
 	/*
@@ -100,41 +100,41 @@ 
 	 */
 	$req_format = $dateformatstring;
 
-	if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-		$datemonth = $wp_locale->get_month( date( 'm', $i ) );
-		$datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-		$dateweekday = $wp_locale->get_weekday( date( 'w', $i ) );
-		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-		$datemeridiem = $wp_locale->get_meridiem( date( 'a', $i ) );
-		$datemeridiem_capital = $wp_locale->get_meridiem( date( 'A', $i ) );
+	if (( ! empty($wp_locale->month)) && ( ! empty($wp_locale->weekday))) {
+		$datemonth = $wp_locale->get_month(date('m', $i));
+		$datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+		$dateweekday = $wp_locale->get_weekday(date('w', $i));
+		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+		$datemeridiem = $wp_locale->get_meridiem(date('a', $i));
+		$datemeridiem_capital = $wp_locale->get_meridiem(date('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 = @date( $dateformatstring, $i );
+	$j = @date($dateformatstring, $i);
 
 	/**
 	 * Filters the date formatted based on the locale.
@@ -146,7 +146,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;
 }
 
@@ -163,41 +163,41 @@ 
  * @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}\.? [^\d ]+#u', $date ) ) {
+		if (@preg_match('#^\d{1,2}\.? [^\d ]+#u', $date)) {
 			$months          = $wp_locale->month;
 			$months_genitive = $wp_locale->month_genitive;
 
-			foreach ( $months as $key => $month ) {
-				$months[ $key ] = '# ' . $month . '( |$)#u';
+			foreach ($months as $key => $month) {
+				$months[$key] = '# '.$month.'( |$)#u';
 			}
 
-			foreach ( $months_genitive as $key => $month ) {
-				$months_genitive[ $key ] = ' ' . $month . '$1';
+			foreach ($months_genitive as $key => $month) {
+				$months_genitive[$key] = ' '.$month.'$1';
 			}
 
-			$date = preg_replace( $months, $months_genitive, $date );
+			$date = preg_replace($months, $months_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;
@@ -214,13 +214,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));
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 *
 	 * @param string $formatted Converted number in string format.
 	 */
-	return apply_filters( 'number_format_i18n', $formatted );
+	return apply_filters('number_format_i18n', $formatted);
 }
 
 /**
@@ -253,7 +253,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,
@@ -262,13 +262,13 @@ 
 		'B'  => 1,
 	);
 
-	if ( 0 === $bytes ) {
-		return number_format_i18n( 0, $decimals ) . ' B';
+	if (0 === $bytes) {
+		return number_format_i18n(0, $decimals).' B';
 	}
 
-	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;
 		}
 	}
 
@@ -284,34 +284,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');
 }
 
 /**
@@ -322,9 +322,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;
 }
 
@@ -340,57 +340,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;
 }
@@ -403,21 +403,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;
@@ -432,15 +432,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;
 }
@@ -458,9 +458,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;
@@ -482,11 +482,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;
 	}
@@ -501,10 +501,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;
 }
 
@@ -516,7 +516,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-]+:)?//?)"
@@ -534,9 +534,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);
 }
 
 /**
@@ -553,34 +553,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;
 		}
 	}
@@ -596,24 +596,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;
 							}
@@ -621,8 +621,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");
 				}
 			}
 		}
@@ -638,16 +638,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.0' );
+function wp_get_http_headers($url, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7.0');
 
-	$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);
 }
 
 /**
@@ -663,7 +663,7 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
+	if ($currentday != $previousday)
 		return 1;
 	else
 		return 0;
@@ -684,8 +684,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);
 }
 
 /**
@@ -706,30 +706,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);
@@ -772,64 +772,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;
 }
 
@@ -842,13 +842,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);
 }
 
 /**
@@ -892,7 +892,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);
 }
 
 /**
@@ -903,12 +903,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;
@@ -924,21 +924,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);
 }
 
 /**
@@ -952,11 +952,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;
 }
 
@@ -970,12 +970,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',
@@ -1043,7 +1043,7 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
+	if (isset($wp_header_to_desc[$code]))
 		return $wp_header_to_desc[$code];
 	else
 		return '';
@@ -1060,18 +1060,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'))
 
 		/**
 		 * Filters an HTTP status header.
@@ -1083,9 +1083,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);
 }
 
 /**
@@ -1104,7 +1104,7 @@ 
 		'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
 	);
 
-	if ( function_exists('apply_filters') ) {
+	if (function_exists('apply_filters')) {
 		/**
 		 * Filters the cache-controlling headers.
 		 *
@@ -1119,7 +1119,7 @@ 
 		 *     @type string $Cache-Control Cache-Control header.
 		 * }
 		 */
-		$headers = (array) apply_filters( 'nocache_headers', $headers );
+		$headers = (array) apply_filters('nocache_headers', $headers);
 	}
 	$headers['Last-Modified'] = false;
 	return $headers;
@@ -1139,23 +1139,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}");
 }
 
@@ -1167,9 +1167,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");
 }
 
 /**
@@ -1196,8 +1196,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');
 }
 
 /**
@@ -1215,16 +1215,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));
 	}
 
 	/**
@@ -1239,7 +1239,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);
 }
 
 /**
@@ -1250,7 +1250,7 @@ 
  * @see load_template()
  */
 function do_feed_rdf() {
-	load_template( ABSPATH . WPINC . '/feed-rdf.php' );
+	load_template(ABSPATH.WPINC.'/feed-rdf.php');
 }
 
 /**
@@ -1261,7 +1261,7 @@ 
  * @see load_template()
  */
 function do_feed_rss() {
-	load_template( ABSPATH . WPINC . '/feed-rss.php' );
+	load_template(ABSPATH.WPINC.'/feed-rss.php');
 }
 
 /**
@@ -1273,11 +1273,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');
 }
 
 /**
@@ -1289,11 +1289,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');
 }
 
 /**
@@ -1305,22 +1305,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";
 	}
@@ -1333,7 +1333,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);
 }
 
 /**
@@ -1358,28 +1358,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();
@@ -1390,14 +1390,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.
@@ -1407,16 +1407,16 @@ 
 		// Die with a DB error.
 		$wpdb->error = sprintf(
 			/* translators: %s: database repair URL */
-			__( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ),
+			__('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;
 }
@@ -1431,9 +1431,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));
 }
 
 /**
@@ -1462,14 +1462,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;
@@ -1486,10 +1486,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;
 }
@@ -1508,12 +1508,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;
 }
@@ -1528,14 +1528,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;
@@ -1551,10 +1551,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;
@@ -1568,8 +1568,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;
 }
 
@@ -1583,20 +1583,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;
 	}
 
 	/*
@@ -1604,35 +1604,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);
 			}
 		}
 
@@ -1652,23 +1652,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] == '\\');
 }
 
 /**
@@ -1683,11 +1683,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, '/');
 }
 
 /**
@@ -1705,11 +1705,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;
 }
@@ -1732,24 +1732,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/';
@@ -1768,11 +1768,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);
 }
 
 /**
@@ -1791,21 +1791,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;
 }
 
@@ -1823,7 +1823,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);
 }
 
 /**
@@ -1862,13 +1862,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(), $tested_paths = 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);
 	}
 
 	/**
@@ -1879,29 +1879,29 @@ 
 	 * @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'];
 
-		if ( array_key_exists( $path, $tested_paths ) ) {
-			$uploads['error'] = $tested_paths[ $path ];
+		if (array_key_exists($path, $tested_paths)) {
+			$uploads['error'] = $tested_paths[$path];
 		} else {
-			if ( ! wp_mkdir_p( $path ) ) {
-				if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-					$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+			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(
 					/* translators: %s: directory path */
-					__( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
-					esc_html( $error_path )
+					__('Unable to create directory %s. Is its parent directory writable by the server?'),
+					esc_html($error_path)
 				);
 			}
 
-			$tested_paths[ $path ] = $uploads['error'];
+			$tested_paths[$path] = $uploads['error'];
 		}
 	}
 
@@ -1917,39 +1917,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
@@ -1959,15 +1959,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:
@@ -1982,11 +1982,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';
 		}
 	}
 
@@ -1994,12 +1994,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";
 	}
 
@@ -2033,19 +2033,19 @@ 
  * @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.
-	$ext = pathinfo( $filename, PATHINFO_EXTENSION );
-	$name = pathinfo( $filename, PATHINFO_BASENAME );
-	if ( $ext ) {
-		$ext = '.' . $ext;
+	$ext = pathinfo($filename, PATHINFO_EXTENSION);
+	$name = pathinfo($filename, PATHINFO_BASENAME);
+	if ($ext) {
+		$ext = '.'.$ext;
 	}
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext ) {
+	if ($name === $ext) {
 		$name = '';
 	}
 
@@ -2053,21 +2053,21 @@ 
 	 * 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 = (int) $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;
 			}
 
@@ -2081,22 +2081,22 @@ 
 			 * @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" ) ) {
+		while (file_exists($dir."/$filename")) {
 			$new_number = (int) $number + 1;
-			if ( '' == "$number$ext" ) {
-				$filename = "$filename-" . $new_number;
+			if ('' == "$number$ext") {
+				$filename = "$filename-".$new_number;
 			} else {
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . $new_number . $ext, $filename );
+				$filename = str_replace(array("-$number$ext", "$number$ext"), "-".$new_number.$ext, $filename);
 			}
 			$number = $new_number;
 		}
 	}
 
 	/** 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);
 }
 
 /**
@@ -2122,20 +2122,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.0' );
+function wp_upload_bits($name, $deprecated, $bits, $time = null) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.0.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' => __( 'Sorry, this file type is not permitted for security reasons.' ) );
+	$wp_filetype = wp_check_filetype($name);
+	if ( ! $wp_filetype['ext'] && ! current_user_can('unfiltered_upload'))
+		return array('error' => __('Sorry, this file type is not permitted for security reasons.'));
 
-	$upload = wp_upload_dir( $time );
+	$upload = wp_upload_dir($time);
 
-	if ( $upload['error'] !== false )
+	if ($upload['error'] !== false)
 		return $upload;
 
 	/**
@@ -2148,49 +2148,49 @@ 
 	 *
 	 * @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(
 			/* translators: %s: directory path */
-			__( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
+			__('Unable to create directory %s. Is its parent directory writable by the server?'),
 			$error_path
 		);
-		return array( 'error' => $message );
+		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');
 }
 
 /**
@@ -2201,12 +2201,12 @@ 
  * @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);
 
 	$ext2type = wp_get_ext_types();
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ($ext2type as $type => $exts)
+		if (in_array($ext, $exts))
 			return $type;
 }
 
@@ -2221,22 +2221,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');
 }
 
 /**
@@ -2258,28 +2258,28 @@ 
  * @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');
 	}
 
 	$real_mime = false;
 
 	// Validate image types.
-	if ( $type && 0 === strpos( $type, 'image/' ) ) {
+	if ($type && 0 === strpos($type, 'image/')) {
 
 		// Attempt to figure out what type of image it actually is
-		$real_mime = wp_get_image_mime( $file );
+		$real_mime = wp_get_image_mime($file);
 
-		if ( $real_mime && $real_mime != $type ) {
+		if ($real_mime && $real_mime != $type) {
 			/**
 			 * Filters the list mapping image mime types to their respective extensions.
 			 *
@@ -2287,26 +2287,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[ $real_mime ] ) ) {
-				$filename_parts = explode( '.', $filename );
-				array_pop( $filename_parts );
-				$filename_parts[] = $mime_to_ext[ $real_mime ];
-				$new_filename = implode( '.', $filename_parts );
+			if ( ! empty($mime_to_ext[$real_mime])) {
+				$filename_parts = explode('.', $filename);
+				array_pop($filename_parts);
+				$filename_parts[] = $mime_to_ext[$real_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'];
 			} else {
@@ -2317,20 +2317,20 @@ 
 	}
 
 	// Validate files that didn't get validated during previous checks.
-	if ( $type && ! $real_mime && extension_loaded( 'fileinfo' ) ) {
-		$finfo = finfo_open( FILEINFO_MIME_TYPE );
-		$real_mime = finfo_file( $finfo, $file );
-		finfo_close( $finfo );
+	if ($type && ! $real_mime && extension_loaded('fileinfo')) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$real_mime = finfo_file($finfo, $file);
+		finfo_close($finfo);
 
 		/*
 		 * If $real_mime doesn't match what we're expecting, we need to do some extra
 		 * vetting of application mime types to make sure this type of file is allowed.
 		 * Other mime types are assumed to be safe, but should be considered unverified.
 		 */
-		if ( $real_mime && ( $real_mime !== $type ) && ( 0 === strpos( $real_mime, 'application' ) ) ) {
+		if ($real_mime && ($real_mime !== $type) && (0 === strpos($real_mime, 'application'))) {
 			$allowed = get_allowed_mime_types();
 
-			if ( ! in_array( $real_mime, $allowed ) ) {
+			if ( ! in_array($real_mime, $allowed)) {
 				$type = $ext = false;
 			}
 		}
@@ -2348,7 +2348,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);
 }
 
 /**
@@ -2361,23 +2361,23 @@ 
  * @param string $file Full path to the file.
  * @return string|false The actual mime type or false if the type cannot be determined.
  */
-function wp_get_image_mime( $file ) {
+function wp_get_image_mime($file) {
 	/*
 	 * Use exif_imagetype() to check the mimetype if available or fall back to
 	 * getimagesize() if exif isn't avaialbe. If either function throws an Exception
 	 * we assume the file could not be validated.
 	 */
 	try {
-		if ( is_callable( 'exif_imagetype' ) ) {
-			$imagetype = exif_imagetype( $file );
-			$mime = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
-		} elseif ( function_exists( 'getimagesize' ) ) {
-			$imagesize = getimagesize( $file );
-			$mime = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
+		if (is_callable('exif_imagetype')) {
+			$imagetype = exif_imagetype($file);
+			$mime = ($imagetype) ? image_type_to_mime_type($imagetype) : false;
+		} elseif (function_exists('getimagesize')) {
+			$imagesize = getimagesize($file);
+			$mime = (isset($imagesize['mime'])) ? $imagesize['mime'] : false;
 		} else {
 			$mime = false;
 		}
-	} catch ( Exception $e ) {
+	} catch (Exception $e) {
 		$mime = false;
 	}
 
@@ -2404,7 +2404,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',
@@ -2504,7 +2504,7 @@ 
 	'key' => 'application/vnd.apple.keynote',
 	'numbers' => 'application/vnd.apple.numbers',
 	'pages' => 'application/vnd.apple.pages',
-	) );
+	));
 }
 
 /**
@@ -2526,17 +2526,17 @@ 
 	 * @param array $ext2type Multi-dimensional array with extensions for a default set
 	 *                        of file types.
 	 */
-	return 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' ),
-	) );
+	return 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'),
+	));
 }
 
 /**
@@ -2548,15 +2548,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']);
 
 	/**
 	 * Filters list of allowed mime types and file extensions.
@@ -2568,7 +2568,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);
 }
 
 /**
@@ -2581,32 +2581,32 @@ 
  *
  * @param string $action The nonce action.
  */
-function wp_nonce_ays( $action ) {
-	if ( 'log-out' == $action ) {
+function wp_nonce_ays($action) {
+	if ('log-out' == $action) {
 		$html = sprintf(
 			/* translators: %s: site name */
-			__( 'You are attempting to log out of %s' ),
-			get_bloginfo( 'name' )
+			__('You are attempting to log out of %s'),
+			get_bloginfo('name')
 		);
 		$html .= '</p><p>';
-		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		$redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
 		$html .= sprintf(
 			/* translators: %s: logout URL */
-			__( 'Do you really want to <a href="%s">log out</a>?' ),
-			wp_logout_url( $redirect_to )
+			__('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 = __('Are you sure you want to do this?');
+		if (wp_get_referer()) {
 			$html .= '</p><p>';
-			$html .= sprintf( '<a href="%s">%s</a>',
-				esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
-				__( 'Please try again.' )
+			$html .= sprintf('<a href="%s">%s</a>',
+				esc_url(remove_query_arg('updated', wp_get_referer())),
+				__('Please try again.')
 			);
 		}
 	}
 
-	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
+	wp_die($html, __('WordPress Failure Notice'), 403);
 }
 
 /**
@@ -2643,16 +2643,16 @@ 
  *                                  Default is the value of 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 ( wp_doing_ajax() ) {
+	if (wp_doing_ajax()) {
 		/**
 		 * Filters the callback for killing WordPress execution for Ajax requests.
 		 *
@@ -2660,8 +2660,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) {
 		/**
 		 * Filters the callback for killing WordPress execution for XML-RPC requests.
 		 *
@@ -2669,7 +2669,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 {
 		/**
 		 * Filters the callback for killing WordPress execution for all non-Ajax, non-XML-RPC requests.
@@ -2678,10 +2678,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);
 }
 
 /**
@@ -2697,20 +2697,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;
@@ -2718,43 +2718,43 @@ 
 			$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">
 	<?php
-	if ( function_exists( 'wp_no_robots' ) ) {
+	if (function_exists('wp_no_robots')) {
 		wp_no_robots();
 	}
 	?>
@@ -2870,7 +2870,7 @@ 
 		}
 
 		<?php
-		if ( 'rtl' == $text_direction ) {
+		if ('rtl' == $text_direction) {
 			echo 'body { font-family: Tahoma, Arial; }';
 		}
 		?>
@@ -2899,15 +2899,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();
 }
@@ -2924,19 +2924,19 @@ 
  * @param string       $title   Optional. Error title (unused). Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
+function _ajax_wp_die_handler($message, $title = '', $args = array()) {
 	$defaults = array(
 		'response' => 200,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	if ( ! headers_sent() && null !== $r['response'] ) {
-		status_header( $r['response'] );
+	if ( ! headers_sent() && null !== $r['response']) {
+		status_header($r['response']);
 	}
 
-	if ( is_scalar( $message ) )
-		die( (string) $message );
-	die( '0' );
+	if (is_scalar($message))
+		die((string) $message);
+	die('0');
 }
 
 /**
@@ -2949,9 +2949,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();
 }
 
@@ -2966,39 +2966,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.
-	$args[0] = _wp_json_prepare_data( $data );
+	$args[0] = _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);
 }
 
 /**
@@ -3014,49 +3014,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;
 	}
@@ -3078,21 +3078,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);
 	}
 }
 
@@ -3108,12 +3108,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':
@@ -3124,22 +3124,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;
@@ -3156,17 +3156,17 @@ 
  *                           then print and die.
  * @param int   $status_code The HTTP status code to output.
  */
-function wp_send_json( $response, $status_code = null ) {
-	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-	if ( null !== $status_code ) {
-		status_header( $status_code );
+function wp_send_json($response, $status_code = null) {
+	@header('Content-Type: application/json; charset='.get_option('blog_charset'));
+	if (null !== $status_code) {
+		status_header($status_code);
 	}
-	echo wp_json_encode( $response );
+	echo wp_json_encode($response);
 
-	if ( wp_doing_ajax() ) {
-		wp_die( '', '', array(
+	if (wp_doing_ajax()) {
+		wp_die('', '', array(
 			'response' => null,
-		) );
+		));
 	} else {
 		die;
 	}
@@ -3181,13 +3181,13 @@ 
  * @param mixed $data        Data to encode as JSON, then print and die.
  * @param int   $status_code The HTTP status code to output.
  */
-function wp_send_json_success( $data = null, $status_code = null ) {
-	$response = array( 'success' => true );
+function wp_send_json_success($data = null, $status_code = null) {
+	$response = array('success' => true);
 
-	if ( isset( $data ) )
+	if (isset($data))
 		$response['data'] = $data;
 
-	wp_send_json( $response, $status_code );
+	wp_send_json($response, $status_code);
 }
 
 /**
@@ -3205,15 +3205,15 @@ 
  * @param mixed $data        Data to encode as JSON, then print and die.
  * @param int   $status_code The HTTP status code to output.
  */
-function wp_send_json_error( $data = null, $status_code = null ) {
-	$response = array( 'success' => false );
+function wp_send_json_error($data = null, $status_code = 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);
 				}
 			}
 
@@ -3223,7 +3223,7 @@ 
 		}
 	}
 
-	wp_send_json( $response, $status_code );
+	wp_send_json($response, $status_code);
 }
 
 /**
@@ -3238,12 +3238,12 @@ 
  * @param string $callback Supplied JSONP callback function.
  * @return bool True if valid callback, otherwise false.
  */
-function wp_check_jsonp_callback( $callback ) {
-	if ( ! is_string( $callback ) ) {
+function wp_check_jsonp_callback($callback) {
+	if ( ! is_string($callback)) {
 		return false;
 	}
 
-	preg_replace( '/[^\w\.]/', '', $callback, -1, $illegal_char_count );
+	preg_replace('/[^\w\.]/', '', $callback, -1, $illegal_char_count);
 
 	return 0 === $illegal_char_count;
 }
@@ -3263,9 +3263,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;
 }
 
@@ -3284,9 +3284,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;
 }
 
@@ -3297,7 +3297,7 @@ 
  * @access private
  */
 function _delete_option_fresh_site() {
-	update_option( 'fresh_site', 0 );
+	update_option('fresh_site', 0);
 }
 
 /**
@@ -3317,16 +3317,16 @@ 
  * @param array $mce_init MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $mce_init ) {
-	if ( is_rtl() ) {
+function _mce_set_direction($mce_init) {
+	if (is_rtl()) {
 		$mce_init['directionality'] = 'rtl';
 		$mce_init['rtl_ui'] = true;
 
-		if ( ! empty( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
+		if ( ! empty($mce_init['plugins']) && strpos($mce_init['plugins'], 'directionality') === false) {
 			$mce_init['plugins'] .= ',directionality';
 		}
 
-		if ( ! empty( $mce_init['toolbar1'] ) && ! preg_match( '/\bltr\b/', $mce_init['toolbar1'] ) ) {
+		if ( ! empty($mce_init['toolbar1']) && ! preg_match('/\bltr\b/', $mce_init['toolbar1'])) {
 			$mce_init['toolbar1'] .= ',ltr';
 		}
 	}
@@ -3361,10 +3361,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",
@@ -3440,28 +3440,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';
 
 }
 
@@ -3478,16 +3478,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;
 }
 
@@ -3499,8 +3499,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));
@@ -3514,16 +3514,16 @@ 
  * @param  array|string $list List of slugs.
  * @return array Sanitized array of slugs.
  */
-function wp_parse_slug_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		$list = preg_split( '/[\s,]+/', $list );
+function wp_parse_slug_list($list) {
+	if ( ! is_array($list)) {
+		$list = preg_split('/[\s,]+/', $list);
 	}
 
-	foreach ( $list as $key => $value ) {
-		$list[ $key ] = sanitize_title( $value );
+	foreach ($list as $key => $value) {
+		$list[$key] = sanitize_title($value);
 	}
 
-	return array_unique( $list );
+	return array_unique($list);
 }
 
 /**
@@ -3535,11 +3535,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;
 }
@@ -3552,14 +3552,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;
 }
 
 /**
@@ -3579,17 +3579,17 @@ 
  *                              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();
 	}
 
-	$util = new WP_List_Util( $list );
+	$util = new WP_List_Util($list);
 
-	$util->filter( $args, $operator );
+	$util->filter($args, $operator);
 
-	if ( $field ) {
-		$util->pluck( $field );
+	if ($field) {
+		$util->pluck($field);
 	}
 
 	return $util->get_output();
@@ -3610,13 +3610,13 @@ 
  *                         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();
 	}
 
-	$util = new WP_List_Util( $list );
-	return $util->filter( $args, $operator );
+	$util = new WP_List_Util($list);
+	return $util->filter($args, $operator);
 }
 
 /**
@@ -3637,9 +3637,9 @@ 
  *               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 ) {
-	$util = new WP_List_Util( $list );
-	return $util->pluck( $field, $index_key );
+function wp_list_pluck($list, $field, $index_key = null) {
+	$util = new WP_List_Util($list);
+	return $util->pluck($field, $index_key);
 }
 
 /**
@@ -3655,13 +3655,13 @@ 
  * @param bool         $preserve_keys Optional. Whether to preserve keys. Default false.
  * @return array The sorted array.
  */
-function wp_list_sort( $list, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
-	if ( ! is_array( $list ) ) {
+function wp_list_sort($list, $orderby = array(), $order = 'ASC', $preserve_keys = false) {
+	if ( ! is_array($list)) {
 		return array();
 	}
 
-	$util = new WP_List_Util( $list );
-	return $util->sort( $orderby, $order, $preserve_keys );
+	$util = new WP_List_Util($list);
+	return $util->sort($orderby, $order, $preserve_keys);
 }
 
 /**
@@ -3684,13 +3684,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');
 }
 
 /**
@@ -3703,11 +3703,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);
 }
 
 /**
@@ -3719,7 +3719,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();
 }
 
@@ -3747,29 +3747,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
@@ -3784,8 +3784,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));
 }
 
 /**
@@ -3806,7 +3806,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.
@@ -3817,7 +3817,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);
 
 	/**
 	 * Filters whether to trigger an error for deprecated functions.
@@ -3826,20 +3826,20 @@ 
 	 *
 	 * @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 ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_function_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($replacement)) {
 				/* translators: 1: PHP function name, 2: version number, 3: alternative function name */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement));
 			} else {
 				/* translators: 1: PHP function name, 2: version number */
-				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));
 			}
 		}
 	}
@@ -3865,7 +3865,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.
@@ -3877,7 +3877,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);
 
 	/**
 	 * Filters whether to trigger an error for deprecated functions.
@@ -3888,24 +3888,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>'));
 			}
 		}
 	}
@@ -3932,7 +3932,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.
@@ -3944,7 +3944,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);
 
 	/**
 	 * Filters whether to trigger an error for deprecated files.
@@ -3953,21 +3953,21 @@ 
 	 *
 	 * @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 ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_file_trigger_error', true)) {
+		$message = empty($message) ? '' : ' '.$message;
+		if (function_exists('__')) {
+			if ( ! is_null($replacement)) {
 				/* translators: 1: PHP file name, 2: version number, 3: alternative file name */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement).$message);
 			} else {
 				/* translators: 1: PHP file name, 2: version number */
-				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);
 			}
 		}
 	}
@@ -3998,7 +3998,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.
@@ -4009,7 +4009,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);
 
 	/**
 	 * Filters whether to trigger an error for deprecated arguments.
@@ -4018,20 +4018,20 @@ 
 	 *
 	 * @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 ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_argument_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($message)) {
 				/* translators: 1: PHP function name, 2: version number, 3: optional message regarding the change */
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $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 {
 				/* translators: 1: PHP function name, 2: version number */
-				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));
 			}
 		}
 	}
@@ -4056,7 +4056,7 @@ 
  * @param string $replacement Optional. The hook that should have been used.
  * @param string $message     Optional. A message regarding the change.
  */
-function _deprecated_hook( $hook, $version, $replacement = null, $message = null ) {
+function _deprecated_hook($hook, $version, $replacement = null, $message = null) {
 	/**
 	 * Fires when a deprecated hook is called.
 	 *
@@ -4067,7 +4067,7 @@ 
 	 * @param string $version     The version of WordPress that deprecated the argument used.
 	 * @param string $message     A message regarding the change.
 	 */
-	do_action( 'deprecated_hook_run', $hook, $replacement, $version, $message );
+	do_action('deprecated_hook_run', $hook, $replacement, $version, $message);
 
 	/**
 	 * Filters whether to trigger deprecated hook errors.
@@ -4077,14 +4077,14 @@ 
 	 * @param bool $trigger Whether to trigger deprecated hook errors. Requires
 	 *                      `WP_DEBUG` to be defined true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		if ( ! is_null( $replacement ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_hook_trigger_error', true)) {
+		$message = empty($message) ? '' : ' '.$message;
+		if ( ! is_null($replacement)) {
 			/* translators: 1: WordPress hook name, 2: version number, 3: alternative hook name */
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $hook, $version, $replacement ) . $message );
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $hook, $version, $replacement).$message);
 		} else {
 			/* translators: 1: WordPress hook name, 2: version number */
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $hook, $version ) . $message );
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $hook, $version).$message);
 		}
 	}
 }
@@ -4105,7 +4105,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.
@@ -4116,7 +4116,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);
 
 	/**
 	 * Filters whether to trigger an error for _doing_it_wrong() calls.
@@ -4125,30 +4125,30 @@ 
 	 *
 	 * @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( '__' ) ) {
-			if ( is_null( $version ) ) {
+	if (WP_DEBUG && apply_filters('doing_it_wrong_trigger_error', true)) {
+		if (function_exists('__')) {
+			if (is_null($version)) {
 				$version = '';
 			} else {
 				/* translators: %s: version number */
-				$version = sprintf( __( '(This message was added in version %s.)' ), $version );
+				$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')
 			);
 			/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message */
-			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 {
-			if ( is_null( $version ) ) {
+			if (is_null($version)) {
 				$version = '';
 			} else {
-				$version = sprintf( '(This message was added in version %s.)', $version );
+				$version = sprintf('(This message was added in version %s.)', $version);
 			}
-			$message .= sprintf( ' Please see <a href="%s">Debugging in WordPress</a> for more information.',
+			$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));
 		}
 	}
 }
@@ -4161,9 +4161,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');
 }
 
 /**
@@ -4180,18 +4180,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;
@@ -4210,7 +4210,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.
@@ -4220,7 +4220,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');
 	}
 
 	/**
@@ -4230,7 +4230,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);
 }
 
 /**
@@ -4247,17 +4247,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;
@@ -4273,10 +4273,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;
@@ -4296,39 +4296,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, '/');
@@ -4351,10 +4351,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;
@@ -4374,7 +4374,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;
@@ -4391,11 +4391,11 @@ 
  * @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 ) {
-	if ( ! is_multisite() )
+function is_main_site($site_id = null) {
+	if ( ! is_multisite())
 		return true;
 
-	if ( ! $site_id )
+	if ( ! $site_id)
 		$site_id = get_current_blog_id();
 
 	return (int) $site_id === (int) get_network()->site_id;
@@ -4409,18 +4409,18 @@ 
  * @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;
 	}
 
-	if ( null === $network_id ) {
+	if (null === $network_id) {
 		$network_id = get_current_network_id();
 	}
 
 	$network_id = (int) $network_id;
 
-	return ( $network_id === get_main_network_id() );
+	return ($network_id === get_main_network_id());
 }
 
 /**
@@ -4431,20 +4431,20 @@ 
  * @return int The ID of the main network.
  */
 function get_main_network_id() {
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
 	$current_network = get_network();
 
-	if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
+	if (defined('PRIMARY_NETWORK_ID')) {
 		$main_network_id = PRIMARY_NETWORK_ID;
-	} elseif ( isset( $current_network->id ) && 1 === (int) $current_network->id ) {
+	} elseif (isset($current_network->id) && 1 === (int) $current_network->id) {
 		// If the current network has an ID of 1, assume it is the main network.
 		$main_network_id = 1;
 	} else {
-		$_networks = get_networks( array( 'fields' => 'ids', 'number' => 1 ) );
-		$main_network_id = array_shift( $_networks );
+		$_networks = get_networks(array('fields' => 'ids', 'number' => 1));
+		$main_network_id = array_shift($_networks);
 	}
 
 	/**
@@ -4454,7 +4454,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);
 }
 
 /**
@@ -4467,11 +4467,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)) {
 
 		/**
 		 * Filters whether global terms are enabled.
@@ -4483,11 +4483,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;
 }
@@ -4502,16 +4502,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);
 }
 
 /**
@@ -4524,41 +4524,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']);
 	}
 }
 
@@ -4575,126 +4575,126 @@ 
  * @param string $locale        Optional. Locale to load the timezones in. Default current site locale.
  * @return string
  */
-function wp_timezone_choice( $selected_zone, $locale = null ) {
+function wp_timezone_choice($selected_zone, $locale = null) {
 	static $mo_loaded = false, $locale_loaded = null;
 
-	$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 || $locale !== $locale_loaded ) {
+	if ( ! $mo_loaded || $locale !== $locale_loaded) {
 		$locale_loaded = $locale ? $locale : get_locale();
-		$mofile = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
-		unload_textdomain( 'continents-cities' );
-		load_textdomain( 'continents-cities', $mofile );
+		$mofile = WP_LANG_DIR.'/continents-cities-'.$locale_loaded.'.mo';
+		unload_textdomain('continents-cities');
+		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);
 }
 
 /**
@@ -4708,7 +4708,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));
 }
 
@@ -4725,18 +4725,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 {
@@ -4746,18 +4746,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);
 		}
 	}
 }
@@ -4782,18 +4782,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);
 
 	/**
 	 * Filters extra file headers by context.
@@ -4805,18 +4805,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;
@@ -4915,7 +4915,7 @@ 
  * @see https://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');
 }
 
 /**
@@ -4927,8 +4927,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 :
@@ -4956,13 +4956,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);
 }
 
 /**
@@ -4985,7 +4985,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();
 
@@ -4994,19 +4994,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;
@@ -5020,7 +5020,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');
 }
 
 /**
@@ -5042,8 +5042,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', 'urn' );
+	if (empty($protocols)) {
+		$protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn');
 
 		/**
 		 * Filters the list of protocols allowed in HTML attributes.
@@ -5052,7 +5052,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;
@@ -5075,36 +5075,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;
 }
@@ -5120,11 +5120,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;
 		}
 	}
@@ -5141,15 +5141,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;
@@ -5163,11 +5163,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;
 }
 
 /**
@@ -5183,7 +5183,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) {
 	/**
 	 * Filters whether the given date is valid for the Gregorian calendar.
 	 *
@@ -5192,7 +5192,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);
 }
 
 /**
@@ -5207,15 +5207,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);
 
 	/**
 	 * Filters whether to load the authentication check.
@@ -5228,12 +5228,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);
 	}
 }
 
@@ -5244,8 +5244,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);
 
 	/**
 	 * Filters whether the authentication check originated at the same domain.
@@ -5254,26 +5254,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>
@@ -5294,8 +5294,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;
 }
 
@@ -5315,10 +5315,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));
 }
 
 /**
@@ -5333,13 +5333,13 @@ 
  * @param string $charset A charset name.
  * @return string The canonical form of the charset.
  */
-function _canonical_charset( $charset ) {
-	if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset) ) {
+function _canonical_charset($charset) {
+	if ('utf-8' === strtolower($charset) || 'utf8' === strtolower($charset)) {
 
 		return 'UTF-8';
 	}
 
-	if ( 'iso-8859-1' === strtolower( $charset ) || 'iso8859-1' === strtolower( $charset ) ) {
+	if ('iso-8859-1' === strtolower($charset) || 'iso8859-1' === strtolower($charset)) {
 
 		return 'ISO-8859-1';
 	}
@@ -5373,25 +5373,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);
 	}
 }
 
@@ -5403,7 +5403,7 @@ 
  * @since 3.7.0
  */
 function reset_mbstring_encoding() {
-	mbstring_binary_safe_encoding( true );
+	mbstring_binary_safe_encoding(true);
 }
 
 /**
@@ -5416,12 +5416,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;
 	}
 
@@ -5435,7 +5435,7 @@ 
  *
  * @param string $file The path to the file to delete.
  */
-function wp_delete_file( $file ) {
+function wp_delete_file($file) {
 	/**
 	 * Filters the path of the file to delete.
 	 *
@@ -5443,9 +5443,9 @@ 
 	 *
 	 * @param string $file 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);
 	}
 }
 
@@ -5459,12 +5459,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>
@@ -5494,11 +5494,11 @@ 
  * @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);
 }
 
 /**
@@ -5514,24 +5514,24 @@ 
  *                        invoked. Default 'admin'.
  * @return bool|int|string The limit that was set or false on failure.
  */
-function wp_raise_memory_limit( $context = 'admin' ) {
+function wp_raise_memory_limit($context = 'admin') {
 	// Exit early if the limit cannot be changed.
-	if ( false === wp_is_ini_value_changeable( 'memory_limit' ) ) {
+	if (false === wp_is_ini_value_changeable('memory_limit')) {
 		return false;
 	}
 
-	$current_limit     = @ini_get( 'memory_limit' );
-	$current_limit_int = wp_convert_hr_to_bytes( $current_limit );
+	$current_limit     = @ini_get('memory_limit');
+	$current_limit_int = wp_convert_hr_to_bytes($current_limit);
 
 	if ( -1 === $current_limit_int ) {
 		return false;
 	}
 
 	$wp_max_limit     = WP_MAX_MEMORY_LIMIT;
-	$wp_max_limit_int = wp_convert_hr_to_bytes( $wp_max_limit );
+	$wp_max_limit_int = wp_convert_hr_to_bytes($wp_max_limit);
 	$filtered_limit   = $wp_max_limit;
 
-	switch ( $context ) {
+	switch ($context) {
 		case 'admin':
 			/**
 			 * Filters the maximum memory limit available for administration screens.
@@ -5551,7 +5551,7 @@ 
 			 * @param int|string $filtered_limit The maximum WordPress memory limit. Accepts an integer
 			 *                                   (bytes), or a shorthand string notation, such as '256M'.
 			 */
-			$filtered_limit = apply_filters( 'admin_memory_limit', $filtered_limit );
+			$filtered_limit = apply_filters('admin_memory_limit', $filtered_limit);
 			break;
 
 		case 'image':
@@ -5567,7 +5567,7 @@ 
 			 *                                   Accepts an integer (bytes), or a shorthand string
 			 *                                   notation, such as '256M'.
 			 */
-			$filtered_limit = apply_filters( 'image_memory_limit', $filtered_limit );
+			$filtered_limit = apply_filters('image_memory_limit', $filtered_limit);
 			break;
 
 		default:
@@ -5585,20 +5585,20 @@ 
 			 *                                   whichever is higher. Accepts an integer (bytes), or a
 			 *                                   shorthand string notation, such as '256M'.
 			 */
-			$filtered_limit = apply_filters( "{$context}_memory_limit", $filtered_limit );
+			$filtered_limit = apply_filters("{$context}_memory_limit", $filtered_limit);
 			break;
 	}
 
-	$filtered_limit_int = wp_convert_hr_to_bytes( $filtered_limit );
+	$filtered_limit_int = wp_convert_hr_to_bytes($filtered_limit);
 
-	if ( -1 === $filtered_limit_int || ( $filtered_limit_int > $wp_max_limit_int && $filtered_limit_int > $current_limit_int ) ) {
-		if ( false !== @ini_set( 'memory_limit', $filtered_limit ) ) {
+	if ( -1 === $filtered_limit_int || ($filtered_limit_int > $wp_max_limit_int && $filtered_limit_int > $current_limit_int) ) {
+		if (false !== @ini_set('memory_limit', $filtered_limit)) {
 			return $filtered_limit;
 		} else {
 			return false;
 		}
 	} elseif ( -1 === $wp_max_limit_int || $wp_max_limit_int > $current_limit_int ) {
-		if ( false !== @ini_set( 'memory_limit', $wp_max_limit ) ) {
+		if (false !== @ini_set('memory_limit', $wp_max_limit)) {
 			return $wp_max_limit;
 		} else {
 			return false;
@@ -5616,12 +5616,12 @@ 
  * @return string UUID.
  */
 function wp_generate_uuid4() {
-	return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-		mt_rand( 0, 0xffff ),
-		mt_rand( 0, 0x0fff ) | 0x4000,
-		mt_rand( 0, 0x3fff ) | 0x8000,
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+	return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+		mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+		mt_rand(0, 0xffff),
+		mt_rand(0, 0x0fff) | 0x4000,
+		mt_rand(0, 0x3fff) | 0x8000,
+		mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
 	);
 }
 
@@ -5634,12 +5634,12 @@ 
  *
  * @return string $last_changed UNIX timestamp with microseconds representing when the group was last changed.
  */
-function wp_cache_get_last_changed( $group ) {
-	$last_changed = wp_cache_get( 'last_changed', $group );
+function wp_cache_get_last_changed($group) {
+	$last_changed = wp_cache_get('last_changed', $group);
 
-	if ( ! $last_changed ) {
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, $group );
+		wp_cache_set('last_changed', $last_changed, $group);
 	}
 
 	return $last_changed;

Braces +448 added lines, -314 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.
@@ -300,11 +304,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 );
@@ -323,8 +329,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;
 }
 
@@ -364,13 +372,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 ) {
@@ -433,14 +444,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;
 }
@@ -568,20 +581,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;
+			}
 		}
 	}
 
@@ -639,13 +655,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.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$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 );
 }
@@ -663,11 +681,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.
@@ -710,27 +729,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);
 }
@@ -773,21 +798,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://';
@@ -821,8 +849,9 @@ 
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+					unset( $qs[$k] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -844,8 +873,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 );
@@ -927,16 +957,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 );
 }
@@ -956,9 +988,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.
@@ -1043,11 +1076,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.
@@ -1071,8 +1105,8 @@ 
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
-
+	if ( function_exists( 'apply_filters' ) ) {
+	
 		/**
 		 * Filters an HTTP status header.
 		 *
@@ -1084,6 +1118,7 @@ 
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1155,9 +1190,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.
@@ -1220,8 +1256,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 ) );
@@ -1274,11 +1311,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.
@@ -1290,11 +1328,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.
@@ -1358,29 +1397,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();
 
@@ -1392,13 +1435,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.
 
@@ -1466,11 +1512,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;
 }
@@ -1489,8 +1537,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;
 }
 
@@ -1513,8 +1562,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;
 }
 
@@ -1568,8 +1618,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;
 }
 
@@ -1604,11 +1655,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 );
@@ -1657,15 +1710,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] == '\\' );
@@ -1684,8 +1740,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, '/');
 }
@@ -1732,25 +1789,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/';
 }
@@ -1769,11 +1831,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
@@ -1801,11 +1864,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;
 }
 
@@ -1931,10 +1996,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;
+		}
 	}
 
 	/*
@@ -1959,10 +2025,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;
@@ -1982,10 +2049,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';
 		}
 	}
@@ -1996,8 +2064,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";
@@ -2123,20 +2192,24 @@ 
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.0.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' => __( 'Sorry, this file type is not permitted for security reasons.' ) );
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
+			return array( 'error' => __( 'Sorry, this file type is not permitted for security reasons.' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
-		return $upload;
+	if ( $upload['error'] !== false ) {
+			return $upload;
+	}
 
 	/**
 	 * Filters whether to treat the upload bits as an error.
@@ -2158,10 +2231,11 @@ 
 
 	$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(
 			/* translators: %s: directory path */
@@ -2172,8 +2246,9 @@ 
 	}
 
 	$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 );
@@ -2205,10 +2280,11 @@ 
 	$ext = strtolower( $ext );
 
 	$ext2type = wp_get_ext_types();
-	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.
@@ -2222,8 +2298,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;
 
@@ -2552,11 +2629,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'] );
+	}
 
 	/**
 	 * Filters list of allowed mime types and file extensions.
@@ -2706,8 +2785,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 ) ) {
@@ -2737,19 +2817,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">
@@ -2934,8 +3021,9 @@ 
 		status_header( $r['response'] );
 	}
 
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2950,8 +3038,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();
 }
 
@@ -3184,8 +3273,9 @@ 
 function wp_send_json_success( $data = null, $status_code = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
-		$response['data'] = $data;
+	if ( isset( $data ) ) {
+			$response['data'] = $data;
+	}
 
 	wp_send_json( $response, $status_code );
 }
@@ -3264,8 +3354,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;
 }
 
@@ -3285,8 +3376,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;
 }
 
@@ -3361,8 +3453,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(
@@ -3479,15 +3572,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;
 }
 
@@ -3500,8 +3595,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));
 }
@@ -3537,9 +3633,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;
 }
@@ -3703,8 +3800,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 );
@@ -3719,9 +3817,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.
@@ -3753,8 +3852,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 );
@@ -3762,7 +3862,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>
@@ -4180,19 +4283,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;
 }
@@ -4248,17 +4354,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;
 }
@@ -4354,8 +4464,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;
 }
@@ -4392,11 +4503,13 @@ 
  *              running Multisite.
  */
 function is_main_site( $site_id = null ) {
-	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) get_network()->site_id;
 }
@@ -4467,8 +4580,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 ) ) {
@@ -4484,10 +4598,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;
 }
@@ -4667,8 +4782,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>';
 
@@ -4677,18 +4793,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>";
 
 	}
@@ -4731,8 +4849,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);
 
@@ -4748,8 +4867,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);
 
@@ -4813,10 +4933,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;
@@ -4959,8 +5080,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 );
 }
@@ -4998,12 +5120,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 ) );
@@ -5076,10 +5200,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 );
@@ -5089,8 +5214,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 {
@@ -5103,11 +5230,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.
@@ -5141,8 +5269,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'];
 
@@ -5207,11 +5336,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' );
@@ -5316,8 +5447,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 ) );
 }
 
@@ -5377,11 +5509,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/class-json.php

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'Services_JSON' ) ) :
+if ( ! class_exists('Services_JSON')) :
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
  * Converts to and from JSON format.
@@ -59,22 +59,22 @@ 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_SLICE',   1);
+define('SERVICES_JSON_SLICE', 1);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_STR',  2);
+define('SERVICES_JSON_IN_STR', 2);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_ARR',  3);
+define('SERVICES_JSON_IN_ARR', 3);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_OBJ',  4);
+define('SERVICES_JSON_IN_OBJ', 4);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
@@ -140,7 +140,7 @@ 
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function __construct( $use = 0 )
+    function __construct($use = 0)
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');
@@ -151,8 +151,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Services_JSON( $use = 0 ) {
-		self::__construct( $use );
+	public function Services_JSON($use = 0) {
+		self::__construct($use);
 	}
     // private - cache the mbstring lookup results..
     var $_mb_strlen = false;
@@ -173,13 +173,13 @@ 
     function utf162utf8($utf16)
     {
         // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
+        if ($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
         $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
 
-        switch(true) {
+        switch (true) {
             case ((0x7F & $bytes) == $bytes):
                 // this case should never be reached, because we are in ASCII range
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -217,11 +217,11 @@ 
     function utf82utf16($utf8)
     {
         // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
+        if ($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
         }
 
-        switch($this->strlen8($utf8)) {
+        switch ($this->strlen8($utf8)) {
             case 1:
                 // this case should never be reached, because we are in ASCII range
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -357,7 +357,7 @@ 
                         case (($ord_var_c & 0xE0) == 0xC0):
                             // characters U-00000080 - U-000007FF, mask 110XXXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+1 >= $strlen_var) {
+                            if ($c + 1 >= $strlen_var) {
                                 $c += 1;
                                 $ascii .= '?';
                                 break;
@@ -370,7 +370,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xF0) == 0xE0):
-                            if ($c+2 >= $strlen_var) {
+                            if ($c + 2 >= $strlen_var) {
                                 $c += 2;
                                 $ascii .= '?';
                                 break;
@@ -386,7 +386,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xF8) == 0xF0):
-                            if ($c+3 >= $strlen_var) {
+                            if ($c + 3 >= $strlen_var) {
                                 $c += 3;
                                 $ascii .= '?';
                                 break;
@@ -405,7 +405,7 @@ 
                         case (($ord_var_c & 0xFC) == 0xF8):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+4 >= $strlen_var) {
+                            if ($c + 4 >= $strlen_var) {
                                 $c += 4;
                                 $ascii .= '?';
                                 break;
@@ -421,7 +421,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xFE) == 0xFC):
-                        if ($c+5 >= $strlen_var) {
+                        if ($c + 5 >= $strlen_var) {
                                 $c += 5;
                                 $ascii .= '?';
                                 break;
@@ -467,25 +467,25 @@ 
                                             array_keys($var),
                                             array_values($var));
 
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
+                    foreach ($properties as $property) {
+                        if (Services_JSON::isError($property)) {
                             return $property;
                         }
                     }
 
-                    return '{' . join(',', $properties) . '}';
+                    return '{'.join(',', $properties).'}';
                 }
 
                 // treat it like a regular array
                 $elements = array_map(array($this, '_encode'), $var);
 
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
+                foreach ($elements as $element) {
+                    if (Services_JSON::isError($element)) {
                         return $element;
                     }
                 }
 
-                return '[' . join(',', $elements) . ']';
+                return '['.join(',', $elements).']';
 
             case 'object':
             
@@ -504,7 +504,7 @@ 
                             
                     }
                     
-                    return $this->_encode( $recode );
+                    return $this->_encode($recode);
                 } 
                 
                 $vars = get_object_vars($var);
@@ -513,13 +513,13 @@ 
                                         array_keys($vars),
                                         array_values($vars));
 
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
+                foreach ($properties as $property) {
+                    if (Services_JSON::isError($property)) {
                         return $property;
                     }
                 }
 
-                return '{' . join(',', $properties) . '}';
+                return '{'.join(',', $properties).'}';
 
             default:
                 return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
@@ -541,11 +541,11 @@ 
     {
         $encoded_value = $this->_encode($value);
 
-        if(Services_JSON::isError($encoded_value)) {
+        if (Services_JSON::isError($encoded_value)) {
             return $encoded_value;
         }
 
-        return $this->_encode(strval($name)) . ':' . $encoded_value;
+        return $this->_encode(strval($name)).':'.$encoded_value;
     }
 
    /**
@@ -612,9 +612,9 @@ 
                     // return (float)$str;
 
                     // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
+                    return ((float) $str == (integer) $str)
+                        ? (integer) $str
+                        : (float) $str;
 
                 } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
@@ -885,12 +885,12 @@ 
     * @param string 
     * @return integer length
     */
-    function strlen8( $str ) 
+    function strlen8($str) 
     {
-        if ( $this->_mb_strlen ) {
-            return mb_strlen( $str, "8bit" );
+        if ($this->_mb_strlen) {
+            return mb_strlen($str, "8bit");
         }
-        return strlen( $str );
+        return strlen($str);
     }
     
     /**
@@ -900,15 +900,15 @@ 
     * @param integer length 
     * @return integer length
     */
-    function substr8( $string, $start, $length=false ) 
+    function substr8($string, $start, $length = false) 
     {
-        if ( $length === false ) {
-            $length = $this->strlen8( $string ) - $start;
+        if ($length === false) {
+            $length = $this->strlen8($string) - $start;
         }
-        if ( $this->_mb_substr ) {
-            return mb_substr( $string, $start, $length, "8bit" );
+        if ($this->_mb_substr) {
+            return mb_substr($string, $start, $length, "8bit");
         }
-        return substr( $string, $start, $length );
+        return substr($string, $start, $length);
     }
 
 }
@@ -940,8 +940,8 @@ 
 	    /**
 	     * PHP5 constructor.
 	     */
-        function __construct( $message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null )
+        function __construct($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
         {
 
         }
@@ -949,9 +949,9 @@ 
 	    /**
 	     * PHP4 constructor.
 	     */
-		public function Services_JSON_Error( $message = 'unknown error', $code = null,
-	                                     $mode = null, $options = null, $userinfo = null ) {
-			self::__construct( $message, $code, $mode, $options, $userinfo );
+		public function Services_JSON_Error($message = 'unknown error', $code = null,
+	                                     $mode = null, $options = null, $userinfo = null) {
+			self::__construct($message, $code, $mode, $options, $userinfo);
 		}
     }
     

Braces +3 added lines, -2 removed lines

@@ -844,8 +844,9 @@
                             array_pop($stk);
                             $c++;
 
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
+                            for ($i = $top['where']; $i <= $c; ++$i) {
+                                                            $chrs = substr_replace($chrs, ' ', $i, 1);
+                            }
 
                             //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 

Doc Comments +2 added lines, -2 removed lines

@@ -551,7 +551,7 @@ 
    /**
     * reduce a string by removing leading and trailing comments and whitespace
     *
-    * @param    $str    string      string value to strip of comments and whitespace
+    * @param    string $str    string      string value to strip of comments and whitespace
     *
     * @return   string  string value stripped of comments and whitespace
     * @access   private
@@ -898,7 +898,7 @@ 
     * @param string 
     * @param integer start 
     * @param integer length 
-    * @return integer length
+    * @return string length
     */
     function substr8( $string, $start, $length=false ) 
     {

Indentation +673 added lines, -673 removed lines

@@ -140,13 +140,13 @@ 
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function __construct( $use = 0 )
-    {
-        $this->use = $use;
-        $this->_mb_strlen            = function_exists('mb_strlen');
-        $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
-        $this->_mb_substr            = function_exists('mb_substr');
-    }
+	function __construct( $use = 0 )
+	{
+		$this->use = $use;
+		$this->_mb_strlen            = function_exists('mb_strlen');
+		$this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
+		$this->_mb_substr            = function_exists('mb_substr');
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -154,10 +154,10 @@ 
 	public function Services_JSON( $use = 0 ) {
 		self::__construct( $use );
 	}
-    // private - cache the mbstring lookup results..
-    var $_mb_strlen = false;
-    var $_mb_substr = false;
-    var $_mb_convert_encoding = false;
+	// private - cache the mbstring lookup results..
+	var $_mb_strlen = false;
+	var $_mb_substr = false;
+	var $_mb_convert_encoding = false;
     
    /**
     * convert a string from one UTF-16 char to one UTF-8 char
@@ -170,38 +170,38 @@ 
     * @return   string  UTF-8 character
     * @access   private
     */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
+	function utf162utf8($utf16)
+	{
+		// oh please oh please oh please oh please oh please
+		if($this->_mb_convert_encoding) {
+			return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		}
+
+		$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+		switch(true) {
+			case ((0x7F & $bytes) == $bytes):
+				// this case should never be reached, because we are in ASCII range
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x7F & $bytes);
+
+			case (0x07FF & $bytes) == $bytes:
+				// return a 2-byte UTF-8 character
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xC0 | (($bytes >> 6) & 0x1F))
+					 . chr(0x80 | ($bytes & 0x3F));
+
+			case (0xFFFF & $bytes) == $bytes:
+				// return a 3-byte UTF-8 character
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xE0 | (($bytes >> 12) & 0x0F))
+					 . chr(0x80 | (($bytes >> 6) & 0x3F))
+					 . chr(0x80 | ($bytes & 0x3F));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
 
    /**
     * convert a string from one UTF-8 char to one UTF-16 char
@@ -214,38 +214,38 @@ 
     * @return   string  UTF-16 character
     * @access   private
     */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch($this->strlen8($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
+	function utf82utf16($utf8)
+	{
+		// oh please oh please oh please oh please oh please
+		if($this->_mb_convert_encoding) {
+			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		}
+
+		switch($this->strlen8($utf8)) {
+			case 1:
+				// this case should never be reached, because we are in ASCII range
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return $utf8;
+
+			case 2:
+				// return a UTF-16 character from a 2-byte UTF-8 char
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x07 & (ord($utf8{0}) >> 2))
+					 . chr((0xC0 & (ord($utf8{0}) << 6))
+						 | (0x3F & ord($utf8{1})));
+
+			case 3:
+				// return a UTF-16 character from a 3-byte UTF-8 char
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr((0xF0 & (ord($utf8{0}) << 4))
+						 | (0x0F & (ord($utf8{1}) >> 2)))
+					 . chr((0xC0 & (ord($utf8{1}) << 6))
+						 | (0x7F & ord($utf8{2})));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
 
    /**
     * encodes an arbitrary variable into JSON format (and sends JSON Header)
@@ -258,192 +258,192 @@ 
     * @return   mixed   JSON string representation of input var or an error if a problem occurs
     * @access   public
     */
-    function encode($var)
-    {
-        header('Content-type: application/json');
-        return $this->encodeUnsafe($var);
-    }
-    /**
-    * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encodeUnsafe($var)
-    {
-        // see bug #16908 - regarding numeric locale printing
-        $lc = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-        $ret = $this->_encode($var);
-        setlocale(LC_NUMERIC, $lc);
-        return $ret;
+	function encode($var)
+	{
+		header('Content-type: application/json');
+		return $this->encodeUnsafe($var);
+	}
+	/**
+	 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
+	 *
+	 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 * @access   public
+	 */
+	function encodeUnsafe($var)
+	{
+		// see bug #16908 - regarding numeric locale printing
+		$lc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, 'C');
+		$ret = $this->_encode($var);
+		setlocale(LC_NUMERIC, $lc);
+		return $ret;
         
-    }
-    /**
-    * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format 
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function _encode($var) 
-    {
+	}
+	/**
+	 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format 
+	 *
+	 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 * @access   public
+	 */
+	function _encode($var) 
+	{
          
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
+		switch (gettype($var)) {
+			case 'boolean':
+				return $var ? 'true' : 'false';
 
-            case 'NULL':
-                return 'null';
+			case 'NULL':
+				return 'null';
 
-            case 'integer':
-                return (int) $var;
+			case 'integer':
+				return (int) $var;
 
-            case 'double':
-            case 'float':
-                return  (float) $var;
+			case 'double':
+			case 'float':
+				return  (float) $var;
 
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = $this->strlen8($var);
+			case 'string':
+				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+				$ascii = '';
+				$strlen_var = $this->strlen8($var);
 
-               /*
+			   /*
                 * Iterate over every character in the string,
                 * escaping with a slash or encoding to UTF-8 where necessary
                 */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+1 >= $strlen_var) {
-                                $c += 1;
-                                $ascii .= '?';
-                                break;
-                            }
+				for ($c = 0; $c < $strlen_var; ++$c) {
+
+					$ord_var_c = ord($var{$c});
+
+					switch (true) {
+						case $ord_var_c == 0x08:
+							$ascii .= '\b';
+							break;
+						case $ord_var_c == 0x09:
+							$ascii .= '\t';
+							break;
+						case $ord_var_c == 0x0A:
+							$ascii .= '\n';
+							break;
+						case $ord_var_c == 0x0C:
+							$ascii .= '\f';
+							break;
+						case $ord_var_c == 0x0D:
+							$ascii .= '\r';
+							break;
+
+						case $ord_var_c == 0x22:
+						case $ord_var_c == 0x2F:
+						case $ord_var_c == 0x5C:
+							// double quote, slash, slosh
+							$ascii .= '\\'.$var{$c};
+							break;
+
+						case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+							// characters U-00000000 - U-0000007F (same as ASCII)
+							$ascii .= $var{$c};
+							break;
+
+						case (($ord_var_c & 0xE0) == 0xC0):
+							// characters U-00000080 - U-000007FF, mask 110XXXXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c+1 >= $strlen_var) {
+								$c += 1;
+								$ascii .= '?';
+								break;
+							}
                             
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            if ($c+2 >= $strlen_var) {
-                                $c += 2;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         @ord($var{$c + 1}),
-                                         @ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            if ($c+3 >= $strlen_var) {
-                                $c += 3;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+4 >= $strlen_var) {
-                                $c += 4;
-                                $ascii .= '?';
-                                break;
-                            }
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                        if ($c+5 >= $strlen_var) {
-                                $c += 5;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-                return  '"'.$ascii.'"';
-
-            case 'array':
-               /*
+							$char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+							$c += 1;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xF0) == 0xE0):
+							if ($c+2 >= $strlen_var) {
+								$c += 2;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 @ord($var{$c + 1}),
+										 @ord($var{$c + 2}));
+							$c += 2;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xF8) == 0xF0):
+							if ($c+3 >= $strlen_var) {
+								$c += 3;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00010000 - U-001FFFFF, mask 11110XXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}));
+							$c += 3;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xFC) == 0xF8):
+							// characters U-00200000 - U-03FFFFFF, mask 111110XX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c+4 >= $strlen_var) {
+								$c += 4;
+								$ascii .= '?';
+								break;
+							}
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}),
+										 ord($var{$c + 4}));
+							$c += 4;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xFE) == 0xFC):
+						if ($c+5 >= $strlen_var) {
+								$c += 5;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}),
+										 ord($var{$c + 4}),
+										 ord($var{$c + 5}));
+							$c += 5;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+					}
+				}
+				return  '"'.$ascii.'"';
+
+			case 'array':
+			   /*
                 * As per JSON spec if any array key is not an integer
                 * we must treat the whole array as an object. We
                 * also try to catch a sparsely populated associative
@@ -461,72 +461,72 @@ 
                 * bracket notation.
                 */
 
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
+				// treat as a JSON object
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+					$properties = array_map(array($this, 'name_value'),
+											array_keys($var),
+											array_values($var));
 
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
+					foreach($properties as $property) {
+						if(Services_JSON::isError($property)) {
+							return $property;
+						}
+					}
 
-                    return '{' . join(',', $properties) . '}';
-                }
+					return '{' . join(',', $properties) . '}';
+				}
 
-                // treat it like a regular array
-                $elements = array_map(array($this, '_encode'), $var);
+				// treat it like a regular array
+				$elements = array_map(array($this, '_encode'), $var);
 
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
+				foreach($elements as $element) {
+					if(Services_JSON::isError($element)) {
+						return $element;
+					}
+				}
 
-                return '[' . join(',', $elements) . ']';
+				return '[' . join(',', $elements) . ']';
 
-            case 'object':
+			case 'object':
             
-                // support toJSON methods.
-                if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) {
-                    // this may end up allowing unlimited recursion
-                    // so we check the return value to make sure it's not got the same method.
-                    $recode = $var->toJSON();
+				// support toJSON methods.
+				if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) {
+					// this may end up allowing unlimited recursion
+					// so we check the return value to make sure it's not got the same method.
+					$recode = $var->toJSON();
                     
-                    if (method_exists($recode, 'toJSON')) {
+					if (method_exists($recode, 'toJSON')) {
                         
-                        return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                        ? 'null'
-                        : new Services_JSON_Error(get_class($var).
-                            " toJSON returned an object with a toJSON method.");
+						return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+						? 'null'
+						: new Services_JSON_Error(get_class($var).
+							" toJSON returned an object with a toJSON method.");
                             
-                    }
+					}
                     
-                    return $this->_encode( $recode );
-                } 
+					return $this->_encode( $recode );
+				} 
                 
-                $vars = get_object_vars($var);
+				$vars = get_object_vars($var);
                 
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
+				$properties = array_map(array($this, 'name_value'),
+										array_keys($vars),
+										array_values($vars));
+
+				foreach($properties as $property) {
+					if(Services_JSON::isError($property)) {
+						return $property;
+					}
+				}
+
+				return '{' . join(',', $properties) . '}';
+
+			default:
+				return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+					? 'null'
+					: new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+		}
+	}
 
    /**
     * array-walking function for use in generating JSON-formatted name-value pairs
@@ -537,16 +537,16 @@ 
     * @return   string  JSON-formatted name-value pair, like '"name":value'
     * @access   private
     */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->_encode($value);
+	function name_value($name, $value)
+	{
+		$encoded_value = $this->_encode($value);
 
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
+		if(Services_JSON::isError($encoded_value)) {
+			return $encoded_value;
+		}
 
-        return $this->_encode(strval($name)) . ':' . $encoded_value;
-    }
+		return $this->_encode(strval($name)) . ':' . $encoded_value;
+	}
 
    /**
     * reduce a string by removing leading and trailing comments and whitespace
@@ -556,24 +556,24 @@ 
     * @return   string  string value stripped of comments and whitespace
     * @access   private
     */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
+	function reduce_string($str)
+	{
+		$str = preg_replace(array(
 
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
+				// eliminate single line comments in '// ...' form
+				'#^\s*//(.+)$#m',
 
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
+				// eliminate multi-line comments in '/* ... */' form, at start of string
+				'#^\s*/\*(.+)\*/#Us',
 
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
+				// eliminate multi-line comments in '/* ... */' form, at end of string
+				'#/\*(.+)\*/\s*$#Us'
 
-            ), '', $str);
+			), '', $str);
 
-        // eliminate extraneous space
-        return trim($str);
-    }
+		// eliminate extraneous space
+		return trim($str);
+	}
 
    /**
     * decodes a JSON string into appropriate variable
@@ -587,373 +587,373 @@ 
     *                   in ASCII or UTF-8 format!
     * @access   public
     */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = $this->substr8($str, 0, 1);
-                    $chrs = $this->substr8($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = $this->strlen8($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec($this->substr8($chrs, ($c + 2), 2)))
-                                       . chr(hexdec($this->substr8($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = $this->substr8($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = $this->strlen8($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
+	function decode($str)
+	{
+		$str = $this->reduce_string($str);
+
+		switch (strtolower($str)) {
+			case 'true':
+				return true;
+
+			case 'false':
+				return false;
+
+			case 'null':
+				return null;
+
+			default:
+				$m = array();
+
+				if (is_numeric($str)) {
+					// Lookie-loo, it's a number
+
+					// This would work on its own, but I'm trying to be
+					// good about returning integers where appropriate:
+					// return (float)$str;
+
+					// Return float or int, as appropriate
+					return ((float)$str == (integer)$str)
+						? (integer)$str
+						: (float)$str;
+
+				} elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+					// STRINGS RETURNED IN UTF-8 FORMAT
+					$delim = $this->substr8($str, 0, 1);
+					$chrs = $this->substr8($str, 1, -1);
+					$utf8 = '';
+					$strlen_chrs = $this->strlen8($chrs);
+
+					for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+						$substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
+						$ord_chrs_c = ord($chrs{$c});
+
+						switch (true) {
+							case $substr_chrs_c_2 == '\b':
+								$utf8 .= chr(0x08);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\t':
+								$utf8 .= chr(0x09);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\n':
+								$utf8 .= chr(0x0A);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\f':
+								$utf8 .= chr(0x0C);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\r':
+								$utf8 .= chr(0x0D);
+								++$c;
+								break;
+
+							case $substr_chrs_c_2 == '\\"':
+							case $substr_chrs_c_2 == '\\\'':
+							case $substr_chrs_c_2 == '\\\\':
+							case $substr_chrs_c_2 == '\\/':
+								if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+								   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+									$utf8 .= $chrs{++$c};
+								}
+								break;
+
+							case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
+								// single, escaped unicode character
+								$utf16 = chr(hexdec($this->substr8($chrs, ($c + 2), 2)))
+									   . chr(hexdec($this->substr8($chrs, ($c + 4), 2)));
+								$utf8 .= $this->utf162utf8($utf16);
+								$c += 5;
+								break;
+
+							case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+								$utf8 .= $chrs{$c};
+								break;
+
+							case ($ord_chrs_c & 0xE0) == 0xC0:
+								// characters U-00000080 - U-000007FF, mask 110XXXXX
+								//see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 2);
+								++$c;
+								break;
+
+							case ($ord_chrs_c & 0xF0) == 0xE0:
+								// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 3);
+								$c += 2;
+								break;
+
+							case ($ord_chrs_c & 0xF8) == 0xF0:
+								// characters U-00010000 - U-001FFFFF, mask 11110XXX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 4);
+								$c += 3;
+								break;
+
+							case ($ord_chrs_c & 0xFC) == 0xF8:
+								// characters U-00200000 - U-03FFFFFF, mask 111110XX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 5);
+								$c += 4;
+								break;
+
+							case ($ord_chrs_c & 0xFE) == 0xFC:
+								// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 6);
+								$c += 5;
+								break;
+
+						}
+
+					}
+
+					return $utf8;
+
+				} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+					// array, or object notation
+
+					if ($str{0} == '[') {
+						$stk = array(SERVICES_JSON_IN_ARR);
+						$arr = array();
+					} else {
+						if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+							$stk = array(SERVICES_JSON_IN_OBJ);
+							$obj = array();
+						} else {
+							$stk = array(SERVICES_JSON_IN_OBJ);
+							$obj = new stdClass();
+						}
+					}
+
+					array_push($stk, array('what'  => SERVICES_JSON_SLICE,
+										   'where' => 0,
+										   'delim' => false));
+
+					$chrs = $this->substr8($str, 1, -1);
+					$chrs = $this->reduce_string($chrs);
+
+					if ($chrs == '') {
+						if (reset($stk) == SERVICES_JSON_IN_ARR) {
+							return $arr;
+
+						} else {
+							return $obj;
+
+						}
+					}
+
+					//print("\nparsing {$chrs}\n");
+
+					$strlen_chrs = $this->strlen8($chrs);
+
+					for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+						$top = end($stk);
+						$substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
+
+						if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+							// found a comma that is not inside a string, array, etc.,
+							// OR we've reached the end of the character list
+							$slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
+							array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+							//print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+							if (reset($stk) == SERVICES_JSON_IN_ARR) {
+								// we are in an array, so just push an element onto the stack
+								array_push($arr, $this->decode($slice));
+
+							} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+								// we are in an object, so figure
+								// out the property name and set an
+								// element in an associative array,
+								// for now
+								$parts = array();
                                 
-                               if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
- 	                              // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
+							   if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
+ 								  // "name":value pair
+									$key = $this->decode($parts[1]);
+									$val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								} elseif (preg_match('/^\s*(\w+)\s*:/Uis', $slice, $parts)) {
+									// name:value pair, where name is unquoted
+									$key = $parts[1];
+									$val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								}
+
+							}
+
+						} elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+							// found a quote, and we are not inside a string
+							array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+							//print("Found start of string at {$c}\n");
+
+						} elseif (($chrs{$c} == $top['delim']) &&
+								 ($top['what'] == SERVICES_JSON_IN_STR) &&
+								 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
+							// found a quote, we're in a string, and it's not escaped
+							// we know that it's not escaped becase there is _not_ an
+							// odd number of backslashes at the end of the string so far
+							array_pop($stk);
+							//print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+						} elseif (($chrs{$c} == '[') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a left-bracket, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+							//print("Found start of array at {$c}\n");
+
+						} elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+							// found a right-bracket, and we're in an array
+							array_pop($stk);
+							//print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						} elseif (($chrs{$c} == '{') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a left-brace, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+							//print("Found start of object at {$c}\n");
+
+						} elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+							// found a right-brace, and we're in an object
+							array_pop($stk);
+							//print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						} elseif (($substr_chrs_c_2 == '/*') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a comment start, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+							$c++;
+							//print("Found start of comment at {$c}\n");
+
+						} elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+							// found a comment end, and we're in one now
+							array_pop($stk);
+							$c++;
+
+							for ($i = $top['where']; $i <= $c; ++$i)
+								$chrs = substr_replace($chrs, ' ', $i, 1);
+
+							//print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						}
+
+					}
+
+					if (reset($stk) == SERVICES_JSON_IN_ARR) {
+						return $arr;
+
+					} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+						return $obj;
+
+					}
+
+				}
+		}
+	}
+
+	/**
+	 * @todo Ultimately, this should just call PEAR::isError()
+	 */
+	function isError($data, $code = null)
+	{
+		if (class_exists('pear')) {
+			return PEAR::isError($data, $code);
+		} elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+								 is_subclass_of($data, 'services_json_error'))) {
+			return true;
+		}
+
+		return false;
+	}
     
-    /**
-    * Calculates length of string in bytes
-    * @param string 
-    * @return integer length
-    */
-    function strlen8( $str ) 
-    {
-        if ( $this->_mb_strlen ) {
-            return mb_strlen( $str, "8bit" );
-        }
-        return strlen( $str );
-    }
+	/**
+	 * Calculates length of string in bytes
+	 * @param string 
+	 * @return integer length
+	 */
+	function strlen8( $str ) 
+	{
+		if ( $this->_mb_strlen ) {
+			return mb_strlen( $str, "8bit" );
+		}
+		return strlen( $str );
+	}
     
-    /**
-    * Returns part of a string, interpreting $start and $length as number of bytes.
-    * @param string 
-    * @param integer start 
-    * @param integer length 
-    * @return integer length
-    */
-    function substr8( $string, $start, $length=false ) 
-    {
-        if ( $length === false ) {
-            $length = $this->strlen8( $string ) - $start;
-        }
-        if ( $this->_mb_substr ) {
-            return mb_substr( $string, $start, $length, "8bit" );
-        }
-        return substr( $string, $start, $length );
-    }
+	/**
+	 * Returns part of a string, interpreting $start and $length as number of bytes.
+	 * @param string 
+	 * @param integer start 
+	 * @param integer length 
+	 * @return integer length
+	 */
+	function substr8( $string, $start, $length=false ) 
+	{
+		if ( $length === false ) {
+			$length = $this->strlen8( $string ) - $start;
+		}
+		if ( $this->_mb_substr ) {
+			return mb_substr( $string, $start, $length, "8bit" );
+		}
+		return substr( $string, $start, $length );
+	}
 
 }
 
 if (class_exists('PEAR_Error')) {
 
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function __construct($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
+	class Services_JSON_Error extends PEAR_Error
+	{
+		function __construct($message = 'unknown error', $code = null,
+									 $mode = null, $options = null, $userinfo = null)
+		{
+			parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+		}
 
 	public function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null) {
+									 $mode = null, $options = null, $userinfo = null) {
 		self::__construct($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null);
+									 $mode = null, $options = null, $userinfo = null);
+	}
 	}
-    }
 
 } else {
 
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-	    /**
-	     * PHP5 constructor.
-	     */
-        function __construct( $message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null )
-        {
-
-        }
-
-	    /**
-	     * PHP4 constructor.
-	     */
+	/**
+	 * @todo Ultimately, this class shall be descended from PEAR_Error
+	 */
+	class Services_JSON_Error
+	{
+		/**
+		 * PHP5 constructor.
+		 */
+		function __construct( $message = 'unknown error', $code = null,
+									 $mode = null, $options = null, $userinfo = null )
+		{
+
+		}
+
+		/**
+		 * PHP4 constructor.
+		 */
 		public function Services_JSON_Error( $message = 'unknown error', $code = null,
-	                                     $mode = null, $options = null, $userinfo = null ) {
+										 $mode = null, $options = null, $userinfo = null ) {
 			self::__construct( $message, $code, $mode, $options, $userinfo );
 		}
-    }
+	}
     
 }
 

src/wp-includes/post.php

Switch Indentation +9 added lines, -9 removed lines

@@ -5208,18 +5208,18 @@
 	}
 
 	switch ( $type ) {
-	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		case 'image':
+			$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+			return in_array( $ext, $image_exts );
 
-	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		case 'audio':
+			return in_array( $ext, wp_get_audio_extensions() );
 
-	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		case 'video':
+			return in_array( $ext, wp_get_video_extensions() );
 
-	default:
-		return $type === $ext;
+		default:
+			return $type === $ext;
 	}
 }
 

Doc Comments +10 added lines, -10 removed lines

@@ -473,7 +473,7 @@ 
  * @since 1.0.0
  *
  * @param string $post Post content.
- * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
+ * @return integer Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
 function get_extended( $post ) {
 	//Match the new style more links.
@@ -1362,7 +1362,7 @@ 
  *
  * @access private
  *
- * @param object|WP_Post_Type $post_type_object Post type object.
+ * @param WP_Post_Type $post_type_object Post type object.
  * @return object Object with all the labels as member variables.
  */
 function get_post_type_labels( $post_type_object ) {
@@ -1727,7 +1727,7 @@ 
  *
  * @param int    $post_id    Post ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Optional. Metadata value. Must be serializable if
+ * @param string  $meta_value Optional. Metadata value. Must be serializable if
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
@@ -2420,7 +2420,7 @@ 
  * @param int  $postid       Optional. Post ID. Default 0.
  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
  *                           Default false.
- * @return array|false|WP_Post False on failure.
+ * @return string False on failure.
  */
 function wp_delete_post( $postid = 0, $force_delete = false ) {
 	global $wpdb;
@@ -2678,7 +2678,7 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
 function wp_trash_post_comments( $post = null ) {
@@ -2734,8 +2734,8 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
- * @return true|void
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
+ * @return null|boolean
  */
 function wp_untrash_post_comments( $post = null ) {
 	global $wpdb;
@@ -4439,7 +4439,7 @@ 
  * @since 1.5.0
  * @since 4.6.0 Converted the `$page` parameter to optional.
  *
- * @param WP_Post|object|int $page Optional. Page ID or WP_Post object. Default is global $post.
+ * @param integer $page Optional. Page ID or WP_Post object. Default is global $post.
  * @return string|false Page URI, false on error.
  */
 function get_page_uri( $page = 0 ) {
@@ -5242,7 +5242,7 @@ 
  *
  * @since 2.1.0
  *
- * @param string|int $mime MIME type or attachment ID.
+ * @param integer $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
@@ -6142,7 +6142,7 @@ 
  * @access private
  *
  * @param string $post_name Slug.
- * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
+ * @param integer $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
 function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
 	$trashed_posts_with_desired_slug = get_posts( array(

Spacing +1265 added lines, -1265 removed lines

@@ -18,9 +18,9 @@ 
  * @since 2.9.0
  */
 function create_initial_post_types() {
-	register_post_type( 'post', array(
+	register_post_type('post', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Post', 'add new from admin bar' ),
+			'name_admin_bar' => _x('Post', 'add new from admin bar'),
 		),
 		'public'  => true,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -32,15 +32,15 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats'),
 		'show_in_rest' => true,
 		'rest_base' => 'posts',
 		'rest_controller_class' => 'WP_REST_Posts_Controller',
-	) );
+	));
 
-	register_post_type( 'page', array(
+	register_post_type('page', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Page', 'add new from admin bar' ),
+			'name_admin_bar' => _x('Page', 'add new from admin bar'),
 		),
 		'public' => true,
 		'publicly_queryable' => false,
@@ -53,20 +53,20 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions'),
 		'show_in_rest' => true,
 		'rest_base' => 'pages',
 		'rest_controller_class' => 'WP_REST_Posts_Controller',
-	) );
+	));
 
-	register_post_type( 'attachment', array(
+	register_post_type('attachment', array(
 		'labels' => array(
 			'name' => _x('Media', 'post type general name'),
-			'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
-			'add_new' => _x( 'Add New', 'add new media' ),
- 			'edit_item' => __( 'Edit Media' ),
- 			'view_item' => __( 'View Attachment Page' ),
-			'attributes' => __( 'Attachment Attributes' ),
+			'name_admin_bar' => _x('Media', 'add new from admin bar'),
+			'add_new' => _x('Add New', 'add new media'),
+ 			'edit_item' => __('Edit Media'),
+ 			'view_item' => __('View Attachment Page'),
+			'attributes' => __('Attachment Attributes'),
 		),
 		'public' => true,
 		'show_ui' => true,
@@ -82,18 +82,18 @@ 
 		'query_var' => false,
 		'show_in_nav_menus' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'author', 'comments' ),
+		'supports' => array('title', 'author', 'comments'),
 		'show_in_rest' => true,
 		'rest_base' => 'media',
 		'rest_controller_class' => 'WP_REST_Attachments_Controller',
-	) );
-	add_post_type_support( 'attachment:audio', 'thumbnail' );
-	add_post_type_support( 'attachment:video', 'thumbnail' );
+	));
+	add_post_type_support('attachment:audio', 'thumbnail');
+	add_post_type_support('attachment:video', 'thumbnail');
 
-	register_post_type( 'revision', array(
+	register_post_type('revision', array(
 		'labels' => array(
-			'name' => __( 'Revisions' ),
-			'singular_name' => __( 'Revision' ),
+			'name' => __('Revisions'),
+			'singular_name' => __('Revision'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -105,13 +105,13 @@ 
 		'query_var' => false,
 		'can_export' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'author' ),
-	) );
+		'supports' => array('author'),
+	));
 
-	register_post_type( 'nav_menu_item', array(
+	register_post_type('nav_menu_item', array(
 		'labels' => array(
-			'name' => __( 'Navigation Menu Items' ),
-			'singular_name' => __( 'Navigation Menu Item' ),
+			'name' => __('Navigation Menu Items'),
+			'singular_name' => __('Navigation Menu Item'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -119,12 +119,12 @@ 
 		'rewrite' => false,
 		'delete_with_user' => false,
 		'query_var' => false,
-	) );
+	));
 
-	register_post_type( 'custom_css', array(
+	register_post_type('custom_css', array(
 		'labels' => array(
-			'name'          => __( 'Custom CSS' ),
-			'singular_name' => __( 'Custom CSS' ),
+			'name'          => __('Custom CSS'),
+			'singular_name' => __('Custom CSS'),
 		),
 		'public'           => false,
 		'hierarchical'     => false,
@@ -133,7 +133,7 @@ 
 		'delete_with_user' => false,
 		'can_export'       => true,
 		'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
-		'supports'         => array( 'title', 'revisions' ),
+		'supports'         => array('title', 'revisions'),
 		'capabilities'     => array(
 			'delete_posts'           => 'edit_theme_options',
 			'delete_post'            => 'edit_theme_options',
@@ -148,23 +148,23 @@ 
 			'read_private_posts'     => 'read',
 			'publish_posts'          => 'edit_theme_options',
 		),
-	) );
+	));
 
-	register_post_type( 'customize_changeset', array(
+	register_post_type('customize_changeset', array(
 		'labels' => array(
-			'name'               => _x( 'Changesets', 'post type general name' ),
-			'singular_name'      => _x( 'Changeset', 'post type singular name' ),
-			'menu_name'          => _x( 'Changesets', 'admin menu' ),
-			'name_admin_bar'     => _x( 'Changeset', 'add new on admin bar' ),
-			'add_new'            => _x( 'Add New', 'Customize Changeset' ),
-			'add_new_item'       => __( 'Add New Changeset' ),
-			'new_item'           => __( 'New Changeset' ),
-			'edit_item'          => __( 'Edit Changeset' ),
-			'view_item'          => __( 'View Changeset' ),
-			'all_items'          => __( 'All Changesets' ),
-			'search_items'       => __( 'Search Changesets' ),
-			'not_found'          => __( 'No changesets found.' ),
-			'not_found_in_trash' => __( 'No changesets found in Trash.' ),
+			'name'               => _x('Changesets', 'post type general name'),
+			'singular_name'      => _x('Changeset', 'post type singular name'),
+			'menu_name'          => _x('Changesets', 'admin menu'),
+			'name_admin_bar'     => _x('Changeset', 'add new on admin bar'),
+			'add_new'            => _x('Add New', 'Customize Changeset'),
+			'add_new_item'       => __('Add New Changeset'),
+			'new_item'           => __('New Changeset'),
+			'edit_item'          => __('Edit Changeset'),
+			'view_item'          => __('View Changeset'),
+			'all_items'          => __('All Changesets'),
+			'search_items'       => __('Search Changesets'),
+			'not_found'          => __('No changesets found.'),
+			'not_found_in_trash' => __('No changesets found in Trash.'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -174,7 +174,7 @@ 
 		'query_var' => false,
 		'can_export' => false,
 		'delete_with_user' => false,
-		'supports' => array( 'title', 'author' ),
+		'supports' => array('title', 'author'),
 		'capability_type' => 'customize_changeset',
 		'capabilities' => array(
 			'create_posts' => 'customize',
@@ -193,63 +193,63 @@ 
 			'read_post' => 'customize',
 			'read_private_posts' => 'customize',
 		),
-	) );
+	));
 
-	register_post_status( 'publish', array(
-		'label'       => _x( 'Published', 'post status' ),
+	register_post_status('publish', array(
+		'label'       => _x('Published', 'post status'),
 		'public'      => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'future', array(
-		'label'       => _x( 'Scheduled', 'post status' ),
+	register_post_status('future', array(
+		'label'       => _x('Scheduled', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'draft', array(
-		'label'       => _x( 'Draft', 'post status' ),
+	register_post_status('draft', array(
+		'label'       => _x('Draft', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'pending', array(
-		'label'       => _x( 'Pending', 'post status' ),
+	register_post_status('pending', array(
+		'label'       => _x('Pending', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'private', array(
-		'label'       => _x( 'Private', 'post status' ),
+	register_post_status('private', array(
+		'label'       => _x('Private', 'post status'),
 		'private'     => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'trash', array(
-		'label'       => _x( 'Trash', 'post status' ),
+	register_post_status('trash', array(
+		'label'       => _x('Trash', 'post status'),
 		'internal'    => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+		'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>'),
 		'show_in_admin_status_list' => true,
-	) );
+	));
 
-	register_post_status( 'auto-draft', array(
+	register_post_status('auto-draft', array(
 		'label'    => 'auto-draft',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
-	) );
+	));
 
-	register_post_status( 'inherit', array(
+	register_post_status('inherit', array(
 		'label'    => 'inherit',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
 		'exclude_from_search' => false,
-	) );
+	));
 }
 
 /**
@@ -270,15 +270,15 @@ 
  * @param bool $unfiltered    Optional. Whether to apply filters. Default false.
  * @return string|false The file path to where the attached file should be, false otherwise.
  */
-function get_attached_file( $attachment_id, $unfiltered = false ) {
-	$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
+function get_attached_file($attachment_id, $unfiltered = false) {
+	$file = get_post_meta($attachment_id, '_wp_attached_file', true);
 
 	// If the file is relative, prepend upload dir.
-	if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) {
-		$file = $uploads['basedir'] . "/$file";
+	if ($file && 0 !== strpos($file, '/') && ! preg_match('|^.:\\\|', $file) && (($uploads = wp_get_upload_dir()) && false === $uploads['error'])) {
+		$file = $uploads['basedir']."/$file";
 	}
 
-	if ( $unfiltered ) {
+	if ($unfiltered) {
 		return $file;
 	}
 
@@ -290,7 +290,7 @@ 
 	 * @param string $file          Path to attached file.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	return apply_filters( 'get_attached_file', $file, $attachment_id );
+	return apply_filters('get_attached_file', $file, $attachment_id);
 }
 
 /**
@@ -305,8 +305,8 @@ 
  * @param string $file          File path for the attachment.
  * @return bool True on success, false on failure.
  */
-function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
+function update_attached_file($attachment_id, $file) {
+	if ( ! get_post($attachment_id))
 		return false;
 
 	/**
@@ -317,12 +317,12 @@ 
 	 * @param string $file          Path to the attached file to update.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
+	$file = apply_filters('update_attached_file', $file, $attachment_id);
 
-	if ( $file = _wp_relative_upload_path( $file ) )
-		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+	if ($file = _wp_relative_upload_path($file))
+		return update_post_meta($attachment_id, '_wp_attached_file', $file);
 	else
-		return delete_post_meta( $attachment_id, '_wp_attached_file' );
+		return delete_post_meta($attachment_id, '_wp_attached_file');
 }
 
 /**
@@ -335,13 +335,13 @@ 
  * @param string $path Full path to the file.
  * @return string Relative path on success, unchanged path on failure.
  */
-function _wp_relative_upload_path( $path ) {
+function _wp_relative_upload_path($path) {
 	$new_path = $path;
 
 	$uploads = wp_get_upload_dir();
-	if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
-			$new_path = str_replace( $uploads['basedir'], '', $new_path );
-			$new_path = ltrim( $new_path, '/' );
+	if (0 === strpos($new_path, $uploads['basedir'])) {
+			$new_path = str_replace($uploads['basedir'], '', $new_path);
+			$new_path = ltrim($new_path, '/');
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 	 * @param string $new_path Relative path to the file.
 	 * @param string $path     Full path to the file.
 	 */
-	return apply_filters( '_wp_relative_upload_path', $new_path, $path );
+	return apply_filters('_wp_relative_upload_path', $new_path, $path);
 }
 
 /**
@@ -406,17 +406,17 @@ 
  * @return array Array of children, where the type of each element is determined by $output parameter.
  *               Empty array on failure.
  */
-function get_children( $args = '', $output = OBJECT ) {
+function get_children($args = '', $output = OBJECT) {
 	$kids = array();
-	if ( empty( $args ) ) {
-		if ( isset( $GLOBALS['post'] ) ) {
-			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent );
+	if (empty($args)) {
+		if (isset($GLOBALS['post'])) {
+			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent);
 		} else {
 			return $kids;
 		}
-	} elseif ( is_object( $args ) ) {
-		$args = array('post_parent' => (int) $args->post_parent );
-	} elseif ( is_numeric( $args ) ) {
+	} elseif (is_object($args)) {
+		$args = array('post_parent' => (int) $args->post_parent);
+	} elseif (is_numeric($args)) {
 		$args = array('post_parent' => (int) $args);
 	}
 
@@ -425,32 +425,32 @@ 
 		'post_status' => 'any', 'post_parent' => 0,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$children = get_posts( $r );
+	$children = get_posts($r);
 
-	if ( ! $children )
+	if ( ! $children)
 		return $kids;
 
-	if ( ! empty( $r['fields'] ) )
+	if ( ! empty($r['fields']))
 		return $children;
 
 	update_post_cache($children);
 
-	foreach ( $children as $key => $child )
+	foreach ($children as $key => $child)
 		$kids[$child->ID] = $children[$key];
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $kids;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$weeuns = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
 		}
 		return $weeuns;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$babes = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
 		}
 		return $babes;
@@ -475,9 +475,9 @@ 
  * @param string $post Post content.
  * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
-function get_extended( $post ) {
+function get_extended($post) {
 	//Match the new style more links.
-	if ( preg_match('/<!--more(.*?)?-->/', $post, $matches) ) {
+	if (preg_match('/<!--more(.*?)?-->/', $post, $matches)) {
 		list($main, $extended) = explode($matches[0], $post, 2);
 		$more_text = $matches[1];
 	} else {
@@ -491,7 +491,7 @@ 
 	$extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended);
 	$more_text = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $more_text);
 
-	return array( 'main' => $main, 'extended' => $extended, 'more_text' => $more_text );
+	return array('main' => $main, 'extended' => $extended, 'more_text' => $more_text);
 }
 
 /**
@@ -512,34 +512,34 @@ 
  * @return WP_Post|array|null Type corresponding to $output on success or null on failure.
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
-function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+function get_post($post = null, $output = OBJECT, $filter = 'raw') {
+	if (empty($post) && isset($GLOBALS['post']))
 		$post = $GLOBALS['post'];
 
-	if ( $post instanceof WP_Post ) {
+	if ($post instanceof WP_Post) {
 		$_post = $post;
-	} elseif ( is_object( $post ) ) {
-		if ( empty( $post->filter ) ) {
-			$_post = sanitize_post( $post, 'raw' );
-			$_post = new WP_Post( $_post );
-		} elseif ( 'raw' == $post->filter ) {
-			$_post = new WP_Post( $post );
+	} elseif (is_object($post)) {
+		if (empty($post->filter)) {
+			$_post = sanitize_post($post, 'raw');
+			$_post = new WP_Post($_post);
+		} elseif ('raw' == $post->filter) {
+			$_post = new WP_Post($post);
 		} else {
-			$_post = WP_Post::get_instance( $post->ID );
+			$_post = WP_Post::get_instance($post->ID);
 		}
 	} else {
-		$_post = WP_Post::get_instance( $post );
+		$_post = WP_Post::get_instance($post);
 	}
 
-	if ( ! $_post )
+	if ( ! $_post)
 		return null;
 
-	$_post = $_post->filter( $filter );
+	$_post = $_post->filter($filter);
 
-	if ( $output == ARRAY_A )
+	if ($output == ARRAY_A)
 		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
-		return array_values( $_post->to_array() );
+	elseif ($output == ARRAY_N)
+		return array_values($_post->to_array());
 
 	return $_post;
 }
@@ -552,19 +552,19 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return array Ancestor IDs or empty array if none are found.
  */
-function get_post_ancestors( $post ) {
-	$post = get_post( $post );
+function get_post_ancestors($post) {
+	$post = get_post($post);
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
+	if ( ! $post || empty($post->post_parent) || $post->post_parent == $post->ID)
 		return array();
 
 	$ancestors = array();
 
 	$id = $ancestors[] = $post->post_parent;
 
-	while ( $ancestor = get_post( $id ) ) {
+	while ($ancestor = get_post($id)) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
+		if (empty($ancestor->post_parent) || ($ancestor->post_parent == $post->ID) || in_array($ancestor->post_parent, $ancestors))
 			break;
 
 		$id = $ancestors[] = $ancestor->post_parent;
@@ -593,13 +593,13 @@ 
  *                             or 'display'. Default 'display'.
  * @return string The value of the post field on success, empty string on failure.
  */
-function get_post_field( $field, $post = null, $context = 'display' ) {
-	$post = get_post( $post );
+function get_post_field($field, $post = null, $context = 'display') {
+	$post = get_post($post);
 
-	if ( !$post )
+	if ( ! $post)
 		return '';
 
-	if ( !isset($post->$field) )
+	if ( ! isset($post->$field))
 		return '';
 
 	return sanitize_post_field($field, $post->$field, $post->ID, $context);
@@ -616,10 +616,10 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false The mime type on success, false on failure.
  */
-function get_post_mime_type( $ID = '' ) {
+function get_post_mime_type($ID = '') {
 	$post = get_post($ID);
 
-	if ( is_object($post) )
+	if (is_object($post))
 		return $post->post_mime_type;
 
 	return false;
@@ -636,25 +636,25 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false Post status on success, false on failure.
  */
-function get_post_status( $ID = '' ) {
+function get_post_status($ID = '') {
 	$post = get_post($ID);
 
-	if ( !is_object($post) )
+	if ( ! is_object($post))
 		return false;
 
-	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
+	if ('attachment' == $post->post_type) {
+		if ('private' == $post->post_status)
 			return 'private';
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
+		if (('inherit' == $post->post_status) && (0 == $post->post_parent))
 			return 'publish';
 
 		// Inherit status from the parent.
-		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
-			$parent_post_status = get_post_status( $post->post_parent );
-			if ( 'trash' == $parent_post_status ) {
-				return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
+		if ($post->post_parent && ($post->ID != $post->post_parent)) {
+			$parent_post_status = get_post_status($post->post_parent);
+			if ('trash' == $parent_post_status) {
+				return get_post_meta($post->post_parent, '_wp_trash_meta_status', true);
 			} else {
 				return $parent_post_status;
 			}
@@ -670,7 +670,7 @@ 
 	 * @param string  $post_status The post status.
 	 * @param WP_Post $post        The post object.
 	 */
-	return apply_filters( 'get_post_status', $post->post_status, $post );
+	return apply_filters('get_post_status', $post->post_status, $post);
 }
 
 /**
@@ -685,10 +685,10 @@ 
  */
 function get_post_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'pending' => __( 'Pending Review' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'pending' => __('Pending Review'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -706,9 +706,9 @@ 
  */
 function get_page_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -757,10 +757,10 @@ 
  * }
  * @return object
  */
-function register_post_status( $post_status, $args = array() ) {
+function register_post_status($post_status, $args = array()) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
+	if ( ! is_array($wp_post_statuses))
 		$wp_post_statuses = array();
 
 	// Args prefixed with an underscore are reserved for internal use.
@@ -784,38 +784,38 @@ 
 	$args->name = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
+	if (null === $args->public && null === $args->internal && null === $args->protected && null === $args->private)
 		$args->internal = true;
 
-	if ( null === $args->public  )
+	if (null === $args->public)
 		$args->public = false;
 
-	if ( null === $args->private  )
+	if (null === $args->private)
 		$args->private = false;
 
-	if ( null === $args->protected  )
+	if (null === $args->protected)
 		$args->protected = false;
 
-	if ( null === $args->internal  )
+	if (null === $args->internal)
 		$args->internal = false;
 
-	if ( null === $args->publicly_queryable )
+	if (null === $args->publicly_queryable)
 		$args->publicly_queryable = $args->public;
 
-	if ( null === $args->exclude_from_search )
+	if (null === $args->exclude_from_search)
 		$args->exclude_from_search = $args->internal;
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if (null === $args->show_in_admin_all_list)
+		$args->show_in_admin_all_list = ! $args->internal;
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if (null === $args->show_in_admin_status_list)
+		$args->show_in_admin_status_list = ! $args->internal;
 
-	if ( false === $args->label )
+	if (false === $args->label)
 		$args->label = $post_status;
 
-	if ( false === $args->label_count )
-		$args->label_count = _n_noop( $args->label, $args->label );
+	if (false === $args->label_count)
+		$args->label_count = _n_noop($args->label, $args->label);
 
 	$wp_post_statuses[$post_status] = $args;
 
@@ -834,10 +834,10 @@ 
  * @param string $post_status The name of a registered post status.
  * @return object|null A post status object.
  */
-function get_post_status_object( $post_status ) {
+function get_post_status_object($post_status) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
+	if (empty($wp_post_statuses[$post_status]))
 		return null;
 
 	return $wp_post_statuses[$post_status];
@@ -860,7 +860,7 @@ 
  *                               Default 'and'.
  * @return array A list of post status names or objects.
  */
-function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_stati($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_statuses;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -880,11 +880,11 @@ 
  * @param string $post_type Post type name
  * @return bool Whether post type is hierarchical.
  */
-function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
+function is_post_type_hierarchical($post_type) {
+	if ( ! post_type_exists($post_type))
 		return false;
 
-	$post_type = get_post_type_object( $post_type );
+	$post_type = get_post_type_object($post_type);
 	return $post_type->hierarchical;
 }
 
@@ -898,8 +898,8 @@ 
  * @param string $post_type Post type name.
  * @return bool Whether post type is registered.
  */
-function post_type_exists( $post_type ) {
-	return (bool) get_post_type_object( $post_type );
+function post_type_exists($post_type) {
+	return (bool) get_post_type_object($post_type);
 }
 
 /**
@@ -910,8 +910,8 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Default is global $post.
  * @return string|false          Post type on success, false on failure.
  */
-function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
+function get_post_type($post = null) {
+	if ($post = get_post($post))
 		return $post->post_type;
 
 	return false;
@@ -930,14 +930,14 @@ 
  * @param string $post_type The name of a registered post type.
  * @return WP_Post_Type|null WP_Post_Type object if it exists, null otherwise.
  */
-function get_post_type_object( $post_type ) {
+function get_post_type_object($post_type) {
 	global $wp_post_types;
 
-	if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) {
+	if ( ! is_scalar($post_type) || empty($wp_post_types[$post_type])) {
 		return null;
 	}
 
-	return $wp_post_types[ $post_type ];
+	return $wp_post_types[$post_type];
 }
 
 /**
@@ -958,7 +958,7 @@ 
  *                               must match; 'not' means no elements may match. Default 'and'.
  * @return array A list of post type names or objects.
  */
-function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_types($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_types;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -1102,27 +1102,27 @@ 
  * }
  * @return WP_Post_Type|WP_Error The registered post type object, or an error object.
  */
-function register_post_type( $post_type, $args = array() ) {
+function register_post_type($post_type, $args = array()) {
 	global $wp_post_types;
 
-	if ( ! is_array( $wp_post_types ) ) {
+	if ( ! is_array($wp_post_types)) {
 		$wp_post_types = array();
 	}
 
 	// Sanitize post type name
-	$post_type = sanitize_key( $post_type );
+	$post_type = sanitize_key($post_type);
 
-	if ( empty( $post_type ) || strlen( $post_type ) > 20 ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Post type names must be between 1 and 20 characters in length.' ), '4.2.0' );
-		return new WP_Error( 'post_type_length_invalid', __( 'Post type names must be between 1 and 20 characters in length.' ) );
+	if (empty($post_type) || strlen($post_type) > 20) {
+		_doing_it_wrong(__FUNCTION__, __('Post type names must be between 1 and 20 characters in length.'), '4.2.0');
+		return new WP_Error('post_type_length_invalid', __('Post type names must be between 1 and 20 characters in length.'));
 	}
 
-	$post_type_object = new WP_Post_Type( $post_type, $args );
+	$post_type_object = new WP_Post_Type($post_type, $args);
 	$post_type_object->add_supports();
 	$post_type_object->add_rewrite_rules();
 	$post_type_object->register_meta_boxes();
 
-	$wp_post_types[ $post_type ] = $post_type_object;
+	$wp_post_types[$post_type] = $post_type_object;
 
 	$post_type_object->add_hooks();
 	$post_type_object->register_taxonomies();
@@ -1136,7 +1136,7 @@ 
 	 * @param string       $post_type        Post type.
 	 * @param WP_Post_Type $post_type_object Arguments used to register the post type.
 	 */
-	do_action( 'registered_post_type', $post_type, $post_type_object );
+	do_action('registered_post_type', $post_type, $post_type_object);
 
 	return $post_type_object;
 }
@@ -1153,18 +1153,18 @@ 
  * @param string $post_type Post type to unregister.
  * @return bool|WP_Error True on success, WP_Error on failure or if the post type doesn't exist.
  */
-function unregister_post_type( $post_type ) {
+function unregister_post_type($post_type) {
 	global $wp_post_types;
 
-	if ( ! post_type_exists( $post_type ) ) {
-		return new WP_Error( 'invalid_post_type', __( 'Invalid post type.' ) );
+	if ( ! post_type_exists($post_type)) {
+		return new WP_Error('invalid_post_type', __('Invalid post type.'));
 	}
 
-	$post_type_object = get_post_type_object( $post_type );
+	$post_type_object = get_post_type_object($post_type);
 
 	// Do not allow unregistering internal post types.
-	if ( $post_type_object->_builtin ) {
-		return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) );
+	if ($post_type_object->_builtin) {
+		return new WP_Error('invalid_post_type', __('Unregistering a built-in post type is not allowed'));
 	}
 
 	$post_type_object->remove_supports();
@@ -1173,7 +1173,7 @@ 
 	$post_type_object->remove_hooks();
 	$post_type_object->unregister_taxonomies();
 
-	unset( $wp_post_types[ $post_type ] );
+	unset($wp_post_types[$post_type]);
 
 	/**
 	 * Fires after a post type was unregistered.
@@ -1182,7 +1182,7 @@ 
 	 *
 	 * @param string $post_type Post type key.
 	 */
-	do_action( 'unregistered_post_type', $post_type );
+	do_action('unregistered_post_type', $post_type);
 
 	return true;
 }
@@ -1242,48 +1242,48 @@ 
  * @param object $args Post type registration arguments.
  * @return object object with all the capabilities as member variables.
  */
-function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
-		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+function get_post_type_capabilities($args) {
+	if ( ! is_array($args->capability_type))
+		$args->capability_type = array($args->capability_type, $args->capability_type.'s');
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
-	list( $singular_base, $plural_base ) = $args->capability_type;
+	list($singular_base, $plural_base) = $args->capability_type;
 
 	$default_capabilities = array(
 		// Meta capabilities
-		'edit_post'          => 'edit_'         . $singular_base,
-		'read_post'          => 'read_'         . $singular_base,
-		'delete_post'        => 'delete_'       . $singular_base,
+		'edit_post'          => 'edit_'.$singular_base,
+		'read_post'          => 'read_'.$singular_base,
+		'delete_post'        => 'delete_'.$singular_base,
 		// Primitive capabilities used outside of map_meta_cap():
-		'edit_posts'         => 'edit_'         . $plural_base,
-		'edit_others_posts'  => 'edit_others_'  . $plural_base,
-		'publish_posts'      => 'publish_'      . $plural_base,
-		'read_private_posts' => 'read_private_' . $plural_base,
+		'edit_posts'         => 'edit_'.$plural_base,
+		'edit_others_posts'  => 'edit_others_'.$plural_base,
+		'publish_posts'      => 'publish_'.$plural_base,
+		'read_private_posts' => 'read_private_'.$plural_base,
 	);
 
 	// Primitive capabilities used within map_meta_cap():
-	if ( $args->map_meta_cap ) {
+	if ($args->map_meta_cap) {
 		$default_capabilities_for_mapping = array(
 			'read'                   => 'read',
-			'delete_posts'           => 'delete_'           . $plural_base,
-			'delete_private_posts'   => 'delete_private_'   . $plural_base,
-			'delete_published_posts' => 'delete_published_' . $plural_base,
-			'delete_others_posts'    => 'delete_others_'    . $plural_base,
-			'edit_private_posts'     => 'edit_private_'     . $plural_base,
-			'edit_published_posts'   => 'edit_published_'   . $plural_base,
+			'delete_posts'           => 'delete_'.$plural_base,
+			'delete_private_posts'   => 'delete_private_'.$plural_base,
+			'delete_published_posts' => 'delete_published_'.$plural_base,
+			'delete_others_posts'    => 'delete_others_'.$plural_base,
+			'edit_private_posts'     => 'edit_private_'.$plural_base,
+			'edit_published_posts'   => 'edit_published_'.$plural_base,
 		);
-		$default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
+		$default_capabilities = array_merge($default_capabilities, $default_capabilities_for_mapping);
 	}
 
-	$capabilities = array_merge( $default_capabilities, $args->capabilities );
+	$capabilities = array_merge($default_capabilities, $args->capabilities);
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
+	if ( ! isset($capabilities['create_posts']))
 		$capabilities['create_posts'] = $capabilities['edit_posts'];
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
-		_post_type_meta_capabilities( $capabilities );
+	if ($args->map_meta_cap)
+		_post_type_meta_capabilities($capabilities);
 
 	return (object) $capabilities;
 }
@@ -1298,12 +1298,12 @@ 
  *
  * @param array $capabilities Post type meta capabilities.
  */
-function _post_type_meta_capabilities( $capabilities = null ) {
+function _post_type_meta_capabilities($capabilities = null) {
 	global $post_type_meta_caps;
 
-	foreach ( $capabilities as $core => $custom ) {
-		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) {
-			$post_type_meta_caps[ $custom ] = $core;
+	foreach ($capabilities as $core => $custom) {
+		if (in_array($core, array('read_post', 'delete_post', 'edit_post'))) {
+			$post_type_meta_caps[$custom] = $core;
 		}
 	}
 }
@@ -1365,36 +1365,36 @@ 
  * @param object|WP_Post_Type $post_type_object Post type object.
  * @return object Object with all the labels as member variables.
  */
-function get_post_type_labels( $post_type_object ) {
+function get_post_type_labels($post_type_object) {
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-		'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-		'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-		'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-		'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-		'new_item' => array( __('New Post'), __('New Page') ),
-		'view_item' => array( __('View Post'), __('View Page') ),
-		'view_items' => array( __('View Posts'), __('View Pages') ),
-		'search_items' => array( __('Search Posts'), __('Search Pages') ),
-		'not_found' => array( __('No posts found.'), __('No pages found.') ),
-		'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-		'parent_item_colon' => array( null, __('Parent Page:') ),
-		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
-		'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
-		'attributes' => array( __( 'Post Attributes' ), __( 'Page Attributes' ) ),
-		'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
-		'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
-		'featured_image' => array( _x( 'Featured Image', 'post' ), _x( 'Featured Image', 'page' ) ),
-		'set_featured_image' => array( _x( 'Set featured image', 'post' ), _x( 'Set featured image', 'page' ) ),
-		'remove_featured_image' => array( _x( 'Remove featured image', 'post' ), _x( 'Remove featured image', 'page' ) ),
-		'use_featured_image' => array( _x( 'Use as featured image', 'post' ), _x( 'Use as featured image', 'page' ) ),
-		'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
-		'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
-		'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
+		'name' => array(_x('Posts', 'post type general name'), _x('Pages', 'post type general name')),
+		'singular_name' => array(_x('Post', 'post type singular name'), _x('Page', 'post type singular name')),
+		'add_new' => array(_x('Add New', 'post'), _x('Add New', 'page')),
+		'add_new_item' => array(__('Add New Post'), __('Add New Page')),
+		'edit_item' => array(__('Edit Post'), __('Edit Page')),
+		'new_item' => array(__('New Post'), __('New Page')),
+		'view_item' => array(__('View Post'), __('View Page')),
+		'view_items' => array(__('View Posts'), __('View Pages')),
+		'search_items' => array(__('Search Posts'), __('Search Pages')),
+		'not_found' => array(__('No posts found.'), __('No pages found.')),
+		'not_found_in_trash' => array(__('No posts found in Trash.'), __('No pages found in Trash.')),
+		'parent_item_colon' => array(null, __('Parent Page:')),
+		'all_items' => array(__('All Posts'), __('All Pages')),
+		'archives' => array(__('Post Archives'), __('Page Archives')),
+		'attributes' => array(__('Post Attributes'), __('Page Attributes')),
+		'insert_into_item' => array(__('Insert into post'), __('Insert into page')),
+		'uploaded_to_this_item' => array(__('Uploaded to this post'), __('Uploaded to this page')),
+		'featured_image' => array(_x('Featured Image', 'post'), _x('Featured Image', 'page')),
+		'set_featured_image' => array(_x('Set featured image', 'post'), _x('Set featured image', 'page')),
+		'remove_featured_image' => array(_x('Remove featured image', 'post'), _x('Remove featured image', 'page')),
+		'use_featured_image' => array(_x('Use as featured image', 'post'), _x('Use as featured image', 'page')),
+		'filter_items_list' => array(__('Filter posts list'), __('Filter pages list')),
+		'items_list_navigation' => array(__('Posts list navigation'), __('Pages list navigation')),
+		'items_list' => array(__('Posts list'), __('Pages list')),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
-	$labels = _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
+	$labels = _get_custom_object_labels($post_type_object, $nohier_vs_hier_defaults);
 
 	$post_type = $post_type_object->name;
 
@@ -1412,10 +1412,10 @@ 
 	 *
 	 * @param object $labels Object with labels for the post type as member variables.
 	 */
-	$labels = apply_filters( "post_type_labels_{$post_type}", $labels );
+	$labels = apply_filters("post_type_labels_{$post_type}", $labels);
 
 	// Ensure that the filtered labels contain all required default values.
-	$labels = (object) array_merge( (array) $default_labels, (array) $labels );
+	$labels = (object) array_merge((array) $default_labels, (array) $labels);
 
 	return $labels;
 }
@@ -1431,33 +1431,33 @@ 
  * @param array  $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels.
  * @return object Object containing labels for the given custom-something object.
  */
-function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
+function _get_custom_object_labels($object, $nohier_vs_hier_defaults) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
+	if (isset($object->label) && empty($object->labels['name']))
 		$object->labels['name'] = $object->label;
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['singular_name']) && isset($object->labels['name']))
 		$object->labels['singular_name'] = $object->labels['name'];
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset($object->labels['name_admin_bar']))
+		$object->labels['name_admin_bar'] = isset($object->labels['singular_name']) ? $object->labels['singular_name'] : $object->name;
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['menu_name']) && isset($object->labels['name']))
 		$object->labels['menu_name'] = $object->labels['name'];
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
+	if ( ! isset($object->labels['all_items']) && isset($object->labels['menu_name']))
 		$object->labels['all_items'] = $object->labels['menu_name'];
 
-	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+	if ( ! isset($object->labels['archives']) && isset($object->labels['all_items'])) {
 		$object->labels['archives'] = $object->labels['all_items'];
 	}
 
 	$defaults = array();
-	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+	foreach ($nohier_vs_hier_defaults as $key => $value) {
 		$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
 	}
-	$labels = array_merge( $defaults, $object->labels );
+	$labels = array_merge($defaults, $object->labels);
 	$object->labels = (object) $object->labels;
 
 	return (object) $labels;
@@ -1470,12 +1470,12 @@ 
  * @since 3.1.0
  */
 function _add_post_type_submenus() {
-	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
-		$ptype_obj = get_post_type_object( $ptype );
+	foreach (get_post_types(array('show_ui' => true)) as $ptype) {
+		$ptype_obj = get_post_type_object($ptype);
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true)
 			continue;
-		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
+		add_submenu_page($ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
 	}
 }
 
@@ -1499,15 +1499,15 @@ 
  * @param string|array $feature   The feature being added, accepts an array of
  *                                feature strings or a single string.
  */
-function add_post_type_support( $post_type, $feature ) {
+function add_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
 	$features = (array) $feature;
 	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
+		if (func_num_args() == 2)
 			$_wp_post_type_features[$post_type][$feature] = true;
 		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+			$_wp_post_type_features[$post_type][$feature] = array_slice(func_get_args(), 2);
 	}
 }
 
@@ -1521,10 +1521,10 @@ 
  * @param string $post_type The post type for which to remove the feature.
  * @param string $feature   The feature being removed.
  */
-function remove_post_type_support( $post_type, $feature ) {
+function remove_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	unset( $_wp_post_type_features[ $post_type ][ $feature ] );
+	unset($_wp_post_type_features[$post_type][$feature]);
 }
 
 /**
@@ -1537,10 +1537,10 @@ 
  * @param string $post_type The post type.
  * @return array Post type supports list.
  */
-function get_all_post_type_supports( $post_type ) {
+function get_all_post_type_supports($post_type) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
+	if (isset($_wp_post_type_features[$post_type]))
 		return $_wp_post_type_features[$post_type];
 
 	return array();
@@ -1557,10 +1557,10 @@ 
  * @param string $feature   The feature being checked.
  * @return bool Whether the post type supports the given feature.
  */
-function post_type_supports( $post_type, $feature ) {
+function post_type_supports($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	return ( isset( $_wp_post_type_features[$post_type][$feature] ) );
+	return (isset($_wp_post_type_features[$post_type][$feature]));
 }
 
 /**
@@ -1577,12 +1577,12 @@ 
  *                               match. Default 'and'.
  * @return array A list of post type names.
  */
-function get_post_types_by_support( $feature, $operator = 'and' ) {
+function get_post_types_by_support($feature, $operator = 'and') {
 	global $_wp_post_type_features;
 
-	$features = array_fill_keys( (array) $feature, true );
+	$features = array_fill_keys((array) $feature, true);
 
-	return array_keys( wp_filter_object_list( $_wp_post_type_features, $features, $operator ) );
+	return array_keys(wp_filter_object_list($_wp_post_type_features, $features, $operator));
 }
 
 /**
@@ -1599,13 +1599,13 @@ 
  *                          name a few. Default 'post'.
  * @return int|false Amount of rows changed. Should be 1 for success and 0 for failure.
  */
-function set_post_type( $post_id = 0, $post_type = 'post' ) {
+function set_post_type($post_id = 0, $post_type = 'post') {
 	global $wpdb;
 
 	$post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
-	$return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
+	$return = $wpdb->update($wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id));
 
-	clean_post_cache( $post_id );
+	clean_post_cache($post_id);
 
 	return $return;
 }
@@ -1623,15 +1623,15 @@ 
  * @param string|WP_Post_Type $post_type Post type name or object.
  * @return bool Whether the post type should be considered viewable.
  */
-function is_post_type_viewable( $post_type ) {
-	if ( is_scalar( $post_type ) ) {
-		$post_type = get_post_type_object( $post_type );
-		if ( ! $post_type ) {
+function is_post_type_viewable($post_type) {
+	if (is_scalar($post_type)) {
+		$post_type = get_post_type_object($post_type);
+		if ( ! $post_type) {
 			return false;
 		}
 	}
 
-	return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+	return $post_type->publicly_queryable || ($post_type->_builtin && $post_type->public);
 }
 
 /**
@@ -1658,7 +1658,7 @@ 
  * }
  * @return array List of posts.
  */
-function get_posts( $args = null ) {
+function get_posts($args = null) {
 	$defaults = array(
 		'numberposts' => 5,
 		'category' => 0, 'orderby' => 'date',
@@ -1668,19 +1668,19 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
-		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
+	$r = wp_parse_args($args, $defaults);
+	if (empty($r['post_status']))
+		$r['post_status'] = ('attachment' == $r['post_type']) ? 'inherit' : 'publish';
+	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']))
 		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
+	if ( ! empty($r['category']))
 		$r['cat'] = $r['category'];
-	if ( ! empty($r['include']) ) {
-		$incposts = wp_parse_id_list( $r['include'] );
-		$r['posts_per_page'] = count($incposts);  // only the number of posts included
+	if ( ! empty($r['include'])) {
+		$incposts = wp_parse_id_list($r['include']);
+		$r['posts_per_page'] = count($incposts); // only the number of posts included
 		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
-		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	} elseif ( ! empty($r['exclude']))
+		$r['post__not_in'] = wp_parse_id_list($r['exclude']);
 
 	$r['ignore_sticky_posts'] = true;
 	$r['no_found_rows'] = true;
@@ -1708,9 +1708,9 @@ 
  *                           Default false.
  * @return int|false Meta ID on success, false on failure.
  */
-function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
+function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
@@ -1731,9 +1731,9 @@ 
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
-function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
+function delete_post_meta($post_id, $meta_key, $meta_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return delete_metadata('post', $post_id, $meta_key, $meta_value);
@@ -1751,7 +1751,7 @@ 
  * @return mixed Will be an array if $single is false. Will be value of meta data
  *               field if $single is true.
  */
-function get_post_meta( $post_id, $key = '', $single = false ) {
+function get_post_meta($post_id, $key = '', $single = false) {
 	return get_metadata('post', $post_id, $key, $single);
 }
 
@@ -1773,9 +1773,9 @@ 
  * @return int|bool Meta ID if the key didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
+function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
@@ -1789,8 +1789,8 @@ 
  * @param string $post_meta_key Key to search for when deleting.
  * @return bool Whether the post meta key was deleted from the database.
  */
-function delete_post_meta_by_key( $post_meta_key ) {
-	return delete_metadata( 'post', null, $post_meta_key, '', true );
+function delete_post_meta_by_key($post_meta_key) {
+	return delete_metadata('post', null, $post_meta_key, '', true);
 }
 
 /**
@@ -1804,12 +1804,12 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array Post meta for the given post.
  */
-function get_post_custom( $post_id = 0 ) {
-	$post_id = absint( $post_id );
-	if ( ! $post_id )
+function get_post_custom($post_id = 0) {
+	$post_id = absint($post_id);
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	return get_post_meta( $post_id );
+	return get_post_meta($post_id);
 }
 
 /**
@@ -1822,13 +1822,13 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|void Array of the keys, if retrieved.
  */
-function get_post_custom_keys( $post_id = 0 ) {
-	$custom = get_post_custom( $post_id );
+function get_post_custom_keys($post_id = 0) {
+	$custom = get_post_custom($post_id);
 
-	if ( !is_array($custom) )
+	if ( ! is_array($custom))
 		return;
 
-	if ( $keys = array_keys($custom) )
+	if ($keys = array_keys($custom))
 		return $keys;
 }
 
@@ -1844,8 +1844,8 @@ 
  * @param int    $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|null Meta field values.
  */
-function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
+function get_post_custom_values($key = '', $post_id = 0) {
+	if ( ! $key)
 		return null;
 
 	$custom = get_post_custom($post_id);
@@ -1864,18 +1864,18 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return bool Whether post is sticky.
  */
-function is_sticky( $post_id = 0 ) {
-	$post_id = absint( $post_id );
+function is_sticky($post_id = 0) {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	$stickies = get_option( 'sticky_posts' );
+	$stickies = get_option('sticky_posts');
 
-	if ( ! is_array( $stickies ) )
+	if ( ! is_array($stickies))
 		return false;
 
-	if ( in_array( $post_id, $stickies ) )
+	if (in_array($post_id, $stickies))
 		return true;
 
 	return false;
@@ -1898,23 +1898,23 @@ 
  * @return object|WP_Post|array The now sanitized Post Object or Array (will be the
  *                              same type as $post).
  */
-function sanitize_post( $post, $context = 'display' ) {
-	if ( is_object($post) ) {
+function sanitize_post($post, $context = 'display') {
+	if (is_object($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
+		if (isset($post->filter) && $context == $post->filter)
 			return $post;
-		if ( !isset($post->ID) )
+		if ( ! isset($post->ID))
 			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
+		foreach (array_keys(get_object_vars($post)) as $field)
 			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
 		$post->filter = $context;
-	} elseif ( is_array( $post ) ) {
+	} elseif (is_array($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
+		if (isset($post['filter']) && $context == $post['filter'])
 			return $post;
-		if ( !isset($post['ID']) )
+		if ( ! isset($post['ID']))
 			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
+		foreach (array_keys($post) as $field)
 			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
 		$post['filter'] = $context;
 	}
@@ -1938,31 +1938,31 @@ 
  *                        'db', 'display', 'attribute' and 'js'. Default 'display'.
  * @return mixed Sanitized value.
  */
-function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
+function sanitize_post_field($field, $value, $post_id, $context = 'display') {
 	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
 	// Fields which contain arrays of integers.
-	$array_int_fields = array( 'ancestors' );
-	if ( in_array($field, $array_int_fields) ) {
-		$value = array_map( 'absint', $value);
+	$array_int_fields = array('ancestors');
+	if (in_array($field, $array_int_fields)) {
+		$value = array_map('absint', $value);
 		return $value;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
 	$prefixed = false;
-	if ( false !== strpos($field, 'post_') ) {
+	if (false !== strpos($field, 'post_')) {
 		$prefixed = true;
 		$field_no_prefix = str_replace('post_', '', $field);
 	}
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		$format_to_edit = array('post_content', 'post_excerpt', 'post_title', 'post_password');
 
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field to edit.
@@ -1975,7 +1975,7 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "edit_{$field}", $value, $post_id );
+			$value = apply_filters("edit_{$field}", $value, $post_id);
 
 			/**
 			 * Filters the value of a specific post field to edit.
@@ -1988,21 +1988,21 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_edit_pre", $value, $post_id );
+			$value = apply_filters("{$field_no_prefix}_edit_pre", $value, $post_id);
 		} else {
-			$value = apply_filters( "edit_post_{$field}", $value, $post_id );
+			$value = apply_filters("edit_post_{$field}", $value, $post_id);
 		}
 
-		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
+		if (in_array($field, $format_to_edit)) {
+			if ('post_content' == $field)
 				$value = format_to_edit($value, user_can_richedit());
 			else
 				$value = format_to_edit($value);
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field before saving.
@@ -2014,7 +2014,7 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 
 			/**
 			 * Filters the value of a specific field before saving.
@@ -2026,9 +2026,9 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_save_pre", $value );
+			$value = apply_filters("{$field_no_prefix}_save_pre", $value);
 		} else {
-			$value = apply_filters( "pre_post_{$field}", $value );
+			$value = apply_filters("pre_post_{$field}", $value);
 
 			/**
 			 * Filters the value of a specific post field before saving.
@@ -2040,12 +2040,12 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field}_pre", $value );
+			$value = apply_filters("{$field}_pre", $value);
 		}
 	} else {
 
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field for display.
@@ -2061,15 +2061,15 @@ 
 			 *                        values include 'raw', 'edit', 'db', 'display',
 			 *                        'attribute' and 'js'.
 			 */
-			$value = apply_filters( "{$field}", $value, $post_id, $context );
+			$value = apply_filters("{$field}", $value, $post_id, $context);
 		} else {
-			$value = apply_filters( "post_{$field}", $value, $post_id, $context );
+			$value = apply_filters("post_{$field}", $value, $post_id, $context);
 		}
 
-		if ( 'attribute' == $context ) {
-			$value = esc_attr( $value );
-		} elseif ( 'js' == $context ) {
-			$value = esc_js( $value );
+		if ('attribute' == $context) {
+			$value = esc_attr($value);
+		} elseif ('js' == $context) {
+			$value = esc_js($value);
 		}
 	}
 
@@ -2085,18 +2085,18 @@ 
  *
  * @param int $post_id Post ID.
  */
-function stick_post( $post_id ) {
+function stick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		$stickies = array($post_id);
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		$stickies[] = $post_id;
 
-	$updated = update_option( 'sticky_posts', $stickies );
+	$updated = update_option('sticky_posts', $stickies);
 
-	if ( $updated ) {
+	if ($updated) {
 		/**
 		 * Fires once a post has been added to the sticky list.
 		 *
@@ -2104,7 +2104,7 @@ 
 		 *
 		 * @param int $post_id ID of the post that was stuck.
 		 */
-		do_action( 'post_stuck', $post_id );
+		do_action('post_stuck', $post_id);
 	}
 }
 
@@ -2117,24 +2117,24 @@ 
  *
  * @param int $post_id Post ID.
  */
-function unstick_post( $post_id ) {
+function unstick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		return;
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		return;
 
 	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
+	if (false === $offset)
 		return;
 
 	array_splice($stickies, $offset, 1);
 
-	$updated = update_option( 'sticky_posts', $stickies );
+	$updated = update_option('sticky_posts', $stickies);
 
-	if ( $updated ) {
+	if ($updated) {
 		/**
 		 * Fires once a post has been removed from the sticky list.
 		 *
@@ -2142,7 +2142,7 @@ 
 		 *
 		 * @param int $post_id ID of the post that was unstuck.
 		 */
-		do_action( 'post_unstuck', $post_id );
+		do_action('post_unstuck', $post_id);
 	}
 }
 
@@ -2155,12 +2155,12 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return string The cache key.
  */
-function _count_posts_cache_key( $type = 'post', $perm = '' ) {
-	$cache_key = 'posts-' . $type;
-	if ( 'readable' == $perm && is_user_logged_in() ) {
-		$post_type_object = get_post_type_object( $type );
-		if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$cache_key .= '_' . $perm . '_' . get_current_user_id();
+function _count_posts_cache_key($type = 'post', $perm = '') {
+	$cache_key = 'posts-'.$type;
+	if ('readable' == $perm && is_user_logged_in()) {
+		$post_type_object = get_post_type_object($type);
+		if ($post_type_object && ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$cache_key .= '_'.$perm.'_'.get_current_user_id();
 		}
 	}
 	return $cache_key;
@@ -2185,40 +2185,40 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return object Number of posts for each status.
  */
-function wp_count_posts( $type = 'post', $perm = '' ) {
+function wp_count_posts($type = 'post', $perm = '') {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
+	if ( ! post_type_exists($type))
 		return new stdClass;
 
-	$cache_key = _count_posts_cache_key( $type, $perm );
+	$cache_key = _count_posts_cache_key($type, $perm);
 
-	$counts = wp_cache_get( $cache_key, 'counts' );
-	if ( false !== $counts ) {
+	$counts = wp_cache_get($cache_key, 'counts');
+	if (false !== $counts) {
 		/** This filter is documented in wp-includes/post.php */
-		return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+		return apply_filters('wp_count_posts', $counts, $type, $perm);
 	}
 
 	$query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
-	if ( 'readable' == $perm && is_user_logged_in() ) {
+	if ('readable' == $perm && is_user_logged_in()) {
 		$post_type_object = get_post_type_object($type);
-		if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$query .= $wpdb->prepare( " AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
+		if ( ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$query .= $wpdb->prepare(" AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
 				get_current_user_id()
 			);
 		}
 	}
 	$query .= ' GROUP BY post_status';
 
-	$results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
-	$counts = array_fill_keys( get_post_stati(), 0 );
+	$results = (array) $wpdb->get_results($wpdb->prepare($query, $type), ARRAY_A);
+	$counts = array_fill_keys(get_post_stati(), 0);
 
-	foreach ( $results as $row ) {
-		$counts[ $row['post_status'] ] = $row['num_posts'];
+	foreach ($results as $row) {
+		$counts[$row['post_status']] = $row['num_posts'];
 	}
 
 	$counts = (object) $counts;
-	wp_cache_set( $cache_key, $counts, 'counts' );
+	wp_cache_set($cache_key, $counts, 'counts');
 
 	/**
 	 * Modify returned post counts by status for the current post type.
@@ -2231,7 +2231,7 @@ 
 	 * @param string $perm   The permission to determine if the posts are 'readable'
 	 *                       by the current user.
 	 */
-	return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+	return apply_filters('wp_count_posts', $counts, $type, $perm);
 }
 
 /**
@@ -2250,17 +2250,17 @@ 
  *                                MIME patterns. Default empty.
  * @return object An object containing the attachment counts by mime type.
  */
-function wp_count_attachments( $mime_type = '' ) {
+function wp_count_attachments($mime_type = '') {
 	global $wpdb;
 
-	$and = wp_post_mime_type_where( $mime_type );
-	$count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
+	$and = wp_post_mime_type_where($mime_type);
+	$count = $wpdb->get_results("SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A);
 
 	$counts = array();
-	foreach ( (array) $count as $row ) {
-		$counts[ $row['post_mime_type'] ] = $row['num_posts'];
+	foreach ((array) $count as $row) {
+		$counts[$row['post_mime_type']] = $row['num_posts'];
 	}
-	$counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
+	$counts['trash'] = $wpdb->get_var("SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
 
 	/**
 	 * Modify returned attachment counts by mime type.
@@ -2272,7 +2272,7 @@ 
 	 * @param string $mime_type The mime type pattern used to filter the attachments
 	 *                          counted.
 	 */
-	return apply_filters( 'wp_count_attachments', (object) $counts, $mime_type );
+	return apply_filters('wp_count_attachments', (object) $counts, $mime_type);
 }
 
 /**
@@ -2296,7 +2296,7 @@ 
 	 *
 	 * @param array $post_mime_types Default list of post mime types.
 	 */
-	return apply_filters( 'post_mime_types', $post_mime_types );
+	return apply_filters('post_mime_types', $post_mime_types);
 }
 
 /**
@@ -2313,35 +2313,35 @@ 
  * @param string|array $real_mime_types     Real post mime type values.
  * @return array array(wildcard=>array(real types)).
  */
-function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
+function wp_match_mime_types($wildcard_mime_types, $real_mime_types) {
 	$matches = array();
-	if ( is_string( $wildcard_mime_types ) ) {
-		$wildcard_mime_types = array_map( 'trim', explode( ',', $wildcard_mime_types ) );
+	if (is_string($wildcard_mime_types)) {
+		$wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types));
 	}
-	if ( is_string( $real_mime_types ) ) {
-		$real_mime_types = array_map( 'trim', explode( ',', $real_mime_types ) );
+	if (is_string($real_mime_types)) {
+		$real_mime_types = array_map('trim', explode(',', $real_mime_types));
 	}
 
 	$patternses = array();
 	$wild = '[-._a-z0-9]*';
 
-	foreach ( (array) $wildcard_mime_types as $type ) {
-		$mimes = array_map( 'trim', explode( ',', $type ) );
-		foreach ( $mimes as $mime ) {
-			$regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+	foreach ((array) $wildcard_mime_types as $type) {
+		$mimes = array_map('trim', explode(',', $type));
+		foreach ($mimes as $mime) {
+			$regex = str_replace('__wildcard__', $wild, preg_quote(str_replace('*', '__wildcard__', $mime)));
 			$patternses[][$type] = "^$regex$";
-			if ( false === strpos( $mime, '/' ) ) {
+			if (false === strpos($mime, '/')) {
 				$patternses[][$type] = "^$regex/";
 				$patternses[][$type] = $regex;
 			}
 		}
 	}
-	asort( $patternses );
+	asort($patternses);
 
-	foreach ( $patternses as $patterns ) {
-		foreach ( $patterns as $type => $pattern ) {
-			foreach ( (array) $real_mime_types as $real ) {
-				if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) {
+	foreach ($patternses as $patterns) {
+		foreach ($patterns as $type => $pattern) {
+			foreach ((array) $real_mime_types as $real) {
+				if (preg_match("#$pattern#", $real) && (empty($matches[$type]) || false === array_search($real, $matches[$type]))) {
 					$matches[$type][] = $real;
 				}
 			}
@@ -2361,43 +2361,43 @@ 
  *                                      Default empty.
  * @return string The SQL AND clause for mime searching.
  */
-function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
+function wp_post_mime_type_where($post_mime_types, $table_alias = '') {
 	$where = '';
 	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
+	if (is_string($post_mime_types))
 		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
 
 	$wheres = array();
 
-	foreach ( (array) $post_mime_types as $mime_type ) {
+	foreach ((array) $post_mime_types as $mime_type) {
 		$mime_type = preg_replace('/\s/', '', $mime_type);
 		$slashpos = strpos($mime_type, '/');
-		if ( false !== $slashpos ) {
+		if (false !== $slashpos) {
 			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
 			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
+			if (empty($mime_subgroup))
 				$mime_subgroup = '*';
 			else
 				$mime_subgroup = str_replace('/', '', $mime_subgroup);
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
+			if (false === strpos($mime_pattern, '*'))
 				$mime_pattern .= '/*';
 		}
 
 		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
 
-		if ( in_array( $mime_type, $wildcards ) )
+		if (in_array($mime_type, $wildcards))
 			return '';
 
-		if ( false !== strpos($mime_pattern, '%') )
+		if (false !== strpos($mime_pattern, '%'))
 			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
 		else
 			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
+	if ( ! empty($wheres))
+		$where = ' AND ('.join(' OR ', $wheres).') ';
 	return $where;
 }
 
@@ -2422,17 +2422,17 @@ 
  *                           Default false.
  * @return array|false|WP_Post False on failure.
  */
-function wp_delete_post( $postid = 0, $force_delete = false ) {
+function wp_delete_post($postid = 0, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)))
 		return $post;
 
-	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
-		return wp_trash_post( $postid );
+	if ( ! $force_delete && ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS)
+		return wp_trash_post($postid);
 
-	if ( $post->post_type == 'attachment' )
-		return wp_delete_attachment( $postid, $force_delete );
+	if ($post->post_type == 'attachment')
+		return wp_delete_attachment($postid, $force_delete);
 
 	/**
 	 * Filters whether a post deletion should take place.
@@ -2443,8 +2443,8 @@ 
 	 * @param WP_Post $post         Post object.
 	 * @param bool    $force_delete Whether to bypass the trash.
 	 */
-	$check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
-	if ( null !== $check ) {
+	$check = apply_filters('pre_delete_post', null, $post, $force_delete);
+	if (null !== $check) {
 		return $check;
 	}
 
@@ -2457,46 +2457,46 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'before_delete_post', $postid );
+	do_action('before_delete_post', $postid);
 
-	delete_post_meta($postid,'_wp_trash_meta_status');
-	delete_post_meta($postid,'_wp_trash_meta_time');
+	delete_post_meta($postid, '_wp_trash_meta_status');
+	delete_post_meta($postid, '_wp_trash_meta_time');
 
 	wp_delete_object_term_relationships($postid, get_object_taxonomies($post->post_type));
 
-	$parent_data = array( 'post_parent' => $post->post_parent );
-	$parent_where = array( 'post_parent' => $postid );
+	$parent_data = array('post_parent' => $post->post_parent);
+	$parent_where = array('post_parent' => $postid);
 
-	if ( is_post_type_hierarchical( $post->post_type ) ) {
+	if (is_post_type_hierarchical($post->post_type)) {
 		// Point children of this page to its parent, also clean the cache of affected children.
-		$children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type );
-		$children = $wpdb->get_results( $children_query );
-		if ( $children ) {
-			$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+		$children_query = $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type);
+		$children = $wpdb->get_results($children_query);
+		if ($children) {
+			$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => $post->post_type));
 		}
 	}
 
 	// Do raw query. wp_get_post_revisions() is filtered.
-	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
+	$revision_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid));
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
-		wp_delete_post_revision( $revision_id );
+	foreach ($revision_ids as $revision_id)
+		wp_delete_post_revision($revision_id);
 
 	// Point all attachments to this post up one level.
-	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
+	$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => 'attachment'));
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2505,9 +2505,9 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'delete_post', $postid );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $postid ) );
-	if ( ! $result ) {
+	do_action('delete_post', $postid);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $postid));
+	if ( ! $result) {
 		return false;
 	}
 
@@ -2518,16 +2518,16 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'deleted_post', $postid );
+	do_action('deleted_post', $postid);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
-	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
-			clean_post_cache( $child );
+	if (is_post_type_hierarchical($post->post_type) && $children) {
+		foreach ($children as $child)
+			clean_post_cache($child);
 	}
 
-	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
+	wp_clear_scheduled_hook('publish_future_post', array($postid));
 
 	/**
 	 * Fires after a post is deleted, at the conclusion of wp_delete_post().
@@ -2538,7 +2538,7 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'after_delete_post', $postid );
+	do_action('after_delete_post', $postid);
 
 	return $post;
 }
@@ -2554,22 +2554,22 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _reset_front_page_settings_for_post( $post_id ) {
-	$post = get_post( $post_id );
-	if ( 'page' == $post->post_type ) {
+function _reset_front_page_settings_for_post($post_id) {
+	$post = get_post($post_id);
+	if ('page' == $post->post_type) {
 	 	/*
 	 	 * If the page is defined in option page_on_front or post_for_posts,
 	 	 * adjust the corresponding options.
 	 	 */
-		if ( get_option( 'page_on_front' ) == $post->ID ) {
-			update_option( 'show_on_front', 'posts' );
-			update_option( 'page_on_front', 0 );
+		if (get_option('page_on_front') == $post->ID) {
+			update_option('show_on_front', 'posts');
+			update_option('page_on_front', 0);
 		}
-		if ( get_option( 'page_for_posts' ) == $post->ID ) {
-			delete_option( 'page_for_posts', 0 );
+		if (get_option('page_for_posts') == $post->ID) {
+			delete_option('page_for_posts', 0);
 		}
 	}
-	unstick_post( $post->ID );
+	unstick_post($post->ID);
 }
 
 /**
@@ -2585,14 +2585,14 @@ 
  *                     if EMPTY_TRASH_DAYS equals true.
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
-function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
+function wp_trash_post($post_id = 0) {
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_post($post_id, true);
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] == 'trash' )
+	if ($post['post_status'] == 'trash')
 		return false;
 
 	/**
@@ -2602,13 +2602,13 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'wp_trash_post', $post_id );
+	do_action('wp_trash_post', $post_id);
 
-	add_post_meta($post_id,'_wp_trash_meta_status', $post['post_status']);
-	add_post_meta($post_id,'_wp_trash_meta_time', time());
+	add_post_meta($post_id, '_wp_trash_meta_status', $post['post_status']);
+	add_post_meta($post_id, '_wp_trash_meta_time', time());
 
 	$post['post_status'] = 'trash';
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_trash_post_comments($post_id);
 
@@ -2619,7 +2619,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trashed_post', $post_id );
+	do_action('trashed_post', $post_id);
 
 	return $post;
 }
@@ -2632,11 +2632,11 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return WP_Post|false WP_Post object. False on failure.
  */
-function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
+function wp_untrash_post($post_id = 0) {
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] != 'trash' )
+	if ($post['post_status'] != 'trash')
 		return false;
 
 	/**
@@ -2646,7 +2646,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post', $post_id );
+	do_action('untrash_post', $post_id);
 
 	$post_status = get_post_meta($post_id, '_wp_trash_meta_status', true);
 
@@ -2655,7 +2655,7 @@ 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_untrash_post_comments($post_id);
 
@@ -2666,7 +2666,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post', $post_id );
+	do_action('untrashed_post', $post_id);
 
 	return $post;
 }
@@ -2681,11 +2681,11 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
-function wp_trash_post_comments( $post = null ) {
+function wp_trash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
@@ -2697,22 +2697,22 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trash_post_comments', $post_id );
+	do_action('trash_post_comments', $post_id);
 
-	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
+	$comments = $wpdb->get_results($wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	if (empty($comments))
 		return;
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
+	foreach ($comments as $comment)
 		$statuses[$comment->comment_ID] = $comment->comment_approved;
 	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
 
 	// Set status for all comments to post-trashed.
 	$result = $wpdb->update($wpdb->comments, array('comment_approved' => 'post-trashed'), array('comment_post_ID' => $post_id));
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	/**
 	 * Fires after comments are sent to the trash.
@@ -2722,7 +2722,7 @@ 
 	 * @param int   $post_id  Post ID.
 	 * @param array $statuses Array of comment statuses.
 	 */
-	do_action( 'trashed_post_comments', $post_id, $statuses );
+	do_action('trashed_post_comments', $post_id, $statuses);
 
 	return $result;
 }
@@ -2737,18 +2737,18 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return true|void
  */
-function wp_untrash_post_comments( $post = null ) {
+function wp_untrash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
 
 	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
 
-	if ( empty($statuses) )
+	if (empty($statuses))
 		return true;
 
 	/**
@@ -2758,23 +2758,23 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post_comments', $post_id );
+	do_action('untrash_post_comments', $post_id);
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
+	foreach ($statuses as $comment_id => $comment_status)
 		$group_by_status[$comment_status][] = $comment_id;
 
-	foreach ( $group_by_status as $status => $comments ) {
+	foreach ($group_by_status as $status => $comments) {
 		// Sanity check. This shouldn't happen.
-		if ( 'post-trashed' == $status ) {
+		if ('post-trashed' == $status) {
 			$status = '0';
 		}
-		$comments_in = implode( ', ', array_map( 'intval', $comments ) );
-		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) );
+		$comments_in = implode(', ', array_map('intval', $comments));
+		$wpdb->query($wpdb->prepare("UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status));
 	}
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	delete_post_meta($post_id, '_wp_trash_meta_comments_status');
 
@@ -2785,7 +2785,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post_comments', $post_id );
+	do_action('untrashed_post_comments', $post_id);
 }
 
 /**
@@ -2807,11 +2807,11 @@ 
  *                        is 'ids', an array of category ids. If `$fields` is 'names', an array of category names.
  *                        WP_Error object if 'category' taxonomy doesn't exist.
  */
-function wp_get_post_categories( $post_id = 0, $args = array() ) {
+function wp_get_post_categories($post_id = 0, $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'ids');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$cats = wp_get_object_terms($post_id, 'category', $args);
 	return $cats;
@@ -2833,8 +2833,8 @@ 
  * @return array|WP_Error Array of WP_Term objects on success or empty array if no tags were found.
  *                        WP_Error object if 'post_tag' taxonomy doesn't exist.
  */
-function wp_get_post_tags( $post_id = 0, $args = array() ) {
-	return wp_get_post_terms( $post_id, 'post_tag', $args);
+function wp_get_post_tags($post_id = 0, $args = array()) {
+	return wp_get_post_terms($post_id, 'post_tag', $args);
 }
 
 /**
@@ -2854,11 +2854,11 @@ 
  * @return array|WP_Error  Array of WP_Term objects on success or empty array if no terms were found.
  *                         WP_Error object if `$taxonomy` doesn't exist.
  */
-function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
+function wp_get_post_terms($post_id = 0, $taxonomy = 'post_tag', $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'all');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$tags = wp_get_object_terms($post_id, $taxonomy, $args);
 
@@ -2878,11 +2878,11 @@ 
  * @return array|false Array of recent posts, where the type of each element is determined by $output parameter.
  *                     Empty array on failure.
  */
-function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
+function wp_get_recent_posts($args = array(), $output = ARRAY_A) {
 
-	if ( is_numeric( $args ) ) {
-		_deprecated_argument( __FUNCTION__, '3.1.0', __( 'Passing an integer number of posts is deprecated. Pass an array of arguments instead.' ) );
-		$args = array( 'numberposts' => absint( $args ) );
+	if (is_numeric($args)) {
+		_deprecated_argument(__FUNCTION__, '3.1.0', __('Passing an integer number of posts is deprecated. Pass an array of arguments instead.'));
+		$args = array('numberposts' => absint($args));
 	}
 
 	// Set default arguments.
@@ -2895,14 +2895,14 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$results = get_posts( $r );
+	$results = get_posts($r);
 
 	// Backward compatibility. Prior to 3.1 expected posts to be returned in array.
-	if ( ARRAY_A == $output ){
-		foreach ( $results as $key => $result ) {
-			$results[$key] = get_object_vars( $result );
+	if (ARRAY_A == $output) {
+		foreach ($results as $key => $result) {
+			$results[$key] = get_object_vars($result);
 		}
 		return $results ? $results : array();
 	}
@@ -2970,7 +2970,7 @@ 
  * @param bool  $wp_error Optional. Whether to return a WP_Error on failure. Default false.
  * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure.
  */
-function wp_insert_post( $postarr, $wp_error = false ) {
+function wp_insert_post($postarr, $wp_error = false) {
 	global $wpdb;
 
 	$user_id = get_current_user_id();
@@ -2997,7 +2997,7 @@ 
 
 	$postarr = wp_parse_args($postarr, $defaults);
 
-	unset( $postarr[ 'filter' ] );
+	unset($postarr['filter']);
 
 	$postarr = sanitize_post($postarr, 'db');
 
@@ -3006,42 +3006,42 @@ 
 	$update = false;
 	$guid = $postarr['guid'];
 
-	if ( ! empty( $postarr['ID'] ) ) {
+	if ( ! empty($postarr['ID'])) {
 		$update = true;
 
 		// Get the post ID and GUID.
 		$post_ID = $postarr['ID'];
-		$post_before = get_post( $post_ID );
-		if ( is_null( $post_before ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		$post_before = get_post($post_ID);
+		if (is_null($post_before)) {
+			if ($wp_error) {
+				return new WP_Error('invalid_post', __('Invalid post ID.'));
 			}
 			return 0;
 		}
 
-		$guid = get_post_field( 'guid', $post_ID );
-		$previous_status = get_post_field('post_status', $post_ID );
+		$guid = get_post_field('guid', $post_ID);
+		$previous_status = get_post_field('post_status', $post_ID);
 	} else {
 		$previous_status = 'new';
 	}
 
-	$post_type = empty( $postarr['post_type'] ) ? 'post' : $postarr['post_type'];
+	$post_type = empty($postarr['post_type']) ? 'post' : $postarr['post_type'];
 
 	$post_title = $postarr['post_title'];
 	$post_content = $postarr['post_content'];
 	$post_excerpt = $postarr['post_excerpt'];
-	if ( isset( $postarr['post_name'] ) ) {
+	if (isset($postarr['post_name'])) {
 		$post_name = $postarr['post_name'];
-	} elseif ( $update ) {
+	} elseif ($update) {
 		// For an update, don't modify the post_name if it wasn't supplied as an argument.
 		$post_name = $post_before->post_name;
 	}
 
 	$maybe_empty = 'attachment' !== $post_type
 		&& ! $post_content && ! $post_title && ! $post_excerpt
-		&& post_type_supports( $post_type, 'editor' )
-		&& post_type_supports( $post_type, 'title' )
-		&& post_type_supports( $post_type, 'excerpt' );
+		&& post_type_supports($post_type, 'editor')
+		&& post_type_supports($post_type, 'title')
+		&& post_type_supports($post_type, 'excerpt');
 
 	/**
 	 * Filters whether the post should be considered "empty".
@@ -3059,36 +3059,36 @@ 
 	 * @param bool  $maybe_empty Whether the post should be considered "empty".
 	 * @param array $postarr     Array of post data.
 	 */
-	if ( apply_filters( 'wp_insert_post_empty_content', $maybe_empty, $postarr ) ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'empty_content', __( 'Content, title, and excerpt are empty.' ) );
+	if (apply_filters('wp_insert_post_empty_content', $maybe_empty, $postarr)) {
+		if ($wp_error) {
+			return new WP_Error('empty_content', __('Content, title, and excerpt are empty.'));
 		} else {
 			return 0;
 		}
 	}
 
-	$post_status = empty( $postarr['post_status'] ) ? 'draft' : $postarr['post_status'];
-	if ( 'attachment' === $post_type && ! in_array( $post_status, array( 'inherit', 'private', 'trash', 'auto-draft' ), true ) ) {
+	$post_status = empty($postarr['post_status']) ? 'draft' : $postarr['post_status'];
+	if ('attachment' === $post_type && ! in_array($post_status, array('inherit', 'private', 'trash', 'auto-draft'), true)) {
 		$post_status = 'inherit';
 	}
 
-	if ( ! empty( $postarr['post_category'] ) ) {
+	if ( ! empty($postarr['post_category'])) {
 		// Filter out empty terms.
-		$post_category = array_filter( $postarr['post_category'] );
+		$post_category = array_filter($postarr['post_category']);
 	}
 
 	// Make sure we set a valid category.
-	if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
+	if (empty($post_category) || 0 == count($post_category) || ! is_array($post_category)) {
 		// 'post' requires at least one category.
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_category = array( get_option('default_category') );
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_category = array(get_option('default_category'));
 		} else {
 			$post_category = array();
 		}
 	}
 
 	// Don't allow contributors to set the post slug for pending review posts.
-	if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) {
+	if ('pending' == $post_status && ! current_user_can('publish_posts')) {
 		$post_name = '';
 	}
 
@@ -3096,16 +3096,16 @@ 
 	 * Create a valid post name. Drafts and pending posts are allowed to have
 	 * an empty post name.
 	 */
-	if ( empty($post_name) ) {
-		if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
+	if (empty($post_name)) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
 			$post_name = sanitize_title($post_title);
 		} else {
 			$post_name = '';
 		}
 	} else {
 		// On updates, we need to check to see if it's using the old, fixed sanitization context.
-		$check_name = sanitize_title( $post_name, '', 'old-save' );
-		if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
+		$check_name = sanitize_title($post_name, '', 'old-save');
+		if ($update && strtolower(urlencode($post_name)) == $check_name && get_post_field('post_name', $post_ID) == $check_name) {
 			$post_name = $check_name;
 		} else { // new post, or slug has changed.
 			$post_name = sanitize_title($post_name);
@@ -3116,32 +3116,32 @@ 
 	 * If the post date is empty (due to having been new or a draft) and status
 	 * is not 'draft' or 'pending', set date to now.
 	 */
-	if ( empty( $postarr['post_date'] ) || '0000-00-00 00:00:00' == $postarr['post_date'] ) {
-		if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-			$post_date = current_time( 'mysql' );
+	if (empty($postarr['post_date']) || '0000-00-00 00:00:00' == $postarr['post_date']) {
+		if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+			$post_date = current_time('mysql');
 		} else {
-			$post_date = get_date_from_gmt( $postarr['post_date_gmt'] );
+			$post_date = get_date_from_gmt($postarr['post_date_gmt']);
 		}
 	} else {
 		$post_date = $postarr['post_date'];
 	}
 
 	// Validate the date.
-	$mm = substr( $post_date, 5, 2 );
-	$jj = substr( $post_date, 8, 2 );
-	$aa = substr( $post_date, 0, 4 );
-	$valid_date = wp_checkdate( $mm, $jj, $aa, $post_date );
-	if ( ! $valid_date ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
+	$mm = substr($post_date, 5, 2);
+	$jj = substr($post_date, 8, 2);
+	$aa = substr($post_date, 0, 4);
+	$valid_date = wp_checkdate($mm, $jj, $aa, $post_date);
+	if ( ! $valid_date) {
+		if ($wp_error) {
+			return new WP_Error('invalid_date', __('Invalid date.'));
 		} else {
 			return 0;
 		}
 	}
 
-	if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-		if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
-			$post_date_gmt = get_gmt_from_date( $post_date );
+	if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
+			$post_date_gmt = get_gmt_from_date($post_date);
 		} else {
 			$post_date_gmt = '0000-00-00 00:00:00';
 		}
@@ -3149,34 +3149,34 @@ 
 		$post_date_gmt = $postarr['post_date_gmt'];
 	}
 
-	if ( $update || '0000-00-00 00:00:00' == $post_date ) {
-		$post_modified     = current_time( 'mysql' );
-		$post_modified_gmt = current_time( 'mysql', 1 );
+	if ($update || '0000-00-00 00:00:00' == $post_date) {
+		$post_modified     = current_time('mysql');
+		$post_modified_gmt = current_time('mysql', 1);
 	} else {
 		$post_modified     = $post_date;
 		$post_modified_gmt = $post_date_gmt;
 	}
 
-	if ( 'attachment' !== $post_type ) {
-		if ( 'publish' == $post_status ) {
+	if ('attachment' !== $post_type) {
+		if ('publish' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false)) {
 				$post_status = 'future';
 			}
-		} elseif ( 'future' == $post_status ) {
+		} elseif ('future' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false)) {
 				$post_status = 'publish';
 			}
 		}
 	}
 
 	// Comment status.
-	if ( empty( $postarr['comment_status'] ) ) {
-		if ( $update ) {
+	if (empty($postarr['comment_status'])) {
+		if ($update) {
 			$comment_status = 'closed';
 		} else {
-			$comment_status = get_default_comment_status( $post_type );
+			$comment_status = get_default_comment_status($post_type);
 		}
 	} else {
 		$comment_status = $postarr['comment_status'];
@@ -3184,28 +3184,28 @@ 
 
 	// These variables are needed by compact() later.
 	$post_content_filtered = $postarr['post_content_filtered'];
-	$post_author = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id;
-	$ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
-	$to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
-	$pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
-	$import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
+	$post_author = isset($postarr['post_author']) ? $postarr['post_author'] : $user_id;
+	$ping_status = empty($postarr['ping_status']) ? get_default_comment_status($post_type, 'pingback') : $postarr['ping_status'];
+	$to_ping = isset($postarr['to_ping']) ? sanitize_trackback_urls($postarr['to_ping']) : '';
+	$pinged = isset($postarr['pinged']) ? $postarr['pinged'] : '';
+	$import_id = isset($postarr['import_id']) ? $postarr['import_id'] : 0;
 
 	/*
 	 * The 'wp_insert_post_parent' filter expects all variables to be present.
 	 * Previously, these variables would have already been extracted
 	 */
-	if ( isset( $postarr['menu_order'] ) ) {
+	if (isset($postarr['menu_order'])) {
 		$menu_order = (int) $postarr['menu_order'];
 	} else {
 		$menu_order = 0;
 	}
 
-	$post_password = isset( $postarr['post_password'] ) ? $postarr['post_password'] : '';
-	if ( 'private' == $post_status ) {
+	$post_password = isset($postarr['post_password']) ? $postarr['post_password'] : '';
+	if ('private' == $post_status) {
 		$post_password = '';
 	}
 
-	if ( isset( $postarr['post_parent'] ) ) {
+	if (isset($postarr['post_parent'])) {
 		$post_parent = (int) $postarr['post_parent'];
 	} else {
 		$post_parent = 0;
@@ -3221,50 +3221,50 @@ 
 	 * @param array $new_postarr Array of parsed post data.
 	 * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
 	 */
-	$post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
+	$post_parent = apply_filters('wp_insert_post_parent', $post_parent, $post_ID, compact(array_keys($postarr)), $postarr);
 
 	/*
 	 * If the post is being untrashed and it has a desired slug stored in post meta,
 	 * reassign it.
 	 */
-	if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
-		$desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
-		if ( $desired_post_slug ) {
-			delete_post_meta( $post_ID, '_wp_desired_post_slug' );
+	if ('trash' === $previous_status && 'trash' !== $post_status) {
+		$desired_post_slug = get_post_meta($post_ID, '_wp_desired_post_slug', true);
+		if ($desired_post_slug) {
+			delete_post_meta($post_ID, '_wp_desired_post_slug');
 			$post_name = $desired_post_slug;
 		}
 	}
 
 	// If a trashed post has the desired slug, change it and let this post have it.
-	if ( 'trash' !== $post_status && $post_name ) {
-		wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID );
+	if ('trash' !== $post_status && $post_name) {
+		wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID);
 	}
 
 	// When trashing an existing post, change its slug to allow non-trashed posts to use it.
-	if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) {
-		$post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID );
+	if ('trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status) {
+		$post_name = wp_add_trashed_suffix_to_post_name_for_post($post_ID);
 	}
 
-	$post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
+	$post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
 	// Don't unslash.
-	$post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : '';
+	$post_mime_type = isset($postarr['post_mime_type']) ? $postarr['post_mime_type'] : '';
 
 	// Expected_slashed (everything!).
-	$data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' );
+	$data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid');
 
-	$emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	$emoji_fields = array('post_title', 'post_content', 'post_excerpt');
 
-	foreach ( $emoji_fields as $emoji_field ) {
-		if ( isset( $data[ $emoji_field ] ) ) {
-			$charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
-			if ( 'utf8' === $charset ) {
-				$data[ $emoji_field ] = wp_encode_emoji( $data[ $emoji_field ] );
+	foreach ($emoji_fields as $emoji_field) {
+		if (isset($data[$emoji_field])) {
+			$charset = $wpdb->get_col_charset($wpdb->posts, $emoji_field);
+			if ('utf8' === $charset) {
+				$data[$emoji_field] = wp_encode_emoji($data[$emoji_field]);
 			}
 		}
 	}
 
-	if ( 'attachment' === $post_type ) {
+	if ('attachment' === $post_type) {
 		/**
 		 * Filters attachment post data before it is updated in or added to the database.
 		 *
@@ -3273,7 +3273,7 @@ 
 		 * @param array $data    An array of sanitized attachment post data.
 		 * @param array $postarr An array of unsanitized attachment post data.
 		 */
-		$data = apply_filters( 'wp_insert_attachment_data', $data, $postarr );
+		$data = apply_filters('wp_insert_attachment_data', $data, $postarr);
 	} else {
 		/**
 		 * Filters slashed post data just before it is inserted into the database.
@@ -3283,12 +3283,12 @@ 
 		 * @param array $data    An array of slashed post data.
 		 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
 		 */
-		$data = apply_filters( 'wp_insert_post_data', $data, $postarr );
+		$data = apply_filters('wp_insert_post_data', $data, $postarr);
 	}
-	$data = wp_unslash( $data );
-	$where = array( 'ID' => $post_ID );
+	$data = wp_unslash($data);
+	$where = array('ID' => $post_ID);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately before an existing post is updated in the database.
 		 *
@@ -3297,9 +3297,9 @@ 
 		 * @param int   $post_ID Post ID.
 		 * @param array $data    Array of unslashed post data.
 		 */
-		do_action( 'pre_post_update', $post_ID, $data );
-		if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
-			if ( $wp_error ) {
+		do_action('pre_post_update', $post_ID, $data);
+		if (false === $wpdb->update($wpdb->posts, $data, $where)) {
+			if ($wp_error) {
 				return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3307,14 +3307,14 @@ 
 		}
 	} else {
 		// If there is a suggested ID, use it if not already present.
-		if ( ! empty( $import_id ) ) {
+		if ( ! empty($import_id)) {
 			$import_id = (int) $import_id;
-			if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) {
+			if ( ! $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id))) {
 				$data['ID'] = $import_id;
 			}
 		}
-		if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
-			if ( $wp_error ) {
+		if (false === $wpdb->insert($wpdb->posts, $data)) {
+			if ($wp_error) {
 				return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3323,108 +3323,108 @@ 
 		$post_ID = (int) $wpdb->insert_id;
 
 		// Use the newly generated $post_ID.
-		$where = array( 'ID' => $post_ID );
+		$where = array('ID' => $post_ID);
 	}
 
-	if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) {
-		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
-		$wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
-		clean_post_cache( $post_ID );
+	if (empty($data['post_name']) && ! in_array($data['post_status'], array('draft', 'pending', 'auto-draft'))) {
+		$data['post_name'] = wp_unique_post_slug(sanitize_title($data['post_title'], $post_ID), $post_ID, $data['post_status'], $post_type, $post_parent);
+		$wpdb->update($wpdb->posts, array('post_name' => $data['post_name']), $where);
+		clean_post_cache($post_ID);
 	}
 
-	if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
-		wp_set_post_categories( $post_ID, $post_category );
+	if (is_object_in_taxonomy($post_type, 'category')) {
+		wp_set_post_categories($post_ID, $post_category);
 	}
 
-	if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) {
-		wp_set_post_tags( $post_ID, $postarr['tags_input'] );
+	if (isset($postarr['tags_input']) && is_object_in_taxonomy($post_type, 'post_tag')) {
+		wp_set_post_tags($post_ID, $postarr['tags_input']);
 	}
 
 	// New-style support for all custom taxonomies.
-	if ( ! empty( $postarr['tax_input'] ) ) {
-		foreach ( $postarr['tax_input'] as $taxonomy => $tags ) {
+	if ( ! empty($postarr['tax_input'])) {
+		foreach ($postarr['tax_input'] as $taxonomy => $tags) {
 			$taxonomy_obj = get_taxonomy($taxonomy);
-			if ( ! $taxonomy_obj ) {
+			if ( ! $taxonomy_obj) {
 				/* translators: %s: taxonomy name */
-				_doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid taxonomy: %s.' ), $taxonomy ), '4.4.0' );
+				_doing_it_wrong(__FUNCTION__, sprintf(__('Invalid taxonomy: %s.'), $taxonomy), '4.4.0');
 				continue;
 			}
 
 			// array = hierarchical, string = non-hierarchical.
-			if ( is_array( $tags ) ) {
+			if (is_array($tags)) {
 				$tags = array_filter($tags);
 			}
-			if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
-				wp_set_post_terms( $post_ID, $tags, $taxonomy );
+			if (current_user_can($taxonomy_obj->cap->assign_terms)) {
+				wp_set_post_terms($post_ID, $tags, $taxonomy);
 			}
 		}
 	}
 
-	if ( ! empty( $postarr['meta_input'] ) ) {
-		foreach ( $postarr['meta_input'] as $field => $value ) {
-			update_post_meta( $post_ID, $field, $value );
+	if ( ! empty($postarr['meta_input'])) {
+		foreach ($postarr['meta_input'] as $field => $value) {
+			update_post_meta($post_ID, $field, $value);
 		}
 	}
 
-	$current_guid = get_post_field( 'guid', $post_ID );
+	$current_guid = get_post_field('guid', $post_ID);
 
 	// Set GUID.
-	if ( ! $update && '' == $current_guid ) {
-		$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
+	if ( ! $update && '' == $current_guid) {
+		$wpdb->update($wpdb->posts, array('guid' => get_permalink($post_ID)), $where);
 	}
 
-	if ( 'attachment' === $postarr['post_type'] ) {
-		if ( ! empty( $postarr['file'] ) ) {
-			update_attached_file( $post_ID, $postarr['file'] );
+	if ('attachment' === $postarr['post_type']) {
+		if ( ! empty($postarr['file'])) {
+			update_attached_file($post_ID, $postarr['file']);
 		}
 
-		if ( ! empty( $postarr['context'] ) ) {
-			add_post_meta( $post_ID, '_wp_attachment_context', $postarr['context'], true );
+		if ( ! empty($postarr['context'])) {
+			add_post_meta($post_ID, '_wp_attachment_context', $postarr['context'], true);
 		}
 	}
 
 	// Set or remove featured image.
-	if ( isset( $postarr['_thumbnail_id'] ) ) {
-		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type;
-		if ( ! $thumbnail_support && 'attachment' === $post_type && $post_mime_type ) {
-			if ( wp_attachment_is( 'audio', $post_ID ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-			} elseif ( wp_attachment_is( 'video', $post_ID ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+	if (isset($postarr['_thumbnail_id'])) {
+		$thumbnail_support = current_theme_supports('post-thumbnails', $post_type) && post_type_supports($post_type, 'thumbnail') || 'revision' === $post_type;
+		if ( ! $thumbnail_support && 'attachment' === $post_type && $post_mime_type) {
+			if (wp_attachment_is('audio', $post_ID)) {
+				$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+			} elseif (wp_attachment_is('video', $post_ID)) {
+				$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 			}
 		}
 
-		if ( $thumbnail_support ) {
-			$thumbnail_id = intval( $postarr['_thumbnail_id'] );
+		if ($thumbnail_support) {
+			$thumbnail_id = intval($postarr['_thumbnail_id']);
 			if ( -1 === $thumbnail_id ) {
-				delete_post_thumbnail( $post_ID );
+				delete_post_thumbnail($post_ID);
 			} else {
-				set_post_thumbnail( $post_ID, $thumbnail_id );
+				set_post_thumbnail($post_ID, $thumbnail_id);
 			}
 		}
 	}
 
-	clean_post_cache( $post_ID );
+	clean_post_cache($post_ID);
 
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 
-	if ( ! empty( $postarr['page_template'] ) ) {
+	if ( ! empty($postarr['page_template'])) {
 		$post->page_template = $postarr['page_template'];
-		$page_templates = wp_get_theme()->get_page_templates( $post );
-		if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
+		$page_templates = wp_get_theme()->get_page_templates($post);
+		if ('default' != $postarr['page_template'] && ! isset($page_templates[$postarr['page_template']])) {
+			if ($wp_error) {
+				return new WP_Error('invalid_page_template', __('Invalid page template.'));
 			}
-			update_post_meta( $post_ID, '_wp_page_template', 'default' );
+			update_post_meta($post_ID, '_wp_page_template', 'default');
 		} else {
-			update_post_meta( $post_ID, '_wp_page_template', $postarr['page_template'] );
+			update_post_meta($post_ID, '_wp_page_template', $postarr['page_template']);
 		}
 	}
 
-	if ( 'attachment' !== $postarr['post_type'] ) {
-		wp_transition_post_status( $data['post_status'], $previous_status, $post );
+	if ('attachment' !== $postarr['post_type']) {
+		wp_transition_post_status($data['post_status'], $previous_status, $post);
 	} else {
-		if ( $update ) {
+		if ($update) {
 			/**
 			 * Fires once an existing attachment has been updated.
 			 *
@@ -3432,8 +3432,8 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'edit_attachment', $post_ID );
-			$post_after = get_post( $post_ID );
+			do_action('edit_attachment', $post_ID);
+			$post_after = get_post($post_ID);
 
 			/**
 			 * Fires once an existing attachment has been updated.
@@ -3444,7 +3444,7 @@ 
 			 * @param WP_Post $post_after   Post object following the update.
 			 * @param WP_Post $post_before  Post object before the update.
 			 */
-			do_action( 'attachment_updated', $post_ID, $post_after, $post_before );
+			do_action('attachment_updated', $post_ID, $post_after, $post_before);
 		} else {
 
 			/**
@@ -3454,13 +3454,13 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'add_attachment', $post_ID );
+			do_action('add_attachment', $post_ID);
 		}
 
 		return $post_ID;
 	}
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires once an existing post has been updated.
 		 *
@@ -3469,7 +3469,7 @@ 
 		 * @param int     $post_ID Post ID.
 		 * @param WP_Post $post    Post object.
 		 */
-		do_action( 'edit_post', $post_ID, $post );
+		do_action('edit_post', $post_ID, $post);
 		$post_after = get_post($post_ID);
 
 		/**
@@ -3481,7 +3481,7 @@ 
 		 * @param WP_Post $post_after   Post object following the update.
 		 * @param WP_Post $post_before  Post object before the update.
 		 */
-		do_action( 'post_updated', $post_ID, $post_after, $post_before);
+		do_action('post_updated', $post_ID, $post_after, $post_before);
 	}
 
 	/**
@@ -3496,7 +3496,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( "save_post_{$post->post_type}", $post_ID, $post, $update );
+	do_action("save_post_{$post->post_type}", $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3507,7 +3507,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'save_post', $post_ID, $post, $update );
+	do_action('save_post', $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3518,7 +3518,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'wp_insert_post', $post_ID, $post, $update );
+	do_action('wp_insert_post', $post_ID, $post, $update);
 
 	return $post_ID;
 }
@@ -3536,8 +3536,8 @@ 
  * @param bool         $wp_error Optional. Allow return of WP_Error on failure. Default false.
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
-function wp_update_post( $postarr = array(), $wp_error = false ) {
-	if ( is_object($postarr) ) {
+function wp_update_post($postarr = array(), $wp_error = false) {
+	if (is_object($postarr)) {
 		// Non-escaped post was passed.
 		$postarr = get_object_vars($postarr);
 		$postarr = wp_slash($postarr);
@@ -3546,9 +3546,9 @@ 
 	// First, get all of the original fields.
 	$post = get_post($postarr['ID'], ARRAY_A);
 
-	if ( is_null( $post ) ) {
-		if ( $wp_error )
-			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if (is_null($post)) {
+		if ($wp_error)
+			return new WP_Error('invalid_post', __('Invalid post ID.'));
 		return 0;
 	}
 
@@ -3556,15 +3556,15 @@ 
 	$post = wp_slash($post);
 
 	// Passed post category list overwrites existing category list if not empty.
-	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			 && 0 != count($postarr['post_category']) )
+	if (isset($postarr['post_category']) && is_array($postarr['post_category'])
+			 && 0 != count($postarr['post_category']))
 		$post_cats = $postarr['post_category'];
 	else
 		$post_cats = $post['post_category'];
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
-	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
+	if (isset($post['post_status']) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
+			 ('0000-00-00 00:00:00' == $post['post_date_gmt']))
 		$clear_date = true;
 	else
 		$clear_date = false;
@@ -3572,7 +3572,7 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$postarr = array_merge($post, $postarr);
 	$postarr['post_category'] = $post_cats;
-	if ( $clear_date ) {
+	if ($clear_date) {
 		$postarr['post_date'] = current_time('mysql');
 		$postarr['post_date_gmt'] = '';
 	}
@@ -3580,7 +3580,7 @@ 
 	if ($postarr['post_type'] == 'attachment')
 		return wp_insert_attachment($postarr);
 
-	return wp_insert_post( $postarr, $wp_error );
+	return wp_insert_post($postarr, $wp_error);
 }
 
 /**
@@ -3592,34 +3592,34 @@ 
  *
  * @param int|WP_Post $post Post ID or post object.
  */
-function wp_publish_post( $post ) {
+function wp_publish_post($post) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post($post))
 		return;
 
-	if ( 'publish' == $post->post_status )
+	if ('publish' == $post->post_status)
 		return;
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => 'publish'), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status = $post->post_status;
 	$post->post_status = 'publish';
-	wp_transition_post_status( 'publish', $old_status, $post );
+	wp_transition_post_status('publish', $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'save_post', $post->ID, $post, true );
+	do_action('save_post', $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }
 
 /**
@@ -3632,26 +3632,26 @@ 
  *
  * @param int|WP_Post $post_id Post ID or post object.
  */
-function check_and_publish_future_post( $post_id ) {
+function check_and_publish_future_post($post_id) {
 	$post = get_post($post_id);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
-	if ( 'future' != $post->post_status )
+	if ('future' != $post->post_status)
 		return;
 
-	$time = strtotime( $post->post_date_gmt . ' GMT' );
+	$time = strtotime($post->post_date_gmt.' GMT');
 
 	// Uh oh, someone jumped the gun!
-	if ( $time > time() ) {
-		wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system
-		wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) );
+	if ($time > time()) {
+		wp_clear_scheduled_hook('publish_future_post', array($post_id)); // clear anything else in the system
+		wp_schedule_single_event($time, 'publish_future_post', array($post_id));
 		return;
 	}
 
 	// wp_publish_post() returns no meaningful value.
-	wp_publish_post( $post_id );
+	wp_publish_post($post_id);
 }
 
 /**
@@ -3669,8 +3669,8 @@ 
  * @param int    $post_parent Post parent ID.
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
-function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
+function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
+	if (in_array($post_status, array('draft', 'pending', 'auto-draft')) || ('inherit' == $post_status && 'revision' == $post_type))
 		return $slug;
 
 	global $wpdb, $wp_rewrite;
@@ -3678,13 +3678,13 @@ 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
+	if ( ! is_array($feeds))
 		$feeds = array();
 
-	if ( 'attachment' == $post_type ) {
+	if ('attachment' == $post_type) {
 		// Attachment slugs must be unique across all types.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
 
 		/**
 		 * Filters whether the post slug would make a bad attachment slug.
@@ -3694,17 +3694,17 @@ 
 		 * @param bool   $bad_slug Whether the slug would be bad as an attachment slug.
 		 * @param string $slug     The post slug.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || apply_filters('wp_unique_post_slug_is_bad_attachment_slug', false, $slug)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
-	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
+	} elseif (is_post_type_hierarchical($post_type)) {
+		if ('nav_menu_item' == $post_type)
 			return $slug;
 
 		/*
@@ -3712,7 +3712,7 @@ 
 		 * namespace than posts so page slugs are allowed to overlap post slugs.
 		 */
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID, $post_parent));
 
 		/**
 		 * Filters whether the post slug would make a bad hierarchical post slug.
@@ -3724,26 +3724,26 @@ 
 		 * @param string $post_type   Post type.
 		 * @param int    $post_parent Post parent ID.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || preg_match("@^($wp_rewrite->pagination_base)?\d+$@", $slug) || apply_filters('wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID, $post_parent));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	} else {
 		// Post slugs must be unique across all posts.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
 
 		// Prevent new post slugs that could result in URLs that conflict with date archives.
-		$post = get_post( $post_ID );
+		$post = get_post($post_ID);
 		$conflicts_with_date_archive = false;
-		if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
-			$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-			$postname_index = array_search( '%postname%', $permastructs );
+		if ('post' === $post_type && ( ! $post || $post->post_name !== $slug) && preg_match('/^[0-9]+$/', $slug) && $slug_num = intval($slug)) {
+			$permastructs   = array_values(array_filter(explode('/', get_option('permalink_structure'))));
+			$postname_index = array_search('%postname%', $permastructs);
 
 			/*
 			 * Potential date clashes are as follows:
@@ -3752,9 +3752,9 @@ 
 			 * - An integer between 1 and 12 that follows 'year' conflicts with 'monthnum'.
 			 * - An integer between 1 and 31 that follows 'monthnum' conflicts with 'day'.
 			 */
-			if ( 0 === $postname_index ||
-				( $postname_index && '%year%' === $permastructs[ $postname_index - 1 ] && 13 > $slug_num ) ||
-				( $postname_index && '%monthnum%' === $permastructs[ $postname_index - 1 ] && 32 > $slug_num )
+			if (0 === $postname_index ||
+				($postname_index && '%year%' === $permastructs[$postname_index - 1] && 13 > $slug_num) ||
+				($postname_index && '%monthnum%' === $permastructs[$postname_index - 1] && 32 > $slug_num)
 			) {
 				$conflicts_with_date_archive = true;
 			}
@@ -3769,13 +3769,13 @@ 
 		 * @param string $slug      The post slug.
 		 * @param string $post_type Post type.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters('wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	}
@@ -3792,7 +3792,7 @@ 
 	 * @param int    $post_parent   Post parent ID
 	 * @param string $original_slug The original post slug.
 	 */
-	return apply_filters( 'wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug );
+	return apply_filters('wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug);
 }
 
 /**
@@ -3807,16 +3807,16 @@ 
  * @param int    $length Optional. Max length of the slug. Default 200 (characters).
  * @return string The truncated slug.
  */
-function _truncate_post_slug( $slug, $length = 200 ) {
-	if ( strlen( $slug ) > $length ) {
-		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
-			$slug = substr( $slug, 0, $length );
+function _truncate_post_slug($slug, $length = 200) {
+	if (strlen($slug) > $length) {
+		$decoded_slug = urldecode($slug);
+		if ($decoded_slug === $slug)
+			$slug = substr($slug, 0, $length);
 		else
-			$slug = utf8_uri_encode( $decoded_slug, $length );
+			$slug = utf8_uri_encode($decoded_slug, $length);
 	}
 
-	return rtrim( $slug, '-' );
+	return rtrim($slug, '-');
 }
 
 /**
@@ -3831,7 +3831,7 @@ 
  *                              separated by commas. Default empty.
  * @return array|false|WP_Error Array of affected term IDs. WP_Error or false on failure.
  */
-function wp_add_post_tags( $post_id = 0, $tags = '' ) {
+function wp_add_post_tags($post_id = 0, $tags = '') {
 	return wp_set_post_tags($post_id, $tags, true);
 }
 
@@ -3849,8 +3849,8 @@ 
  *                              replace the tags with the new tags. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
-	return wp_set_post_terms( $post_id, $tags, 'post_tag', $append);
+function wp_set_post_tags($post_id = 0, $tags = '', $append = false) {
+	return wp_set_post_terms($post_id, $tags, 'post_tag', $append);
 }
 
 /**
@@ -3868,31 +3868,31 @@ 
  *                               replace the terms with the new terms. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
+function wp_set_post_terms($post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	if ( empty($tags) )
+	if (empty($tags))
 		$tags = array();
 
-	if ( ! is_array( $tags ) ) {
-		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
-			$tags = str_replace( $comma, ',', $tags );
-		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
+	if ( ! is_array($tags)) {
+		$comma = _x(',', 'tag delimiter');
+		if (',' !== $comma)
+			$tags = str_replace($comma, ',', $tags);
+		$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
 	}
 
 	/*
 	 * Hierarchical taxonomies must always pass IDs rather than names so that
 	 * children with the same names but different parents aren't confused.
 	 */
-	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-		$tags = array_unique( array_map( 'intval', $tags ) );
+	if (is_taxonomy_hierarchical($taxonomy)) {
+		$tags = array_unique(array_map('intval', $tags));
 	}
 
-	return wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
+	return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
 }
 
 /**
@@ -3911,24 +3911,24 @@ 
  *                                  If false, replace the categories with the new categories.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
  */
-function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
+function wp_set_post_categories($post_ID = 0, $post_categories = array(), $append = false) {
 	$post_ID = (int) $post_ID;
-	$post_type = get_post_type( $post_ID );
-	$post_status = get_post_status( $post_ID );
+	$post_type = get_post_type($post_ID);
+	$post_status = get_post_status($post_ID);
 	// If $post_categories isn't already an array, make it one:
 	$post_categories = (array) $post_categories;
-	if ( empty( $post_categories ) ) {
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_categories = array( get_option('default_category') );
+	if (empty($post_categories)) {
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_categories = array(get_option('default_category'));
 			$append = false;
 		} else {
 			$post_categories = array();
 		}
-	} elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) {
+	} elseif (1 == count($post_categories) && '' == reset($post_categories)) {
 		return true;
 	}
 
-	return wp_set_post_terms( $post_ID, $post_categories, 'category', $append );
+	return wp_set_post_terms($post_ID, $post_categories, 'category', $append);
 }
 
 /**
@@ -3952,7 +3952,7 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post Post data.
  */
-function wp_transition_post_status( $new_status, $old_status, $post ) {
+function wp_transition_post_status($new_status, $old_status, $post) {
 	/**
 	 * Fires when a post is transitioned from one status to another.
 	 *
@@ -3962,7 +3962,7 @@ 
 	 * @param string  $old_status Old post status.
 	 * @param WP_Post $post       Post object.
 	 */
-	do_action( 'transition_post_status', $new_status, $old_status, $post );
+	do_action('transition_post_status', $new_status, $old_status, $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -3974,7 +3974,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( "{$old_status}_to_{$new_status}", $post );
+	do_action("{$old_status}_to_{$new_status}", $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -3995,7 +3995,7 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( "{$new_status}_{$post->post_type}", $post->ID, $post );
+	do_action("{$new_status}_{$post->post_type}", $post->ID, $post);
 }
 
 //
@@ -4015,19 +4015,19 @@ 
  * @param string|array $uri     Ping URI or array of URIs.
  * @return int|false How many rows were updated.
  */
-function add_ping( $post_id, $uri ) {
+function add_ping($post_id, $uri) {
 	global $wpdb;
 
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return false;
 	}
 
-	$pung = trim( $post->pinged );
-	$pung = preg_split( '/\s/', $pung );
+	$pung = trim($post->pinged);
+	$pung = preg_split('/\s/', $pung);
 
-	if ( is_array( $uri ) ) {
-		$pung = array_merge( $pung, $uri );
+	if (is_array($uri)) {
+		$pung = array_merge($pung, $uri);
 	}
 	else {
 		$pung[] = $uri;
@@ -4041,10 +4041,10 @@ 
 	 *
 	 * @param string $new New ping URL to add.
 	 */
-	$new = apply_filters( 'add_ping', $new );
+	$new = apply_filters('add_ping', $new);
 
-	$return = $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post->ID ) );
-	clean_post_cache( $post->ID );
+	$return = $wpdb->update($wpdb->posts, array('pinged' => $new), array('ID' => $post->ID));
+	clean_post_cache($post->ID);
 	return $return;
 }
 
@@ -4056,18 +4056,18 @@ 
  * @param int $post_id Post ID.
  * @return array List of enclosures.
  */
-function get_enclosed( $post_id ) {
-	$custom_fields = get_post_custom( $post_id );
+function get_enclosed($post_id) {
+	$custom_fields = get_post_custom($post_id);
 	$pung = array();
-	if ( !is_array( $custom_fields ) )
+	if ( ! is_array($custom_fields))
 		return $pung;
 
-	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
+	foreach ($custom_fields as $key => $val) {
+		if ('enclosure' != $key || ! is_array($val))
 			continue;
-		foreach ( $val as $enc ) {
-			$enclosure = explode( "\n", $enc );
-			$pung[] = trim( $enclosure[ 0 ] );
+		foreach ($val as $enc) {
+			$enclosure = explode("\n", $enc);
+			$pung[] = trim($enclosure[0]);
 		}
 	}
 
@@ -4079,7 +4079,7 @@ 
 	 * @param array $pung    Array of enclosures for the given post.
 	 * @param int   $post_id Post ID.
 	 */
-	return apply_filters( 'get_enclosed', $pung, $post_id );
+	return apply_filters('get_enclosed', $pung, $post_id);
 }
 
 /**
@@ -4092,14 +4092,14 @@ 
  * @param int|WP_Post $post_id Post ID or object.
  * @return array
  */
-function get_pung( $post_id ) {
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+function get_pung($post_id) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return false;
 	}
 
-	$pung = trim( $post->pinged );
-	$pung = preg_split( '/\s/', $pung );
+	$pung = trim($post->pinged);
+	$pung = preg_split('/\s/', $pung);
 
 	/**
 	 * Filters the list of already-pinged URLs for the given post.
@@ -4108,7 +4108,7 @@ 
 	 *
 	 * @param array $pung Array of URLs already pinged for the given post.
 	 */
-	return apply_filters( 'get_pung', $pung );
+	return apply_filters('get_pung', $pung);
 }
 
 /**
@@ -4120,14 +4120,14 @@ 
  * @param int|WP_Post $post_id Post Object or ID
  * @return array
  */
-function get_to_ping( $post_id ) {
-	$post = get_post( $post_id );
+function get_to_ping($post_id) {
+	$post = get_post($post_id);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$to_ping = sanitize_trackback_urls( $post->to_ping );
+	$to_ping = sanitize_trackback_urls($post->to_ping);
 	$to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);
 
 	/**
@@ -4137,7 +4137,7 @@ 
 	 *
 	 * @param array $to_ping List of URLs yet to ping.
 	 */
-	return apply_filters( 'get_to_ping', $to_ping );
+	return apply_filters('get_to_ping', $to_ping);
 }
 
 /**
@@ -4148,22 +4148,22 @@ 
  * @param string $tb_list Comma separated list of URLs.
  * @param int    $post_id Post ID.
  */
-function trackback_url_list( $tb_list, $post_id ) {
-	if ( ! empty( $tb_list ) ) {
+function trackback_url_list($tb_list, $post_id) {
+	if ( ! empty($tb_list)) {
 		// Get post data.
-		$postdata = get_post( $post_id, ARRAY_A );
+		$postdata = get_post($post_id, ARRAY_A);
 
 		// Form an excerpt.
-		$excerpt = strip_tags( $postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content'] );
+		$excerpt = strip_tags($postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content']);
 
-		if ( strlen( $excerpt ) > 255 ) {
-			$excerpt = substr( $excerpt, 0, 252 ) . '&hellip;';
+		if (strlen($excerpt) > 255) {
+			$excerpt = substr($excerpt, 0, 252).'&hellip;';
 		}
 
-		$trackback_urls = explode( ',', $tb_list );
-		foreach ( (array) $trackback_urls as $tb_url ) {
-			$tb_url = trim( $tb_url );
-			trackback( $tb_url, wp_unslash( $postdata['post_title'] ), $excerpt, $post_id );
+		$trackback_urls = explode(',', $tb_list);
+		foreach ((array) $trackback_urls as $tb_url) {
+			$tb_url = trim($tb_url);
+			trackback($tb_url, wp_unslash($postdata['post_title']), $excerpt, $post_id);
 		}
 	}
 }
@@ -4185,7 +4185,7 @@ 
 	global $wpdb;
 
 	$page_ids = wp_cache_get('all_page_ids', 'posts');
-	if ( ! is_array( $page_ids ) ) {
+	if ( ! is_array($page_ids)) {
 		$page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'");
 		wp_cache_add('all_page_ids', $page_ids, 'posts');
 	}
@@ -4208,8 +4208,8 @@ 
  *                       'edit', 'db', 'display'. Default 'raw'.
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
-function get_page( $page, $output = OBJECT, $filter = 'raw') {
-	return get_post( $page, $output, $filter );
+function get_page($page, $output = OBJECT, $filter = 'raw') {
+	return get_post($page, $output, $filter);
 }
 
 /**
@@ -4225,40 +4225,40 @@ 
  * @param string|array $post_type Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
-function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
-	$last_changed = wp_cache_get_last_changed( 'posts' );
+	$last_changed = wp_cache_get_last_changed('posts');
 
-	$hash = md5( $page_path . serialize( $post_type ) );
+	$hash = md5($page_path.serialize($post_type));
 	$cache_key = "get_page_by_path:$hash:$last_changed";
-	$cached = wp_cache_get( $cache_key, 'posts' );
-	if ( false !== $cached ) {
+	$cached = wp_cache_get($cache_key, 'posts');
+	if (false !== $cached) {
 		// Special case: '0' is a bad `$page_path`.
-		if ( '0' === $cached || 0 === $cached ) {
+		if ('0' === $cached || 0 === $cached) {
 			return;
 		} else {
-			return get_post( $cached, $output );
+			return get_post($cached, $output);
 		}
 	}
 
 	$page_path = rawurlencode(urldecode($page_path));
 	$page_path = str_replace('%2F', '/', $page_path);
 	$page_path = str_replace('%20', ' ', $page_path);
-	$parts = explode( '/', trim( $page_path, '/' ) );
-	$parts = esc_sql( $parts );
-	$parts = array_map( 'sanitize_title_for_query', $parts );
+	$parts = explode('/', trim($page_path, '/'));
+	$parts = esc_sql($parts);
+	$parts = array_map('sanitize_title_for_query', $parts);
 
-	$in_string = "'" . implode( "','", $parts ) . "'";
+	$in_string = "'".implode("','", $parts)."'";
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type, 'attachment' );
+		$post_types = array($post_type, 'attachment');
 	}
 
-	$post_types = esc_sql( $post_types );
-	$post_type_in_string = "'" . implode( "','", $post_types ) . "'";
+	$post_types = esc_sql($post_types);
+	$post_type_in_string = "'".implode("','", $post_types)."'";
 	$sql = "
 		SELECT ID, post_name, post_parent, post_type
 		FROM $wpdb->posts
@@ -4266,13 +4266,13 @@ 
 		AND post_type IN ($post_type_in_string)
 	";
 
-	$pages = $wpdb->get_results( $sql, OBJECT_K );
+	$pages = $wpdb->get_results($sql, OBJECT_K);
 
-	$revparts = array_reverse( $parts );
+	$revparts = array_reverse($parts);
 
 	$foundid = 0;
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_name == $revparts[0] ) {
+	foreach ((array) $pages as $page) {
+		if ($page->post_name == $revparts[0]) {
 			$count = 0;
 			$p = $page;
 
@@ -4280,27 +4280,27 @@ 
 			 * Loop through the given path parts from right to left,
 			 * ensuring each matches the post ancestry.
 			 */
-			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
+			while ($p->post_parent != 0 && isset($pages[$p->post_parent])) {
 				$count++;
-				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
+				$parent = $pages[$p->post_parent];
+				if ( ! isset($revparts[$count]) || $parent->post_name != $revparts[$count])
 					break;
 				$p = $parent;
 			}
 
-			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
+			if ($p->post_parent == 0 && $count + 1 == count($revparts) && $p->post_name == $revparts[$count]) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
+				if ($page->post_type == $post_type)
 					break;
 			}
 		}
 	}
 
 	// We cache misses as well as hits.
-	wp_cache_set( $cache_key, $foundid, 'posts' );
+	wp_cache_set($cache_key, $foundid, 'posts');
 
-	if ( $foundid ) {
-		return get_post( $foundid, $output );
+	if ($foundid) {
+		return get_post($foundid, $output);
 	}
 }
 
@@ -4317,31 +4317,31 @@ 
  * @param string|array $post_type  Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
-function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_title($page_title, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
-		$post_type = esc_sql( $post_type );
-		$post_type_in_string = "'" . implode( "','", $post_type ) . "'";
-		$sql = $wpdb->prepare( "
+	if (is_array($post_type)) {
+		$post_type = esc_sql($post_type);
+		$post_type_in_string = "'".implode("','", $post_type)."'";
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type IN ($post_type_in_string)
-		", $page_title );
+		", $page_title);
 	} else {
-		$sql = $wpdb->prepare( "
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type = %s
-		", $page_title, $post_type );
+		", $page_title, $post_type);
 	}
 
-	$page = $wpdb->get_var( $sql );
+	$page = $wpdb->get_var($sql);
 
-	if ( $page ) {
-		return get_post( $page, $output );
+	if ($page) {
+		return get_post($page, $output);
 	}
 }
 
@@ -4356,25 +4356,25 @@ 
  * @param array $pages   List of page objects from which descendants should be identified.
  * @return array List of page children.
  */
-function get_page_children( $page_id, $pages ) {
+function get_page_children($page_id, $pages) {
 	// Build a hash of ID -> children.
 	$children = array();
-	foreach ( (array) $pages as $page ) {
-		$children[ intval( $page->post_parent ) ][] = $page;
+	foreach ((array) $pages as $page) {
+		$children[intval($page->post_parent)][] = $page;
 	}
 
 	$page_list = array();
 
 	// Start the search by looking at immediate children.
-	if ( isset( $children[ $page_id ] ) ) {
+	if (isset($children[$page_id])) {
 		// Always start at the end of the stack in order to preserve original `$pages` order.
-		$to_look = array_reverse( $children[ $page_id ] );
+		$to_look = array_reverse($children[$page_id]);
 
-		while ( $to_look ) {
-			$p = array_pop( $to_look );
+		while ($to_look) {
+			$p = array_pop($to_look);
 			$page_list[] = $p;
-			if ( isset( $children[ $p->ID ] ) ) {
-				foreach ( array_reverse( $children[ $p->ID ] ) as $child ) {
+			if (isset($children[$p->ID])) {
+				foreach (array_reverse($children[$p->ID]) as $child) {
 					// Append to the `$to_look` stack to descend the tree.
 					$to_look[] = $child;
 				}
@@ -4397,19 +4397,19 @@ 
  * @param int   $page_id Optional. Parent page ID. Default 0.
  * @return array A list arranged by hierarchy. Children immediately follow their parents.
  */
-function get_page_hierarchy( &$pages, $page_id = 0 ) {
-	if ( empty( $pages ) ) {
+function get_page_hierarchy(&$pages, $page_id = 0) {
+	if (empty($pages)) {
 		return array();
 	}
 
 	$children = array();
-	foreach ( (array) $pages as $p ) {
-		$parent_id = intval( $p->post_parent );
-		$children[ $parent_id ][] = $p;
+	foreach ((array) $pages as $p) {
+		$parent_id = intval($p->post_parent);
+		$children[$parent_id][] = $p;
 	}
 
 	$result = array();
-	_page_traverse_name( $page_id, $children, $result );
+	_page_traverse_name($page_id, $children, $result);
 
 	return $result;
 }
@@ -4427,11 +4427,11 @@ 
  * @param array $children  Parent-children relations, passed by reference.
  * @param array $result    Result, passed by reference.
  */
-function _page_traverse_name( $page_id, &$children, &$result ){
-	if ( isset( $children[ $page_id ] ) ){
-		foreach ( (array)$children[ $page_id ] as $child ) {
-			$result[ $child->ID ] = $child->post_name;
-			_page_traverse_name( $child->ID, $children, $result );
+function _page_traverse_name($page_id, &$children, &$result) {
+	if (isset($children[$page_id])) {
+		foreach ((array) $children[$page_id] as $child) {
+			$result[$child->ID] = $child->post_name;
+			_page_traverse_name($child->ID, $children, $result);
 		}
 	}
 }
@@ -4447,20 +4447,20 @@ 
  * @param WP_Post|object|int $page Optional. Page ID or WP_Post object. Default is global $post.
  * @return string|false Page URI, false on error.
  */
-function get_page_uri( $page = 0 ) {
-	if ( ! $page instanceof WP_Post ) {
-		$page = get_post( $page );
+function get_page_uri($page = 0) {
+	if ( ! $page instanceof WP_Post) {
+		$page = get_post($page);
 	}
 
-	if ( ! $page )
+	if ( ! $page)
 		return false;
 
 	$uri = $page->post_name;
 
-	foreach ( $page->ancestors as $parent ) {
-		$parent = get_post( $parent );
-		if ( $parent && $parent->post_name ) {
-			$uri = $parent->post_name . '/' . $uri;
+	foreach ($page->ancestors as $parent) {
+		$parent = get_post($parent);
+		if ($parent && $parent->post_name) {
+			$uri = $parent->post_name.'/'.$uri;
 		}
 	}
 
@@ -4472,7 +4472,7 @@ 
 	 * @param string  $uri  Page URI.
 	 * @param WP_Post $page Page object.
 	 */
-	return apply_filters( 'get_page_uri', $uri, $page );
+	return apply_filters('get_page_uri', $uri, $page);
 }
 
 /**
@@ -4517,7 +4517,7 @@ 
  * }
  * @return array|false List of pages matching defaults or `$args`.
  */
-function get_pages( $args = array() ) {
+function get_pages($args = array()) {
 	global $wpdb;
 
 	$defaults = array(
@@ -4538,7 +4538,7 @@ 
 		'post_status'  => 'publish',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$number = (int) $r['number'];
 	$offset = (int) $r['offset'];
@@ -4551,83 +4551,83 @@ 
 	$post_status = $r['post_status'];
 
 	// Make sure the post type is hierarchical.
-	$hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
-	if ( ! in_array( $r['post_type'], $hierarchical_post_types ) ) {
+	$hierarchical_post_types = get_post_types(array('hierarchical' => true));
+	if ( ! in_array($r['post_type'], $hierarchical_post_types)) {
 		return false;
 	}
 
-	if ( $parent > 0 && ! $child_of ) {
+	if ($parent > 0 && ! $child_of) {
 		$hierarchical = false;
 	}
 
 	// Make sure we have a valid post status.
-	if ( ! is_array( $post_status ) ) {
-		$post_status = explode( ',', $post_status );
+	if ( ! is_array($post_status)) {
+		$post_status = explode(',', $post_status);
 	}
-	if ( array_diff( $post_status, get_post_stati() ) ) {
+	if (array_diff($post_status, get_post_stati())) {
 		return false;
 	}
 
 	// $args can be whatever, only use the args defined in defaults to compute the key.
-	$key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
-	$last_changed = wp_cache_get_last_changed( 'posts' );
+	$key = md5(serialize(wp_array_slice_assoc($r, array_keys($defaults))));
+	$last_changed = wp_cache_get_last_changed('posts');
 
 	$cache_key = "get_pages:$key:$last_changed";
-	if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {
+	if ($cache = wp_cache_get($cache_key, 'posts')) {
 		// Convert to WP_Post instances.
-		$pages = array_map( 'get_post', $cache );
+		$pages = array_map('get_post', $cache);
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', $pages, $r );
+		$pages = apply_filters('get_pages', $pages, $r);
 		return $pages;
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
+	if ( ! empty($r['include'])) {
 		$child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
 		$parent = -1;
 		$exclude = '';
 		$meta_key = '';
 		$meta_value = '';
 		$hierarchical = false;
-		$incpages = wp_parse_id_list( $r['include'] );
-		if ( ! empty( $incpages ) ) {
-			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
+		$incpages = wp_parse_id_list($r['include']);
+		if ( ! empty($incpages)) {
+			$inclusions = ' AND ID IN ('.implode(',', $incpages).')';
 		}
 	}
 
 	$exclusions = '';
-	if ( ! empty( $exclude ) ) {
-		$expages = wp_parse_id_list( $exclude );
-		if ( ! empty( $expages ) ) {
-			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
+	if ( ! empty($exclude)) {
+		$expages = wp_parse_id_list($exclude);
+		if ( ! empty($expages)) {
+			$exclusions = ' AND ID NOT IN ('.implode(',', $expages).')';
 		}
 	}
 
 	$author_query = '';
-	if ( ! empty( $r['authors'] ) ) {
-		$post_authors = preg_split( '/[\s,]+/', $r['authors'] );
+	if ( ! empty($r['authors'])) {
+		$post_authors = preg_split('/[\s,]+/', $r['authors']);
 
-		if ( ! empty( $post_authors ) ) {
-			foreach ( $post_authors as $post_author ) {
+		if ( ! empty($post_authors)) {
+			foreach ($post_authors as $post_author) {
 				//Do we have an author id or an author login?
-				if ( 0 == intval($post_author) ) {
+				if (0 == intval($post_author)) {
 					$post_author = get_user_by('login', $post_author);
-					if ( empty( $post_author ) ) {
+					if (empty($post_author)) {
 						continue;
 					}
-					if ( empty( $post_author->ID ) ) {
+					if (empty($post_author->ID)) {
 						continue;
 					}
 					$post_author = $post_author->ID;
 				}
 
-				if ( '' == $author_query ) {
+				if ('' == $author_query) {
 					$author_query = $wpdb->prepare(' post_author = %d ', $post_author);
 				} else {
 					$author_query .= $wpdb->prepare(' OR post_author = %d ', $post_author);
 				}
 			}
-			if ( '' != $author_query ) {
+			if ('' != $author_query) {
 				$author_query = " AND ($author_query)";
 			}
 		}
@@ -4635,49 +4635,49 @@ 
 
 	$join = '';
 	$where = "$exclusions $inclusions ";
-	if ( '' !== $meta_key || '' !== $meta_value ) {
+	if ('' !== $meta_key || '' !== $meta_value) {
 		$join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
 
 		// meta_key and meta_value might be slashed
 		$meta_key = wp_unslash($meta_key);
 		$meta_value = wp_unslash($meta_value);
-		if ( '' !== $meta_key ) {
+		if ('' !== $meta_key) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s", $meta_key);
 		}
-		if ( '' !== $meta_value ) {
+		if ('' !== $meta_value) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_value = %s", $meta_value);
 		}
 
 	}
 
-	if ( is_array( $parent ) ) {
-		$post_parent__in = implode( ',', array_map( 'absint', (array) $parent ) );
-		if ( ! empty( $post_parent__in ) ) {
+	if (is_array($parent)) {
+		$post_parent__in = implode(',', array_map('absint', (array) $parent));
+		if ( ! empty($post_parent__in)) {
 			$where .= " AND post_parent IN ($post_parent__in)";
 		}
-	} elseif ( $parent >= 0 ) {
+	} elseif ($parent >= 0) {
 		$where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
 	}
 
-	if ( 1 == count( $post_status ) ) {
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
+	if (1 == count($post_status)) {
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status = %s", $r['post_type'], reset($post_status));
 	} else {
-		$post_status = implode( "', '", $post_status );
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
+		$post_status = implode("', '", $post_status);
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status IN ('$post_status')", $r['post_type']);
 	}
 
 	$orderby_array = array();
-	$allowed_keys = array( 'author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
+	$allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
 		'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
-		'ID', 'rand', 'comment_count' );
+		'ID', 'rand', 'comment_count');
 
-	foreach ( explode( ',', $r['sort_column'] ) as $orderby ) {
-		$orderby = trim( $orderby );
-		if ( ! in_array( $orderby, $allowed_keys ) ) {
+	foreach (explode(',', $r['sort_column']) as $orderby) {
+		$orderby = trim($orderby);
+		if ( ! in_array($orderby, $allowed_keys)) {
 			continue;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'menu_order':
 				break;
 			case 'ID':
@@ -4690,36 +4690,36 @@ 
 				$orderby = "$wpdb->posts.comment_count";
 				break;
 			default:
-				if ( 0 === strpos( $orderby, 'post_' ) ) {
-					$orderby = "$wpdb->posts." . $orderby;
+				if (0 === strpos($orderby, 'post_')) {
+					$orderby = "$wpdb->posts.".$orderby;
 				} else {
-					$orderby = "$wpdb->posts.post_" . $orderby;
+					$orderby = "$wpdb->posts.post_".$orderby;
 				}
 		}
 
 		$orderby_array[] = $orderby;
 
 	}
-	$sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
+	$sort_column = ! empty($orderby_array) ? implode(',', $orderby_array) : "$wpdb->posts.post_title";
 
-	$sort_order = strtoupper( $r['sort_order'] );
-	if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) {
+	$sort_order = strtoupper($r['sort_order']);
+	if ('' !== $sort_order && ! in_array($sort_order, array('ASC', 'DESC'))) {
 		$sort_order = 'ASC';
 	}
 
 	$query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
 	$query .= $author_query;
-	$query .= " ORDER BY " . $sort_column . " " . $sort_order ;
+	$query .= " ORDER BY ".$sort_column." ".$sort_order;
 
-	if ( ! empty( $number ) ) {
-		$query .= ' LIMIT ' . $offset . ',' . $number;
+	if ( ! empty($number)) {
+		$query .= ' LIMIT '.$offset.','.$number;
 	}
 
 	$pages = $wpdb->get_results($query);
 
-	if ( empty($pages) ) {
+	if (empty($pages)) {
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', array(), $r );
+		$pages = apply_filters('get_pages', array(), $r);
 		return $pages;
 	}
 
@@ -4730,38 +4730,38 @@ 
 	}
 
 	// Update cache.
-	update_post_cache( $pages );
+	update_post_cache($pages);
 
-	if ( $child_of || $hierarchical ) {
+	if ($child_of || $hierarchical) {
 		$pages = get_page_children($child_of, $pages);
 	}
 
-	if ( ! empty( $r['exclude_tree'] ) ) {
-		$exclude = wp_parse_id_list( $r['exclude_tree'] );
-		foreach ( $exclude as $id ) {
-			$children = get_page_children( $id, $pages );
-			foreach ( $children as $child ) {
+	if ( ! empty($r['exclude_tree'])) {
+		$exclude = wp_parse_id_list($r['exclude_tree']);
+		foreach ($exclude as $id) {
+			$children = get_page_children($id, $pages);
+			foreach ($children as $child) {
 				$exclude[] = $child->ID;
 			}
 		}
 
-		$num_pages = count( $pages );
-		for ( $i = 0; $i < $num_pages; $i++ ) {
-			if ( in_array( $pages[$i]->ID, $exclude ) ) {
-				unset( $pages[$i] );
+		$num_pages = count($pages);
+		for ($i = 0; $i < $num_pages; $i++) {
+			if (in_array($pages[$i]->ID, $exclude)) {
+				unset($pages[$i]);
 			}
 		}
 	}
 
 	$page_structure = array();
-	foreach ( $pages as $page ) {
+	foreach ($pages as $page) {
 		$page_structure[] = $page->ID;
 	}
 
-	wp_cache_set( $cache_key, $page_structure, 'posts' );
+	wp_cache_set($cache_key, $page_structure, 'posts');
 
 	// Convert to WP_Post instances
-	$pages = array_map( 'get_post', $pages );
+	$pages = array_map('get_post', $pages);
 
 	/**
 	 * Filters the retrieved list of pages.
@@ -4771,7 +4771,7 @@ 
 	 * @param array $pages List of pages to retrieve.
 	 * @param array $r     Array of get_pages() arguments.
 	 */
-	return apply_filters( 'get_pages', $pages, $r );
+	return apply_filters('get_pages', $pages, $r);
 }
 
 //
@@ -4791,9 +4791,9 @@ 
 		return false;
 	if (strpos($url, home_url('/?attachment_id=')) !== false)
 		return true;
-	if ( $id = url_to_postid($url) ) {
+	if ($id = url_to_postid($url)) {
 		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
+		if ('attachment' == $post->post_type)
 			return true;
 	}
 	return false;
@@ -4824,21 +4824,21 @@ 
  * @param bool         $wp_error Optional. Whether to return a WP_Error on failure. Default false.
  * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
  */
-function wp_insert_attachment( $args, $file = false, $parent = 0, $wp_error = false ) {
+function wp_insert_attachment($args, $file = false, $parent = 0, $wp_error = false) {
 	$defaults = array(
 		'file'        => $file,
 		'post_parent' => 0
 	);
 
-	$data = wp_parse_args( $args, $defaults );
+	$data = wp_parse_args($args, $defaults);
 
-	if ( ! empty( $parent ) ) {
+	if ( ! empty($parent)) {
 		$data['post_parent'] = $parent;
 	}
 
 	$data['post_type'] = 'attachment';
 
-	return wp_insert_post( $data, $wp_error );
+	return wp_insert_post($data, $wp_error);
 }
 
 /**
@@ -4860,27 +4860,27 @@ 
  *                           Default false.
  * @return mixed False on failure. Post data on success.
  */
-function wp_delete_attachment( $post_id, $force_delete = false ) {
+function wp_delete_attachment($post_id, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id)))
 		return $post;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status )
-		return wp_trash_post( $post_id );
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status)
+		return wp_trash_post($post_id);
 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	$meta = wp_get_attachment_metadata( $post_id );
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
-	$file = get_attached_file( $post_id );
+	$meta = wp_get_attachment_metadata($post_id);
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
+	$file = get_attached_file($post_id);
 
-	if ( is_multisite() )
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite())
+		delete_transient('dirsize_cache');
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4889,70 +4889,70 @@ 
 	 *
 	 * @param int $post_id Attachment ID.
 	 */
-	do_action( 'delete_attachment', $post_id );
+	do_action('delete_attachment', $post_id);
 
 	wp_delete_object_term_relationships($post_id, array('category', 'post_tag'));
 	wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type));
 
 	// Delete all for any posts.
-	delete_metadata( 'post', null, '_thumbnail_id', $post_id, true );
+	delete_metadata('post', null, '_thumbnail_id', $post_id, true);
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'delete_post', $post_id );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $post_id ) );
-	if ( ! $result ) {
+	do_action('delete_post', $post_id);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $post_id));
+	if ( ! $result) {
 		return false;
 	}
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'deleted_post', $post_id );
+	do_action('deleted_post', $post_id);
 
 	$uploadpath = wp_get_upload_dir();
 
-	if ( ! empty($meta['thumb']) ) {
+	if ( ! empty($meta['thumb'])) {
 		// Don't delete the thumb if another attachment uses it.
-		if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
+		if ( ! $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%'.$wpdb->esc_like($meta['thumb']).'%', $post_id))) {
 			$thumbfile = str_replace(basename($file), $meta['thumb'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
-			@ unlink( path_join($uploadpath['basedir'], $thumbfile) );
+			$thumbfile = apply_filters('wp_delete_file', $thumbfile);
+			@ unlink(path_join($uploadpath['basedir'], $thumbfile));
 		}
 	}
 
 	// Remove intermediate and backup images if there are any.
-	if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-			$intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
+	if (isset($meta['sizes']) && is_array($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size => $sizeinfo) {
+			$intermediate_file = str_replace(basename($file), $sizeinfo['file'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
-			@ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
+			$intermediate_file = apply_filters('wp_delete_file', $intermediate_file);
+			@ unlink(path_join($uploadpath['basedir'], $intermediate_file));
 		}
 	}
 
-	if ( is_array($backup_sizes) ) {
-		foreach ( $backup_sizes as $size ) {
-			$del_file = path_join( dirname($meta['file']), $size['file'] );
+	if (is_array($backup_sizes)) {
+		foreach ($backup_sizes as $size) {
+			$del_file = path_join(dirname($meta['file']), $size['file']);
 			/** This filter is documented in wp-includes/functions.php */
-			$del_file = apply_filters( 'wp_delete_file', $del_file );
-			@ unlink( path_join($uploadpath['basedir'], $del_file) );
+			$del_file = apply_filters('wp_delete_file', $del_file);
+			@ unlink(path_join($uploadpath['basedir'], $del_file));
 		}
 	}
 
-	wp_delete_file( $file );
+	wp_delete_file($file);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	return $post;
 }
@@ -4966,14 +4966,14 @@ 
  * @param bool $unfiltered Optional. If true, filters are not run. Default false.
  * @return mixed Attachment meta field. False on failure.
  */
-function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) {
+function wp_get_attachment_metadata($post_id = 0, $unfiltered = false) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
+	$data = get_post_meta($post->ID, '_wp_attachment_metadata', true);
 
-	if ( $unfiltered )
+	if ($unfiltered)
 		return $data;
 
 	/**
@@ -4985,7 +4985,7 @@ 
 	 *                            if the object does not exist.
 	 * @param int        $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_metadata', $data, $post->ID );
+	return apply_filters('wp_get_attachment_metadata', $data, $post->ID);
 }
 
 /**
@@ -4997,9 +4997,9 @@ 
  * @param array $data    Attachment data.
  * @return int|bool False if $post is invalid.
  */
-function wp_update_attachment_metadata( $post_id, $data ) {
+function wp_update_attachment_metadata($post_id, $data) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	/**
@@ -5010,10 +5010,10 @@ 
 	 * @param array $data    Array of updated attachment meta data.
 	 * @param int   $post_id Attachment ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
-		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+	if ($data = apply_filters('wp_update_attachment_metadata', $data, $post->ID))
+		return update_post_meta($post->ID, '_wp_attachment_metadata', $data);
 	else
-		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+		return delete_post_meta($post->ID, '_wp_attachment_metadata');
 }
 
 /**
@@ -5026,29 +5026,29 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false Attachment URL, otherwise false.
  */
-function wp_get_attachment_url( $post_id = 0 ) {
+function wp_get_attachment_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
 	$url = '';
 	// Get attached file.
-	if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) {
+	if ($file = get_post_meta($post->ID, '_wp_attached_file', true)) {
 		// Get upload directory.
-		if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) {
+		if (($uploads = wp_get_upload_dir()) && false === $uploads['error']) {
 			// Check that the upload base exists in the file location.
-			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
+			if (0 === strpos($file, $uploads['basedir'])) {
 				// Replace file location with url location.
 				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
-			} elseif ( false !== strpos($file, 'wp-content/uploads') ) {
+			} elseif (false !== strpos($file, 'wp-content/uploads')) {
 				// Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
-				$url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
+				$url = trailingslashit($uploads['baseurl'].'/'._wp_get_attachment_relative_path($file)).basename($file);
 			} else {
 				// It's a newly-uploaded file, therefore $file is relative to the basedir.
-				$url = $uploads['baseurl'] . "/$file";
+				$url = $uploads['baseurl']."/$file";
 			}
 		}
 	}
@@ -5057,13 +5057,13 @@ 
 	 * If any of the above options failed, Fallback on the GUID as used pre-2.7,
 	 * not recommended to rely upon this.
 	 */
-	if ( empty($url) ) {
-		$url = get_the_guid( $post->ID );
+	if (empty($url)) {
+		$url = get_the_guid($post->ID);
 	}
 
 	// On SSL front end, URLs should be HTTPS.
-	if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
-		$url = set_url_scheme( $url );
+	if (is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow']) {
+		$url = set_url_scheme($url);
 	}
 
 	/**
@@ -5074,9 +5074,9 @@ 
 	 * @param string $url     URL for the given attachment.
 	 * @param int    $post_id Attachment ID.
 	 */
-	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+	$url = apply_filters('wp_get_attachment_url', $url, $post->ID);
 
-	if ( empty( $url ) )
+	if (empty($url))
 		return false;
 
 	return $url;
@@ -5090,13 +5090,13 @@ 
  * @param int $post_id Optional. Attachment ID. Default is the ID of the global `$post`.
  * @return string|false False on failure. Attachment caption on success.
  */
-function wp_get_attachment_caption( $post_id = 0 ) {
+function wp_get_attachment_caption($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return false;
 	}
 
-	if ( 'attachment' !== $post->post_type ) {
+	if ('attachment' !== $post->post_type) {
 		return false;
 	}
 
@@ -5110,7 +5110,7 @@ 
 	 * @param string $caption Caption for the given attachment.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_caption', $caption, $post->ID );
+	return apply_filters('wp_get_attachment_caption', $caption, $post->ID);
 }
 
 /**
@@ -5121,16 +5121,16 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail file path on success.
  */
-function wp_get_attachment_thumb_file( $post_id = 0 ) {
+function wp_get_attachment_thumb_file($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
+	if ( ! is_array($imagedata = wp_get_attachment_metadata($post->ID)))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) {
+	if ( ! empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile)) {
 		/**
 		 * Filters the attachment thumbnail file path.
 		 *
@@ -5139,7 +5139,7 @@ 
 		 * @param string $thumbfile File path to the attachment thumbnail.
 		 * @param int    $post_id   Attachment ID.
 		 */
-		return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post->ID );
+		return apply_filters('wp_get_attachment_thumb_file', $thumbfile, $post->ID);
 	}
 	return false;
 }
@@ -5152,18 +5152,18 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail URL on success.
  */
-function wp_get_attachment_thumb_url( $post_id = 0 ) {
+function wp_get_attachment_thumb_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
+	if ( ! $url = wp_get_attachment_url($post->ID))
 		return false;
 
-	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
+	$sized = image_downsize($post_id, 'thumbnail');
+	if ($sized)
 		return $sized[0];
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
+	if ( ! $thumb = wp_get_attachment_thumb_file($post->ID))
 		return false;
 
 	$url = str_replace(basename($url), basename($thumb), $url);
@@ -5176,7 +5176,7 @@ 
 	 * @param string $url     URL for the attachment thumbnail.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_thumb_url', $url, $post->ID );
+	return apply_filters('wp_get_attachment_thumb_url', $url, $post->ID);
 }
 
 /**
@@ -5188,40 +5188,40 @@ 
  * @param int|WP_Post $post Optional. Attachment ID or object. Default is global $post.
  * @return bool True if one of the accepted types, false otherwise.
  */
-function wp_attachment_is( $type, $post = null ) {
-	if ( ! $post = get_post( $post ) ) {
+function wp_attachment_is($type, $post = null) {
+	if ( ! $post = get_post($post)) {
 		return false;
 	}
 
-	if ( ! $file = get_attached_file( $post->ID ) ) {
+	if ( ! $file = get_attached_file($post->ID)) {
 		return false;
 	}
 
-	if ( 0 === strpos( $post->post_mime_type, $type . '/' ) ) {
+	if (0 === strpos($post->post_mime_type, $type.'/')) {
 		return true;
 	}
 
-	$check = wp_check_filetype( $file );
-	if ( empty( $check['ext'] ) ) {
+	$check = wp_check_filetype($file);
+	if (empty($check['ext'])) {
 		return false;
 	}
 
 	$ext = $check['ext'];
 
-	if ( 'import' !== $post->post_mime_type ) {
+	if ('import' !== $post->post_mime_type) {
 		return $type === $ext;
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
+		return in_array($ext, $image_exts);
 
 	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		return in_array($ext, wp_get_audio_extensions());
 
 	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		return in_array($ext, wp_get_video_extensions());
 
 	default:
 		return $type === $ext;
@@ -5238,8 +5238,8 @@ 
  * @param int|WP_Post $post Optional. Attachment ID or object. Default is global $post.
  * @return bool Whether the attachment is an image.
  */
-function wp_attachment_is_image( $post = null ) {
-	return wp_attachment_is( 'image', $post );
+function wp_attachment_is_image($post = null) {
+	return wp_attachment_is('image', $post);
 }
 
 /**
@@ -5250,22 +5250,22 @@ 
  * @param string|int $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
-function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
+function wp_mime_type_icon($mime = 0) {
+	if ( ! is_numeric($mime))
 		$icon = wp_cache_get("mime_type_icon_$mime");
 
 	$post_id = 0;
-	if ( empty($icon) ) {
+	if (empty($icon)) {
 		$post_mimes = array();
-		if ( is_numeric($mime) ) {
+		if (is_numeric($mime)) {
 			$mime = (int) $mime;
-			if ( $post = get_post( $mime ) ) {
+			if ($post = get_post($mime)) {
 				$post_id = (int) $post->ID;
-				$file = get_attached_file( $post_id );
+				$file = get_attached_file($post_id);
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
-				if ( !empty($ext) ) {
+				if ( ! empty($ext)) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
+					if ($ext_type = wp_ext2type($ext))
 						$post_mimes[] = $ext_type;
 				}
 				$mime = $post->post_mime_type;
@@ -5278,7 +5278,7 @@ 
 
 		$icon_files = wp_cache_get('icon_files');
 
-		if ( !is_array($icon_files) ) {
+		if ( ! is_array($icon_files)) {
 			/**
 			 * Filters the icon directory path.
 			 *
@@ -5286,7 +5286,7 @@ 
 			 *
 			 * @param string $path Icon directory absolute path.
 			 */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
 			/**
 			 * Filters the icon directory URI.
@@ -5295,7 +5295,7 @@ 
 			 *
 			 * @param string $uri Icon directory URI.
 			 */
-			$icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url( 'images/media' ) );
+			$icon_dir_uri = apply_filters('icon_dir_uri', includes_url('images/media'));
 
 			/**
 			 * Filters the list of icon directory URIs.
@@ -5304,19 +5304,19 @@ 
 			 *
 			 * @param array $uris List of icon directory URIs.
 			 */
-			$dirs = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
+			$dirs = apply_filters('icon_dirs', array($icon_dir => $icon_dir_uri));
 			$icon_files = array();
-			while ( $dirs ) {
-				$keys = array_keys( $dirs );
-				$dir = array_shift( $keys );
+			while ($dirs) {
+				$keys = array_keys($dirs);
+				$dir = array_shift($keys);
 				$uri = array_shift($dirs);
-				if ( $dh = opendir($dir) ) {
-					while ( false !== $file = readdir($dh) ) {
+				if ($dh = opendir($dir)) {
+					while (false !== $file = readdir($dh)) {
 						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
+						if (substr($file, 0, 1) == '.')
 							continue;
-						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
+						if ( ! in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg'))) {
+							if (is_dir("$dir/$file"))
 								$dirs["$dir/$file"] = "$uri/$file";
 							continue;
 						}
@@ -5325,15 +5325,15 @@ 
 					closedir($dh);
 				}
 			}
-			wp_cache_add( 'icon_files', $icon_files, 'default', 600 );
+			wp_cache_add('icon_files', $icon_files, 'default', 600);
 		}
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		foreach ($icon_files as $file => $uri)
+			$types[preg_replace('/^([^.]*).*$/', '$1', basename($file))] = & $icon_files[$file];
 
-		if ( ! empty($mime) ) {
+		if ( ! empty($mime)) {
 			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
 			$post_mimes[] = substr($mime, strpos($mime, '/') + 1);
 			$post_mimes[] = str_replace('/', '_', $mime);
@@ -5342,15 +5342,15 @@ 
 		$matches = wp_match_mime_types(array_keys($types), $post_mimes);
 		$matches['default'] = array('default');
 
-		foreach ( $matches as $match => $wilds ) {
-			foreach ( $wilds as $wild ) {
-				if ( ! isset( $types[ $wild ] ) ) {
+		foreach ($matches as $match => $wilds) {
+			foreach ($wilds as $wild) {
+				if ( ! isset($types[$wild])) {
 					continue;
 				}
 
-				$icon = $types[ $wild ];
-				if ( ! is_numeric( $mime ) ) {
-					wp_cache_add( "mime_type_icon_$mime", $icon );
+				$icon = $types[$wild];
+				if ( ! is_numeric($mime)) {
+					wp_cache_add("mime_type_icon_$mime", $icon);
 				}
 				break 2;
 			}
@@ -5367,7 +5367,7 @@ 
 	 * @param int    $post_id Attachment ID. Will equal 0 if the function passed
 	 *                        the mime type.
 	 */
-	return apply_filters( 'wp_mime_type_icon', $icon, $mime, $post_id );
+	return apply_filters('wp_mime_type_icon', $icon, $mime, $post_id);
 }
 
 /**
@@ -5389,27 +5389,27 @@ 
  * @param WP_Post $post        The Post Object
  * @param WP_Post $post_before The Previous Post Object
  */
-function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
+function wp_check_for_changed_slugs($post_id, $post, $post_before) {
 	// Don't bother if it hasn't changed.
-	if ( $post->post_name == $post_before->post_name ) {
+	if ($post->post_name == $post_before->post_name) {
 		return;
 	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+	if ( ! ('publish' === $post->post_status || ('attachment' === get_post_type($post) && 'inherit' === $post->post_status)) || is_post_type_hierarchical($post->post_type)) {
 		return;
 	}
 
-	$old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' );
+	$old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
 
 	// If we haven't added this old slug before, add it now.
-	if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs ) ) {
-		add_post_meta( $post_id, '_wp_old_slug', $post_before->post_name );
+	if ( ! empty($post_before->post_name) && ! in_array($post_before->post_name, $old_slugs)) {
+		add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);
 	}
 
 	// If the new slug was used previously, delete it from the list.
-	if ( in_array( $post->post_name, $old_slugs ) ) {
-		delete_post_meta( $post_id, '_wp_old_slug', $post->post_name );
+	if (in_array($post->post_name, $old_slugs)) {
+		delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
 	}
 }
 
@@ -5427,8 +5427,8 @@ 
  * @param string|array $post_type Single post type or an array of post types. Currently only supports 'post' or 'page'.
  * @return string SQL code that can be added to a where clause.
  */
-function get_private_posts_cap_sql( $post_type ) {
-	return get_posts_by_author_sql( $post_type, false );
+function get_private_posts_cap_sql($post_type) {
+	return get_posts_by_author_sql($post_type, false);
 }
 
 /**
@@ -5448,19 +5448,19 @@ 
  *                                    $current_user.  Default false.
  * @return string SQL WHERE code that can be added to a query.
  */
-function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
+function get_posts_by_author_sql($post_type, $full = true, $post_author = null, $public_only = false) {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type );
+		$post_types = array($post_type);
 	}
 
 	$post_type_clauses = array();
-	foreach ( $post_types as $post_type ) {
-		$post_type_obj = get_post_type_object( $post_type );
-		if ( ! $post_type_obj ) {
+	foreach ($post_types as $post_type) {
+		$post_type_obj = get_post_type_object($post_type);
+		if ( ! $post_type_obj) {
 			continue;
 		}
 
@@ -5473,42 +5473,42 @@ 
 		 *
 		 * @param string $cap Capability.
 		 */
-		if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) ) {
-			$cap = current_user_can( $post_type_obj->cap->read_private_posts );
+		if ( ! $cap = apply_filters('pub_priv_sql_capability', '')) {
+			$cap = current_user_can($post_type_obj->cap->read_private_posts);
 		}
 
 		// Only need to check the cap if $public_only is false.
 		$post_status_sql = "post_status = 'publish'";
-		if ( false === $public_only ) {
-			if ( $cap ) {
+		if (false === $public_only) {
+			if ($cap) {
 				// Does the user have the capability to view private posts? Guess so.
 				$post_status_sql .= " OR post_status = 'private'";
-			} elseif ( is_user_logged_in() ) {
+			} elseif (is_user_logged_in()) {
 				// Users can view their own private posts.
 				$id = get_current_user_id();
-				if ( null === $post_author || ! $full ) {
+				if (null === $post_author || ! $full) {
 					$post_status_sql .= " OR post_status = 'private' AND post_author = $id";
-				} elseif ( $id == (int) $post_author ) {
+				} elseif ($id == (int) $post_author) {
 					$post_status_sql .= " OR post_status = 'private'";
 				} // else none
 			} // else none
 		}
 
-		$post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )";
+		$post_type_clauses[] = "( post_type = '".$post_type."' AND ( $post_status_sql ) )";
 	}
 
-	if ( empty( $post_type_clauses ) ) {
+	if (empty($post_type_clauses)) {
 		return $full ? 'WHERE 1 = 0' : '1 = 0';
 	}
 
-	$sql = '( '. implode( ' OR ', $post_type_clauses ) . ' )';
+	$sql = '( '.implode(' OR ', $post_type_clauses).' )';
 
-	if ( null !== $post_author ) {
-		$sql .= $wpdb->prepare( ' AND post_author = %d', $post_author );
+	if (null !== $post_author) {
+		$sql .= $wpdb->prepare(' AND post_author = %d', $post_author);
 	}
 
-	if ( $full ) {
-		$sql = 'WHERE ' . $sql;
+	if ($full) {
+		$sql = 'WHERE '.$sql;
 	}
 
 	return $sql;
@@ -5532,7 +5532,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The date of the last post.
  */
-function get_lastpostdate( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostdate($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Filters the date the last post was published.
 	 *
@@ -5542,7 +5542,7 @@ 
 	 * @param string $timezone Location to use for getting the post published date.
 	 *                         See get_lastpostdate() for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date', $post_type ), $timezone );
+	return apply_filters('get_lastpostdate', _get_last_post_time($timezone, 'date', $post_type), $timezone);
 }
 
 /**
@@ -5561,7 +5561,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The timestamp.
  */
-function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostmodified($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Pre-filter the return value of get_lastpostmodified() before the query is run.
 	 *
@@ -5573,15 +5573,15 @@ 
 	 *                                 See get_lastpostdate() for accepted `$timezone` values.
 	 * @param string $post_type        The post type to check.
 	 */
-	$lastpostmodified = apply_filters( 'pre_get_lastpostmodified', false, $timezone, $post_type );
-	if ( false !== $lastpostmodified ) {
+	$lastpostmodified = apply_filters('pre_get_lastpostmodified', false, $timezone, $post_type);
+	if (false !== $lastpostmodified) {
 		return $lastpostmodified;
 	}
 
-	$lastpostmodified = _get_last_post_time( $timezone, 'modified', $post_type );
+	$lastpostmodified = _get_last_post_time($timezone, 'modified', $post_type);
 
 	$lastpostdate = get_lastpostdate($timezone);
-	if ( $lastpostdate > $lastpostmodified ) {
+	if ($lastpostdate > $lastpostmodified) {
 		$lastpostmodified = $lastpostdate;
 	}
 
@@ -5594,7 +5594,7 @@ 
 	 * @param string $timezone         Location to use for getting the post modified date.
 	 *                                 See get_lastpostdate() for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
+	return apply_filters('get_lastpostmodified', $lastpostmodified, $timezone);
 }
 
 /**
@@ -5612,34 +5612,34 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string|false The timestamp.
  */
-function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
+function _get_last_post_time($timezone, $field, $post_type = 'any') {
 	global $wpdb;
 
-	if ( ! in_array( $field, array( 'date', 'modified' ) ) ) {
+	if ( ! in_array($field, array('date', 'modified'))) {
 		return false;
 	}
 
-	$timezone = strtolower( $timezone );
+	$timezone = strtolower($timezone);
 
 	$key = "lastpost{$field}:$timezone";
-	if ( 'any' !== $post_type ) {
-		$key .= ':' . sanitize_key( $post_type );
+	if ('any' !== $post_type) {
+		$key .= ':'.sanitize_key($post_type);
 	}
 
-	$date = wp_cache_get( $key, 'timeinfo' );
-	if ( false !== $date ) {
+	$date = wp_cache_get($key, 'timeinfo');
+	if (false !== $date) {
 		return $date;
 	}
 
-	if ( 'any' === $post_type ) {
-		$post_types = get_post_types( array( 'public' => true ) );
-		array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
-		$post_types = "'" . implode( "', '", $post_types ) . "'";
+	if ('any' === $post_type) {
+		$post_types = get_post_types(array('public' => true));
+		array_walk($post_types, array($wpdb, 'escape_by_ref'));
+		$post_types = "'".implode("', '", $post_types)."'";
 	} else {
-		$post_types = "'" . sanitize_key( $post_type ) . "'";
+		$post_types = "'".sanitize_key($post_type)."'";
 	}
 
-	switch ( $timezone ) {
+	switch ($timezone) {
 		case 'gmt':
 			$date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 			break;
@@ -5647,13 +5647,13 @@ 
 			$date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 			break;
 		case 'server':
-			$add_seconds_server = date( 'Z' );
+			$add_seconds_server = date('Z');
 			$date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 			break;
 	}
 
-	if ( $date ) {
-		wp_cache_set( $key, $date, 'timeinfo' );
+	if ($date) {
+		wp_cache_set($key, $date, 'timeinfo');
 
 		return $date;
 	}
@@ -5668,12 +5668,12 @@ 
  *
  * @param array $posts Array of post objects, passed by reference.
  */
-function update_post_cache( &$posts ) {
-	if ( ! $posts )
+function update_post_cache(&$posts) {
+	if ( ! $posts)
 		return;
 
-	foreach ( $posts as $post )
-		wp_cache_add( $post->ID, $post, 'posts' );
+	foreach ($posts as $post)
+		wp_cache_add($post->ID, $post, 'posts');
 }
 
 /**
@@ -5691,22 +5691,22 @@ 
  *
  * @param int|WP_Post $post Post ID or post object to remove from the cache.
  */
-function clean_post_cache( $post ) {
+function clean_post_cache($post) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
-	$post = get_post( $post );
-	if ( empty( $post ) )
+	$post = get_post($post);
+	if (empty($post))
 		return;
 
-	wp_cache_delete( $post->ID, 'posts' );
-	wp_cache_delete( $post->ID, 'post_meta' );
+	wp_cache_delete($post->ID, 'posts');
+	wp_cache_delete($post->ID, 'post_meta');
 
-	clean_object_term_cache( $post->ID, $post->post_type );
+	clean_object_term_cache($post->ID, $post->post_type);
 
-	wp_cache_delete( 'wp_get_archives', 'general' );
+	wp_cache_delete('wp_get_archives', 'general');
 
 	/**
 	 * Fires immediately after the given post's cache is cleaned.
@@ -5716,10 +5716,10 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( 'clean_post_cache', $post->ID, $post );
+	do_action('clean_post_cache', $post->ID, $post);
 
-	if ( 'page' == $post->post_type ) {
-		wp_cache_delete( 'all_page_ids', 'posts' );
+	if ('page' == $post->post_type) {
+		wp_cache_delete('all_page_ids', 'posts');
 
 		/**
 		 * Fires immediately after the given page's cache is cleaned.
@@ -5728,10 +5728,10 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'clean_page_cache', $post->ID );
+		do_action('clean_page_cache', $post->ID);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'posts' );
+	wp_cache_set('last_changed', microtime(), 'posts');
 }
 
 /**
@@ -5744,27 +5744,27 @@ 
  * @param bool   $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool   $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
+function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
+	if ( ! $posts)
 		return;
 
 	update_post_cache($posts);
 
 	$post_ids = array();
-	foreach ( $posts as $post )
+	foreach ($posts as $post)
 		$post_ids[] = $post->ID;
 
-	if ( ! $post_type )
+	if ( ! $post_type)
 		$post_type = 'any';
 
-	if ( $update_term_cache ) {
-		if ( is_array($post_type) ) {
+	if ($update_term_cache) {
+		if (is_array($post_type)) {
 			$ptypes = $post_type;
-		} elseif ( 'any' == $post_type ) {
+		} elseif ('any' == $post_type) {
 			$ptypes = array();
 			// Just use the post_types in the supplied posts.
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 				$ptypes[] = $post->post_type;
 			}
 			$ptypes = array_unique($ptypes);
@@ -5772,11 +5772,11 @@ 
 			$ptypes = array($post_type);
 		}
 
-		if ( ! empty($ptypes) )
+		if ( ! empty($ptypes))
 			update_object_term_cache($post_ids, $ptypes);
 	}
 
-	if ( $update_meta_cache )
+	if ($update_meta_cache)
 		update_postmeta_cache($post_ids);
 }
 
@@ -5793,7 +5793,7 @@ 
  * @return array|false Returns false if there is nothing to update or an array
  *                     of metadata.
  */
-function update_postmeta_cache( $post_ids ) {
+function update_postmeta_cache($post_ids) {
 	return update_meta_cache('post', $post_ids);
 }
 
@@ -5812,10 +5812,10 @@ 
  * @param int  $id          The attachment ID in the cache to clean.
  * @param bool $clean_terms Optional. Whether to clean terms cache. Default false.
  */
-function clean_attachment_cache( $id, $clean_terms = false ) {
+function clean_attachment_cache($id, $clean_terms = false) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
 	$id = (int) $id;
@@ -5823,7 +5823,7 @@ 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
+	if ($clean_terms)
 		clean_object_term_cache($id, 'attachment');
 
 	/**
@@ -5833,7 +5833,7 @@ 
 	 *
 	 * @param int $id Attachment ID.
 	 */
-	do_action( 'clean_attachment_cache', $id );
+	do_action('clean_attachment_cache', $id);
 }
 
 //
@@ -5853,13 +5853,13 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post       Post object.
  */
-function _transition_post_status( $new_status, $old_status, $post ) {
+function _transition_post_status($new_status, $old_status, $post) {
 	global $wpdb;
 
-	if ( $old_status != 'publish' && $new_status == 'publish' ) {
+	if ($old_status != 'publish' && $new_status == 'publish') {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
-			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		if ('' == get_the_guid($post->ID))
+			$wpdb->update($wpdb->posts, array('guid' => get_permalink($post->ID)), array('ID' => $post->ID));
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5873,21 +5873,21 @@ 
 	}
 
 	// If published posts changed clear the lastpostmodified cache.
-	if ( 'publish' == $new_status || 'publish' == $old_status) {
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone:{$post->post_type}", 'timeinfo' );
+	if ('publish' == $new_status || 'publish' == $old_status) {
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastpostmodified:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone:{$post->post_type}", 'timeinfo');
 		}
 	}
 
-	if ( $new_status !== $old_status ) {
-		wp_cache_delete( _count_posts_cache_key( $post->post_type ), 'counts' );
-		wp_cache_delete( _count_posts_cache_key( $post->post_type, 'readable' ), 'counts' );
+	if ($new_status !== $old_status) {
+		wp_cache_delete(_count_posts_cache_key($post->post_type), 'counts');
+		wp_cache_delete(_count_posts_cache_key($post->post_type, 'readable'), 'counts');
 	}
 
 	// Always clears the hook in case the post status bounced from future to draft.
-	wp_clear_scheduled_hook('publish_future_post', array( $post->ID ) );
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
 }
 
 /**
@@ -5903,9 +5903,9 @@ 
  *                            wp_transition_post_status() and the default filter for _future_post_hook().
  * @param WP_Post $post       Post object.
  */
-function _future_post_hook( $deprecated, $post ) {
-	wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
-	wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) );
+function _future_post_hook($deprecated, $post) {
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
+	wp_schedule_single_event(strtotime(get_gmt_from_date($post->post_date).' GMT'), 'publish_future_post', array($post->ID));
 }
 
 /**
@@ -5918,8 +5918,8 @@ 
  *
  * @param int $post_id The ID in the database table of the post being published.
  */
-function _publish_post_hook( $post_id ) {
-	if ( defined( 'XMLRPC_REQUEST' ) ) {
+function _publish_post_hook($post_id) {
+	if (defined('XMLRPC_REQUEST')) {
 		/**
 		 * Fires when _publish_post_hook() is called during an XML-RPC request.
 		 *
@@ -5927,18 +5927,18 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'xmlrpc_publish_post', $post_id );
+		do_action('xmlrpc_publish_post', $post_id);
 	}
 
-	if ( defined('WP_IMPORTING') )
+	if (defined('WP_IMPORTING'))
 		return;
 
-	if ( get_option('default_pingback_flag') )
-		add_post_meta( $post_id, '_pingme', '1' );
-	add_post_meta( $post_id, '_encloseme', '1' );
+	if (get_option('default_pingback_flag'))
+		add_post_meta($post_id, '_pingme', '1');
+	add_post_meta($post_id, '_encloseme', '1');
 
-	if ( ! wp_next_scheduled( 'do_pings' ) ) {
-		wp_schedule_single_event( time(), 'do_pings' );
+	if ( ! wp_next_scheduled('do_pings')) {
+		wp_schedule_single_event(time(), 'do_pings');
 	}
 }
 
@@ -5951,9 +5951,9 @@ 
  *
  * @return int|false Post parent ID, otherwise false.
  */
-function wp_get_post_parent_id( $post_ID ) {
-	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
+function wp_get_post_parent_id($post_ID) {
+	$post = get_post($post_ID);
+	if ( ! $post || is_wp_error($post))
 		return false;
 	return (int) $post->post_parent;
 }
@@ -5972,30 +5972,30 @@ 
  * @param int $post_ID     ID of the post we're checking.
  * @return int The new post_parent for the post, 0 otherwise.
  */
-function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
+function wp_check_post_hierarchy_for_loops($post_parent, $post_ID) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
+	if ( ! $post_parent)
 		return 0;
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
+	if (empty($post_ID))
 		return $post_parent;
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
+	if ($post_parent == $post_ID)
 		return 0;
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
+	if ( ! $loop = wp_find_hierarchy_loop('wp_get_post_parent_id', $post_ID, $post_parent))
 		return $post_parent; // No loop
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
+	if (isset($loop[$post_ID]))
 		return 0;
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach (array_keys($loop) as $loop_member)
+		wp_update_post(array('ID' => $loop_member, 'post_parent' => 0));
 
 	return $post_parent;
 }
@@ -6009,14 +6009,14 @@ 
  * @param int         $thumbnail_id Thumbnail to attach.
  * @return int|bool True on success, false on failure.
  */
-function set_post_thumbnail( $post, $thumbnail_id ) {
-	$post = get_post( $post );
-	$thumbnail_id = absint( $thumbnail_id );
-	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
-			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+function set_post_thumbnail($post, $thumbnail_id) {
+	$post = get_post($post);
+	$thumbnail_id = absint($thumbnail_id);
+	if ($post && $thumbnail_id && get_post($thumbnail_id)) {
+		if (wp_get_attachment_image($thumbnail_id, 'thumbnail'))
+			return update_post_meta($post->ID, '_thumbnail_id', $thumbnail_id);
 		else
-			return delete_post_meta( $post->ID, '_thumbnail_id' );
+			return delete_post_meta($post->ID, '_thumbnail_id');
 	}
 	return false;
 }
@@ -6029,10 +6029,10 @@ 
  * @param int|WP_Post $post Post ID or post object where thumbnail should be removed from.
  * @return bool True on success, false on failure.
  */
-function delete_post_thumbnail( $post ) {
-	$post = get_post( $post );
-	if ( $post )
-		return delete_post_meta( $post->ID, '_thumbnail_id' );
+function delete_post_thumbnail($post) {
+	$post = get_post($post);
+	if ($post)
+		return delete_post_meta($post->ID, '_thumbnail_id');
 	return false;
 }
 
@@ -6047,10 +6047,10 @@ 
 	global $wpdb;
 
 	// Cleanup old auto-drafts more than 7 days old.
-	$old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
-	foreach ( (array) $old_posts as $delete ) {
+	$old_posts = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date");
+	foreach ((array) $old_posts as $delete) {
 		// Force delete.
-		wp_delete_post( $delete, true );
+		wp_delete_post($delete, true);
 	}
 }
 
@@ -6061,23 +6061,23 @@ 
  *
  * @param array $posts Array of WP_Post objects.
  */
-function wp_queue_posts_for_term_meta_lazyload( $posts ) {
+function wp_queue_posts_for_term_meta_lazyload($posts) {
 	$post_type_taxonomies = $term_ids = array();
-	foreach ( $posts as $post ) {
-		if ( ! ( $post instanceof WP_Post ) ) {
+	foreach ($posts as $post) {
+		if ( ! ($post instanceof WP_Post)) {
 			continue;
 		}
 
-		if ( ! isset( $post_type_taxonomies[ $post->post_type ] ) ) {
-			$post_type_taxonomies[ $post->post_type ] = get_object_taxonomies( $post->post_type );
+		if ( ! isset($post_type_taxonomies[$post->post_type])) {
+			$post_type_taxonomies[$post->post_type] = get_object_taxonomies($post->post_type);
 		}
 
-		foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
+		foreach ($post_type_taxonomies[$post->post_type] as $taxonomy) {
 			// Term cache should already be primed by `update_post_term_cache()`.
-			$terms = get_object_term_cache( $post->ID, $taxonomy );
-			if ( false !== $terms ) {
-				foreach ( $terms as $term ) {
-					if ( ! isset( $term_ids[ $term->term_id ] ) ) {
+			$terms = get_object_term_cache($post->ID, $taxonomy);
+			if (false !== $terms) {
+				foreach ($terms as $term) {
+					if ( ! isset($term_ids[$term->term_id])) {
 						$term_ids[] = $term->term_id;
 					}
 				}
@@ -6085,9 +6085,9 @@ 
 		}
 	}
 
-	if ( $term_ids ) {
+	if ($term_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'term', $term_ids );
+		$lazyloader->queue_objects('term', $term_ids);
 	}
 }
 
@@ -6104,11 +6104,11 @@ 
  * @param string  $old_status Old post status.
  * @param WP_Post $post       Post object.
  */
-function _update_term_count_on_transition_post_status( $new_status, $old_status, $post ) {
+function _update_term_count_on_transition_post_status($new_status, $old_status, $post) {
 	// Update counts for the post's terms.
-	foreach ( (array) get_object_taxonomies( $post->post_type ) as $taxonomy ) {
-		$tt_ids = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'tt_ids' ) );
-		wp_update_term_count( $tt_ids, $taxonomy );
+	foreach ((array) get_object_taxonomies($post->post_type) as $taxonomy) {
+		$tt_ids = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'tt_ids'));
+		wp_update_term_count($tt_ids, $taxonomy);
 	}
 }
 
@@ -6126,14 +6126,14 @@ 
  * @param bool  $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache = true ) {
+function _prime_post_caches($ids, $update_term_cache = true, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ",", $non_cached_ids ) ) );
+	$non_cached_ids = _get_non_cached_ids($ids, 'posts');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_posts = $wpdb->get_results(sprintf("SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join(",", $non_cached_ids)));
 
-		update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+		update_post_caches($fresh_posts, 'any', $update_term_cache, $update_meta_cache);
 	}
 }
 
@@ -6151,18 +6151,18 @@ 
  * @param string $post_name Slug.
  * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
-function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
-	$trashed_posts_with_desired_slug = get_posts( array(
+function wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID = 0) {
+	$trashed_posts_with_desired_slug = get_posts(array(
 		'name' => $post_name,
 		'post_status' => 'trash',
 		'post_type' => 'any',
 		'nopaging' => true,
-		'post__not_in' => array( $post_ID )
-	) );
+		'post__not_in' => array($post_ID)
+	));
 
-	if ( ! empty( $trashed_posts_with_desired_slug ) ) {
-		foreach ( $trashed_posts_with_desired_slug as $_post ) {
-			wp_add_trashed_suffix_to_post_name_for_post( $_post );
+	if ( ! empty($trashed_posts_with_desired_slug)) {
+		foreach ($trashed_posts_with_desired_slug as $_post) {
+			wp_add_trashed_suffix_to_post_name_for_post($_post);
 		}
 	}
 }
@@ -6181,18 +6181,18 @@ 
  * @param WP_Post $post The post.
  * @return string New slug for the post.
  */
-function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
+function wp_add_trashed_suffix_to_post_name_for_post($post) {
 	global $wpdb;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( '__trashed' === substr( $post->post_name, -9 ) ) {
+	if ('__trashed' === substr($post->post_name, -9)) {
 		return $post->post_name;
 	}
-	add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name );
-	$post_name = _truncate_post_slug( $post->post_name, 191 ) . '__trashed';
-	$wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
-	clean_post_cache( $post->ID );
+	add_post_meta($post->ID, '_wp_desired_post_slug', $post->post_name);
+	$post_name = _truncate_post_slug($post->post_name, 191).'__trashed';
+	$wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
+	clean_post_cache($post->ID);
 	return $post_name;
 }
 
@@ -6208,9 +6208,9 @@ 
  *                       DISTINCT, fields (SELECT), and LIMITS clauses.
  * @return array The modified clauses.
  */
-function _filter_query_attachment_filenames( $clauses ) {
+function _filter_query_attachment_filenames($clauses) {
 	global $wpdb;
-	remove_filter( 'posts_clauses', __FUNCTION__ );
+	remove_filter('posts_clauses', __FUNCTION__);
 
 	// Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
 	$clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";

Braces +518 added lines, -355 removed lines

@@ -306,8 +306,9 @@ 
  * @return bool True on success, false on failure.
  */
 function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
-		return false;
+	if ( !get_post( $attachment_id ) ) {
+			return false;
+	}
 
 	/**
 	 * Filters the path to the attached file to update.
@@ -319,11 +320,12 @@ 
 	 */
 	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
 
-	if ( $file = _wp_relative_upload_path( $file ) )
-		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
-	else
-		return delete_post_meta( $attachment_id, '_wp_attached_file' );
-}
+	if ( $file = _wp_relative_upload_path( $file ) ) {
+			return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+	} else {
+			return delete_post_meta( $attachment_id, '_wp_attached_file' );
+	}
+	}
 
 /**
  * Return relative path to an uploaded file.
@@ -429,16 +431,19 @@ 
 
 	$children = get_posts( $r );
 
-	if ( ! $children )
-		return $kids;
+	if ( ! $children ) {
+			return $kids;
+	}
 
-	if ( ! empty( $r['fields'] ) )
-		return $children;
+	if ( ! empty( $r['fields'] ) ) {
+			return $children;
+	}
 
 	update_post_cache($children);
 
-	foreach ( $children as $key => $child )
-		$kids[$child->ID] = $children[$key];
+	foreach ( $children as $key => $child ) {
+			$kids[$child->ID] = $children[$key];
+	}
 
 	if ( $output == OBJECT ) {
 		return $kids;
@@ -513,8 +518,9 @@ 
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
 function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
-		$post = $GLOBALS['post'];
+	if ( empty( $post ) && isset( $GLOBALS['post'] ) ) {
+			$post = $GLOBALS['post'];
+	}
 
 	if ( $post instanceof WP_Post ) {
 		$_post = $post;
@@ -531,15 +537,17 @@ 
 		$_post = WP_Post::get_instance( $post );
 	}
 
-	if ( ! $_post )
-		return null;
+	if ( ! $_post ) {
+			return null;
+	}
 
 	$_post = $_post->filter( $filter );
 
-	if ( $output == ARRAY_A )
-		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
-		return array_values( $_post->to_array() );
+	if ( $output == ARRAY_A ) {
+			return $_post->to_array();
+	} elseif ( $output == ARRAY_N ) {
+			return array_values( $_post->to_array() );
+	}
 
 	return $_post;
 }
@@ -555,8 +563,9 @@ 
 function get_post_ancestors( $post ) {
 	$post = get_post( $post );
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
-		return array();
+	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID ) {
+			return array();
+	}
 
 	$ancestors = array();
 
@@ -564,8 +573,9 @@ 
 
 	while ( $ancestor = get_post( $id ) ) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
-			break;
+		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) ) {
+					break;
+		}
 
 		$id = $ancestors[] = $ancestor->post_parent;
 	}
@@ -596,11 +606,13 @@ 
 function get_post_field( $field, $post = null, $context = 'display' ) {
 	$post = get_post( $post );
 
-	if ( !$post )
-		return '';
+	if ( !$post ) {
+			return '';
+	}
 
-	if ( !isset($post->$field) )
-		return '';
+	if ( !isset($post->$field) ) {
+			return '';
+	}
 
 	return sanitize_post_field($field, $post->$field, $post->ID, $context);
 }
@@ -619,8 +631,9 @@ 
 function get_post_mime_type( $ID = '' ) {
 	$post = get_post($ID);
 
-	if ( is_object($post) )
-		return $post->post_mime_type;
+	if ( is_object($post) ) {
+			return $post->post_mime_type;
+	}
 
 	return false;
 }
@@ -639,16 +652,19 @@ 
 function get_post_status( $ID = '' ) {
 	$post = get_post($ID);
 
-	if ( !is_object($post) )
-		return false;
+	if ( !is_object($post) ) {
+			return false;
+	}
 
 	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
-			return 'private';
+		if ( 'private' == $post->post_status ) {
+					return 'private';
+		}
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
-			return 'publish';
+		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) ) {
+					return 'publish';
+		}
 
 		// Inherit status from the parent.
 		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
@@ -760,8 +776,9 @@ 
 function register_post_status( $post_status, $args = array() ) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
-		$wp_post_statuses = array();
+	if (!is_array($wp_post_statuses)) {
+			$wp_post_statuses = array();
+	}
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
@@ -784,38 +801,49 @@ 
 	$args->name = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
-		$args->internal = true;
+	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private ) {
+			$args->internal = true;
+	}
 
-	if ( null === $args->public  )
-		$args->public = false;
+	if ( null === $args->public  ) {
+			$args->public = false;
+	}
 
-	if ( null === $args->private  )
-		$args->private = false;
+	if ( null === $args->private  ) {
+			$args->private = false;
+	}
 
-	if ( null === $args->protected  )
-		$args->protected = false;
+	if ( null === $args->protected  ) {
+			$args->protected = false;
+	}
 
-	if ( null === $args->internal  )
-		$args->internal = false;
+	if ( null === $args->internal  ) {
+			$args->internal = false;
+	}
 
-	if ( null === $args->publicly_queryable )
-		$args->publicly_queryable = $args->public;
+	if ( null === $args->publicly_queryable ) {
+			$args->publicly_queryable = $args->public;
+	}
 
-	if ( null === $args->exclude_from_search )
-		$args->exclude_from_search = $args->internal;
+	if ( null === $args->exclude_from_search ) {
+			$args->exclude_from_search = $args->internal;
+	}
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if ( null === $args->show_in_admin_all_list ) {
+			$args->show_in_admin_all_list = !$args->internal;
+	}
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if ( null === $args->show_in_admin_status_list ) {
+			$args->show_in_admin_status_list = !$args->internal;
+	}
 
-	if ( false === $args->label )
-		$args->label = $post_status;
+	if ( false === $args->label ) {
+			$args->label = $post_status;
+	}
 
-	if ( false === $args->label_count )
-		$args->label_count = _n_noop( $args->label, $args->label );
+	if ( false === $args->label_count ) {
+			$args->label_count = _n_noop( $args->label, $args->label );
+	}
 
 	$wp_post_statuses[$post_status] = $args;
 
@@ -837,8 +865,9 @@ 
 function get_post_status_object( $post_status ) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
-		return null;
+	if ( empty($wp_post_statuses[$post_status]) ) {
+			return null;
+	}
 
 	return $wp_post_statuses[$post_status];
 }
@@ -881,8 +910,9 @@ 
  * @return bool Whether post type is hierarchical.
  */
 function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
-		return false;
+	if ( ! post_type_exists( $post_type ) ) {
+			return false;
+	}
 
 	$post_type = get_post_type_object( $post_type );
 	return $post_type->hierarchical;
@@ -911,8 +941,9 @@ 
  * @return string|false          Post type on success, false on failure.
  */
 function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
-		return $post->post_type;
+	if ( $post = get_post( $post ) ) {
+			return $post->post_type;
+	}
 
 	return false;
 }
@@ -1243,8 +1274,9 @@ 
  * @return object object with all the capabilities as member variables.
  */
 function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
-		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+	if ( ! is_array( $args->capability_type ) ) {
+			$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+	}
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
 	list( $singular_base, $plural_base ) = $args->capability_type;
@@ -1278,12 +1310,14 @@ 
 	$capabilities = array_merge( $default_capabilities, $args->capabilities );
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
-		$capabilities['create_posts'] = $capabilities['edit_posts'];
+	if ( ! isset( $capabilities['create_posts'] ) ) {
+			$capabilities['create_posts'] = $capabilities['edit_posts'];
+	}
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
-		_post_type_meta_capabilities( $capabilities );
+	if ( $args->map_meta_cap ) {
+			_post_type_meta_capabilities( $capabilities );
+	}
 
 	return (object) $capabilities;
 }
@@ -1434,20 +1468,25 @@ 
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
-		$object->labels['name'] = $object->label;
+	if ( isset( $object->label ) && empty( $object->labels['name'] ) ) {
+			$object->labels['name'] = $object->label;
+	}
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
-		$object->labels['singular_name'] = $object->labels['name'];
+	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
+			$object->labels['singular_name'] = $object->labels['name'];
+	}
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset( $object->labels['name_admin_bar'] ) ) {
+			$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	}
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
-		$object->labels['menu_name'] = $object->labels['name'];
+	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) ) {
+			$object->labels['menu_name'] = $object->labels['name'];
+	}
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
-		$object->labels['all_items'] = $object->labels['menu_name'];
+	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) ) {
+			$object->labels['all_items'] = $object->labels['menu_name'];
+	}
 
 	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
 		$object->labels['archives'] = $object->labels['all_items'];
@@ -1473,8 +1512,9 @@ 
 	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
 		$ptype_obj = get_post_type_object( $ptype );
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
-			continue;
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true ) {
+					continue;
+		}
 		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
 	}
 }
@@ -1504,10 +1544,11 @@ 
 
 	$features = (array) $feature;
 	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
-			$_wp_post_type_features[$post_type][$feature] = true;
-		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+		if ( func_num_args() == 2 ) {
+					$_wp_post_type_features[$post_type][$feature] = true;
+		} else {
+					$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+		}
 	}
 }
 
@@ -1540,8 +1581,9 @@ 
 function get_all_post_type_supports( $post_type ) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
-		return $_wp_post_type_features[$post_type];
+	if ( isset( $_wp_post_type_features[$post_type] ) ) {
+			return $_wp_post_type_features[$post_type];
+	}
 
 	return array();
 }
@@ -1669,18 +1711,22 @@ 
 	);
 
 	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
-		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
-		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
-		$r['cat'] = $r['category'];
+	if ( empty( $r['post_status'] ) ) {
+			$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
+	}
+	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) ) {
+			$r['posts_per_page'] = $r['numberposts'];
+	}
+	if ( ! empty($r['category']) ) {
+			$r['cat'] = $r['category'];
+	}
 	if ( ! empty($r['include']) ) {
 		$incposts = wp_parse_id_list( $r['include'] );
 		$r['posts_per_page'] = count($incposts);  // only the number of posts included
 		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
-		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	} elseif ( ! empty($r['exclude']) ) {
+			$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	}
 
 	$r['ignore_sticky_posts'] = true;
 	$r['no_found_rows'] = true;
@@ -1710,8 +1756,9 @@ 
  */
 function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
 }
@@ -1733,8 +1780,9 @@ 
  */
 function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return delete_metadata('post', $post_id, $meta_key, $meta_value);
 }
@@ -1775,8 +1823,9 @@ 
  */
 function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
 }
@@ -1806,8 +1855,9 @@ 
  */
 function get_post_custom( $post_id = 0 ) {
 	$post_id = absint( $post_id );
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	return get_post_meta( $post_id );
 }
@@ -1825,12 +1875,14 @@ 
 function get_post_custom_keys( $post_id = 0 ) {
 	$custom = get_post_custom( $post_id );
 
-	if ( !is_array($custom) )
-		return;
+	if ( !is_array($custom) ) {
+			return;
+	}
 
-	if ( $keys = array_keys($custom) )
-		return $keys;
-}
+	if ( $keys = array_keys($custom) ) {
+			return $keys;
+	}
+	}
 
 /**
  * Retrieve values for a custom post field.
@@ -1845,8 +1897,9 @@ 
  * @return array|null Meta field values.
  */
 function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
-		return null;
+	if ( !$key ) {
+			return null;
+	}
 
 	$custom = get_post_custom($post_id);
 
@@ -1867,16 +1920,19 @@ 
 function is_sticky( $post_id = 0 ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	$stickies = get_option( 'sticky_posts' );
 
-	if ( ! is_array( $stickies ) )
-		return false;
+	if ( ! is_array( $stickies ) ) {
+			return false;
+	}
 
-	if ( in_array( $post_id, $stickies ) )
-		return true;
+	if ( in_array( $post_id, $stickies ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -1901,21 +1957,27 @@ 
 function sanitize_post( $post, $context = 'display' ) {
 	if ( is_object($post) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
-			return $post;
-		if ( !isset($post->ID) )
-			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
-			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+		if ( isset($post->filter) && $context == $post->filter ) {
+					return $post;
+		}
+		if ( !isset($post->ID) ) {
+					$post->ID = 0;
+		}
+		foreach ( array_keys(get_object_vars($post)) as $field ) {
+					$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+		}
 		$post->filter = $context;
 	} elseif ( is_array( $post ) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
-			return $post;
-		if ( !isset($post['ID']) )
-			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
-			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
+		if ( isset($post['filter']) && $context == $post['filter'] ) {
+					return $post;
+		}
+		if ( !isset($post['ID']) ) {
+					$post['ID'] = 0;
+		}
+		foreach ( array_keys($post) as $field ) {
+					$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
+		}
 		$post['filter'] = $context;
 	}
 	return $post;
@@ -1940,8 +2002,9 @@ 
  */
 function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
 	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
-		$value = (int) $value;
+	if ( in_array($field, $int_fields) ) {
+			$value = (int) $value;
+	}
 
 	// Fields which contain arrays of integers.
 	$array_int_fields = array( 'ancestors' );
@@ -1950,8 +2013,9 @@ 
 		return $value;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	$prefixed = false;
 	if ( false !== strpos($field, 'post_') ) {
@@ -1994,10 +2058,11 @@ 
 		}
 
 		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
-				$value = format_to_edit($value, user_can_richedit());
-			else
-				$value = format_to_edit($value);
+			if ( 'post_content' == $field ) {
+							$value = format_to_edit($value, user_can_richedit());
+			} else {
+							$value = format_to_edit($value);
+			}
 		} else {
 			$value = esc_attr($value);
 		}
@@ -2088,11 +2153,13 @@ 
 function stick_post( $post_id ) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
-		$stickies = array($post_id);
+	if ( !is_array($stickies) ) {
+			$stickies = array($post_id);
+	}
 
-	if ( ! in_array($post_id, $stickies) )
-		$stickies[] = $post_id;
+	if ( ! in_array($post_id, $stickies) ) {
+			$stickies[] = $post_id;
+	}
 
 	$updated = update_option( 'sticky_posts', $stickies );
 
@@ -2120,15 +2187,18 @@ 
 function unstick_post( $post_id ) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
-		return;
+	if ( !is_array($stickies) ) {
+			return;
+	}
 
-	if ( ! in_array($post_id, $stickies) )
-		return;
+	if ( ! in_array($post_id, $stickies) ) {
+			return;
+	}
 
 	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
-		return;
+	if ( false === $offset ) {
+			return;
+	}
 
 	array_splice($stickies, $offset, 1);
 
@@ -2188,8 +2258,9 @@ 
 function wp_count_posts( $type = 'post', $perm = '' ) {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
-		return new stdClass;
+	if ( ! post_type_exists( $type ) ) {
+			return new stdClass;
+	}
 
 	$cache_key = _count_posts_cache_key( $type, $perm );
 
@@ -2364,8 +2435,9 @@ 
 function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
 	$where = '';
 	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
-		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
+	if ( is_string($post_mime_types) ) {
+			$post_mime_types = array_map('trim', explode(',', $post_mime_types));
+	}
 
 	$wheres = array();
 
@@ -2375,29 +2447,34 @@ 
 		if ( false !== $slashpos ) {
 			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
 			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
-				$mime_subgroup = '*';
-			else
-				$mime_subgroup = str_replace('/', '', $mime_subgroup);
+			if ( empty($mime_subgroup) ) {
+							$mime_subgroup = '*';
+			} else {
+							$mime_subgroup = str_replace('/', '', $mime_subgroup);
+			}
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
-				$mime_pattern .= '/*';
+			if ( false === strpos($mime_pattern, '*') ) {
+							$mime_pattern .= '/*';
+			}
 		}
 
 		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
 
-		if ( in_array( $mime_type, $wildcards ) )
-			return '';
+		if ( in_array( $mime_type, $wildcards ) ) {
+					return '';
+		}
 
-		if ( false !== strpos($mime_pattern, '%') )
-			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
-		else
-			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		if ( false !== strpos($mime_pattern, '%') ) {
+					$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
+		} else {
+					$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		}
+	}
+	if ( !empty($wheres) ) {
+			$where = ' AND (' . join(' OR ', $wheres) . ') ';
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
 	return $where;
 }
 
@@ -2425,14 +2502,17 @@ 
 function wp_delete_post( $postid = 0, $force_delete = false ) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
-		return $post;
+	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) {
+			return $post;
+	}
 
-	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
-		return wp_trash_post( $postid );
+	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS ) {
+			return wp_trash_post( $postid );
+	}
 
-	if ( $post->post_type == 'attachment' )
-		return wp_delete_attachment( $postid, $force_delete );
+	if ( $post->post_type == 'attachment' ) {
+			return wp_delete_attachment( $postid, $force_delete );
+	}
 
 	/**
 	 * Filters whether a post deletion should take place.
@@ -2479,8 +2559,9 @@ 
 	// Do raw query. wp_get_post_revisions() is filtered.
 	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
-		wp_delete_post_revision( $revision_id );
+	foreach ( $revision_ids as $revision_id ) {
+			wp_delete_post_revision( $revision_id );
+	}
 
 	// Point all attachments to this post up one level.
 	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
@@ -2495,8 +2576,9 @@ 
 	wp_defer_comment_counting( false );
 
 	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	foreach ( $post_meta_ids as $mid ) {
+			delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2523,8 +2605,9 @@ 
 	clean_post_cache( $post );
 
 	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
-			clean_post_cache( $child );
+		foreach ( $children as $child ) {
+					clean_post_cache( $child );
+		}
 	}
 
 	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
@@ -2586,14 +2669,17 @@ 
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
 function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_post($post_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_post($post_id, true);
+	}
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
-		return $post;
+	if ( !$post = get_post($post_id, ARRAY_A) ) {
+			return $post;
+	}
 
-	if ( $post['post_status'] == 'trash' )
-		return false;
+	if ( $post['post_status'] == 'trash' ) {
+			return false;
+	}
 
 	/**
 	 * Fires before a post is sent to the trash.
@@ -2633,11 +2719,13 @@ 
  * @return WP_Post|false WP_Post object. False on failure.
  */
 function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
-		return $post;
+	if ( !$post = get_post($post_id, ARRAY_A) ) {
+			return $post;
+	}
 
-	if ( $post['post_status'] != 'trash' )
-		return false;
+	if ( $post['post_status'] != 'trash' ) {
+			return false;
+	}
 
 	/**
 	 * Fires before a post is restored from the trash.
@@ -2685,8 +2773,9 @@ 
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$post_id = $post->ID;
 
@@ -2700,13 +2789,15 @@ 
 	do_action( 'trash_post_comments', $post_id );
 
 	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
-		return;
+	if ( empty($comments) ) {
+			return;
+	}
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
-		$statuses[$comment->comment_ID] = $comment->comment_approved;
+	foreach ( $comments as $comment ) {
+			$statuses[$comment->comment_ID] = $comment->comment_approved;
+	}
 	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
 
 	// Set status for all comments to post-trashed.
@@ -2741,15 +2832,17 @@ 
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$post_id = $post->ID;
 
 	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
 
-	if ( empty($statuses) )
-		return true;
+	if ( empty($statuses) ) {
+			return true;
+	}
 
 	/**
 	 * Fires before comments are restored for a post from the trash.
@@ -2762,8 +2855,9 @@ 
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
-		$group_by_status[$comment_status][] = $comment_id;
+	foreach ( $statuses as $comment_id => $comment_status ) {
+			$group_by_status[$comment_status][] = $comment_id;
+	}
 
 	foreach ( $group_by_status as $status => $comments ) {
 		// Sanity check. This shouldn't happen.
@@ -3547,8 +3641,9 @@ 
 	$post = get_post($postarr['ID'], ARRAY_A);
 
 	if ( is_null( $post ) ) {
-		if ( $wp_error )
-			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		if ( $wp_error ) {
+					return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		}
 		return 0;
 	}
 
@@ -3557,17 +3652,19 @@ 
 
 	// Passed post category list overwrites existing category list if not empty.
 	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			 && 0 != count($postarr['post_category']) )
-		$post_cats = $postarr['post_category'];
-	else
-		$post_cats = $post['post_category'];
+			 && 0 != count($postarr['post_category']) ) {
+			$post_cats = $postarr['post_category'];
+	} else {
+			$post_cats = $post['post_category'];
+	}
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
 	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
-		$clear_date = true;
-	else
-		$clear_date = false;
+			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) ) {
+			$clear_date = true;
+	} else {
+			$clear_date = false;
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$postarr = array_merge($post, $postarr);
@@ -3577,8 +3674,9 @@ 
 		$postarr['post_date_gmt'] = '';
 	}
 
-	if ($postarr['post_type'] == 'attachment')
-		return wp_insert_attachment($postarr);
+	if ($postarr['post_type'] == 'attachment') {
+			return wp_insert_attachment($postarr);
+	}
 
 	return wp_insert_post( $postarr, $wp_error );
 }
@@ -3595,11 +3693,13 @@ 
 function wp_publish_post( $post ) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
-		return;
+	if ( ! $post = get_post( $post ) ) {
+			return;
+	}
 
-	if ( 'publish' == $post->post_status )
-		return;
+	if ( 'publish' == $post->post_status ) {
+			return;
+	}
 
 	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
 
@@ -3635,11 +3735,13 @@ 
 function check_and_publish_future_post( $post_id ) {
 	$post = get_post($post_id);
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
-	if ( 'future' != $post->post_status )
-		return;
+	if ( 'future' != $post->post_status ) {
+			return;
+	}
 
 	$time = strtotime( $post->post_date_gmt . ' GMT' );
 
@@ -3670,16 +3772,18 @@ 
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
 function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
-		return $slug;
+	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) ) {
+			return $slug;
+	}
 
 	global $wpdb, $wp_rewrite;
 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
-		$feeds = array();
+	if ( ! is_array( $feeds ) ) {
+			$feeds = array();
+	}
 
 	if ( 'attachment' == $post_type ) {
 		// Attachment slugs must be unique across all types.
@@ -3704,8 +3808,9 @@ 
 			$slug = $alt_post_name;
 		}
 	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
-			return $slug;
+		if ( 'nav_menu_item' == $post_type ) {
+					return $slug;
+		}
 
 		/*
 		 * Page slugs must be unique within their own trees. Pages are in a separate
@@ -3810,10 +3915,11 @@ 
 function _truncate_post_slug( $slug, $length = 200 ) {
 	if ( strlen( $slug ) > $length ) {
 		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
-			$slug = substr( $slug, 0, $length );
-		else
-			$slug = utf8_uri_encode( $decoded_slug, $length );
+		if ( $decoded_slug === $slug ) {
+					$slug = substr( $slug, 0, $length );
+		} else {
+					$slug = utf8_uri_encode( $decoded_slug, $length );
+		}
 	}
 
 	return rtrim( $slug, '-' );
@@ -3871,16 +3977,19 @@ 
 function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
-	if ( empty($tags) )
-		$tags = array();
+	if ( empty($tags) ) {
+			$tags = array();
+	}
 
 	if ( ! is_array( $tags ) ) {
 		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
-			$tags = str_replace( $comma, ',', $tags );
+		if ( ',' !== $comma ) {
+					$tags = str_replace( $comma, ',', $tags );
+		}
 		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
 	}
 
@@ -4028,8 +4137,7 @@ 
 
 	if ( is_array( $uri ) ) {
 		$pung = array_merge( $pung, $uri );
-	}
-	else {
+	} else {
 		$pung[] = $uri;
 	}
 	$new = implode("\n", $pung);
@@ -4059,12 +4167,14 @@ 
 function get_enclosed( $post_id ) {
 	$custom_fields = get_post_custom( $post_id );
 	$pung = array();
-	if ( !is_array( $custom_fields ) )
-		return $pung;
+	if ( !is_array( $custom_fields ) ) {
+			return $pung;
+	}
 
 	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
-			continue;
+		if ( 'enclosure' != $key || !is_array( $val ) ) {
+					continue;
+		}
 		foreach ( $val as $enc ) {
 			$enclosure = explode( "\n", $enc );
 			$pung[] = trim( $enclosure[ 0 ] );
@@ -4283,15 +4393,17 @@ 
 			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
 				$count++;
 				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
-					break;
+				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] ) {
+									break;
+				}
 				$p = $parent;
 			}
 
 			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
-					break;
+				if ( $page->post_type == $post_type ) {
+									break;
+				}
 			}
 		}
 	}
@@ -4452,8 +4564,9 @@ 
 		$page = get_post( $page );
 	}
 
-	if ( ! $page )
-		return false;
+	if ( ! $page ) {
+			return false;
+	}
 
 	$uri = $page->post_name;
 
@@ -4787,14 +4900,17 @@ 
  * @return bool True on success, false on failure.
  */
 function is_local_attachment($url) {
-	if (strpos($url, home_url()) === false)
-		return false;
-	if (strpos($url, home_url('/?attachment_id=')) !== false)
-		return true;
+	if (strpos($url, home_url()) === false) {
+			return false;
+	}
+	if (strpos($url, home_url('/?attachment_id=')) !== false) {
+			return true;
+	}
 	if ( $id = url_to_postid($url) ) {
 		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
-			return true;
+		if ( 'attachment' == $post->post_type ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -4863,14 +4979,17 @@ 
 function wp_delete_attachment( $post_id, $force_delete = false ) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
-		return $post;
+	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) ) {
+			return $post;
+	}
 
-	if ( 'attachment' != $post->post_type )
-		return false;
+	if ( 'attachment' != $post->post_type ) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status )
-		return wp_trash_post( $post_id );
+	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status ) {
+			return wp_trash_post( $post_id );
+	}
 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
@@ -4879,8 +4998,9 @@ 
 	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
 	$file = get_attached_file( $post_id );
 
-	if ( is_multisite() )
-		delete_transient( 'dirsize_cache' );
+	if ( is_multisite() ) {
+			delete_transient( 'dirsize_cache' );
+	}
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4907,8 +5027,9 @@ 
 	wp_defer_comment_counting( false );
 
 	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	foreach ( $post_meta_ids as $mid ) {
+			delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/** This action is documented in wp-includes/post.php */
 	do_action( 'delete_post', $post_id );
@@ -4968,13 +5089,15 @@ 
  */
 function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
 	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
 
-	if ( $unfiltered )
-		return $data;
+	if ( $unfiltered ) {
+			return $data;
+	}
 
 	/**
 	 * Filters the attachment meta data.
@@ -4999,8 +5122,9 @@ 
  */
 function wp_update_attachment_metadata( $post_id, $data ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
 	/**
 	 * Filters the updated attachment meta data.
@@ -5010,11 +5134,12 @@ 
 	 * @param array $data    Array of updated attachment meta data.
 	 * @param int   $post_id Attachment ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
-		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
-	else
-		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
-}
+	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) ) {
+			return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+	} else {
+			return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+	}
+	}
 
 /**
  * Retrieve the URL for an attachment.
@@ -5028,11 +5153,13 @@ 
  */
 function wp_get_attachment_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( 'attachment' != $post->post_type )
-		return false;
+	if ( 'attachment' != $post->post_type ) {
+			return false;
+	}
 
 	$url = '';
 	// Get attached file.
@@ -5076,8 +5203,9 @@ 
 	 */
 	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
 
-	if ( empty( $url ) )
-		return false;
+	if ( empty( $url ) ) {
+			return false;
+	}
 
 	return $url;
 }
@@ -5123,10 +5251,12 @@ 
  */
 function wp_get_attachment_thumb_file( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -5154,17 +5284,21 @@ 
  */
 function wp_get_attachment_thumb_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( !$url = wp_get_attachment_url( $post->ID ) ) {
+			return false;
+	}
 
 	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
-		return $sized[0];
+	if ( $sized ) {
+			return $sized[0];
+	}
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
-		return false;
+	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) ) {
+			return false;
+	}
 
 	$url = str_replace(basename($url), basename($thumb), $url);
 
@@ -5251,8 +5385,9 @@ 
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
-		$icon = wp_cache_get("mime_type_icon_$mime");
+	if ( !is_numeric($mime) ) {
+			$icon = wp_cache_get("mime_type_icon_$mime");
+	}
 
 	$post_id = 0;
 	if ( empty($icon) ) {
@@ -5265,8 +5400,9 @@ 
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
 				if ( !empty($ext) ) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
-						$post_mimes[] = $ext_type;
+					if ( $ext_type = wp_ext2type( $ext ) ) {
+											$post_mimes[] = $ext_type;
+					}
 				}
 				$mime = $post->post_mime_type;
 			} else {
@@ -5313,11 +5449,13 @@ 
 				if ( $dh = opendir($dir) ) {
 					while ( false !== $file = readdir($dh) ) {
 						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
-							continue;
+						if ( substr($file, 0, 1) == '.' ) {
+													continue;
+						}
 						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
-								$dirs["$dir/$file"] = "$uri/$file";
+							if ( is_dir("$dir/$file") ) {
+															$dirs["$dir/$file"] = "$uri/$file";
+							}
 							continue;
 						}
 						$icon_files["$dir/$file"] = "$uri/$file";
@@ -5330,8 +5468,9 @@ 
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		foreach ( $icon_files as $file => $uri ) {
+					$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		}
 
 		if ( ! empty($mime) ) {
 			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
@@ -5669,12 +5808,14 @@ 
  * @param array $posts Array of post objects, passed by reference.
  */
 function update_post_cache( &$posts ) {
-	if ( ! $posts )
-		return;
+	if ( ! $posts ) {
+			return;
+	}
 
-	foreach ( $posts as $post )
-		wp_cache_add( $post->ID, $post, 'posts' );
-}
+	foreach ( $posts as $post ) {
+			wp_cache_add( $post->ID, $post, 'posts' );
+	}
+	}
 
 /**
  * Will clean the post in the cache.
@@ -5694,12 +5835,14 @@ 
 function clean_post_cache( $post ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
-		return;
+	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+			return;
+	}
 
 	$post = get_post( $post );
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	wp_cache_delete( $post->ID, 'posts' );
 	wp_cache_delete( $post->ID, 'post_meta' );
@@ -5746,17 +5889,20 @@ 
  */
 function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
-		return;
+	if ( !$posts ) {
+			return;
+	}
 
 	update_post_cache($posts);
 
 	$post_ids = array();
-	foreach ( $posts as $post )
-		$post_ids[] = $post->ID;
+	foreach ( $posts as $post ) {
+			$post_ids[] = $post->ID;
+	}
 
-	if ( ! $post_type )
-		$post_type = 'any';
+	if ( ! $post_type ) {
+			$post_type = 'any';
+	}
 
 	if ( $update_term_cache ) {
 		if ( is_array($post_type) ) {
@@ -5772,13 +5918,15 @@ 
 			$ptypes = array($post_type);
 		}
 
-		if ( ! empty($ptypes) )
-			update_object_term_cache($post_ids, $ptypes);
+		if ( ! empty($ptypes) ) {
+					update_object_term_cache($post_ids, $ptypes);
+		}
 	}
 
-	if ( $update_meta_cache )
-		update_postmeta_cache($post_ids);
-}
+	if ( $update_meta_cache ) {
+			update_postmeta_cache($post_ids);
+	}
+	}
 
 /**
  * Updates metadata cache for list of post IDs.
@@ -5815,16 +5963,18 @@ 
 function clean_attachment_cache( $id, $clean_terms = false ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
-		return;
+	if ( !empty($_wp_suspend_cache_invalidation) ) {
+			return;
+	}
 
 	$id = (int) $id;
 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
-		clean_object_term_cache($id, 'attachment');
+	if ( $clean_terms ) {
+			clean_object_term_cache($id, 'attachment');
+	}
 
 	/**
 	 * Fires after the given attachment's cache is cleaned.
@@ -5858,8 +6008,9 @@ 
 
 	if ( $old_status != 'publish' && $new_status == 'publish' ) {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
-			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		if ( '' == get_the_guid($post->ID) ) {
+					$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		}
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5930,11 +6081,13 @@ 
 		do_action( 'xmlrpc_publish_post', $post_id );
 	}
 
-	if ( defined('WP_IMPORTING') )
-		return;
+	if ( defined('WP_IMPORTING') ) {
+			return;
+	}
 
-	if ( get_option('default_pingback_flag') )
-		add_post_meta( $post_id, '_pingme', '1' );
+	if ( get_option('default_pingback_flag') ) {
+			add_post_meta( $post_id, '_pingme', '1' );
+	}
 	add_post_meta( $post_id, '_encloseme', '1' );
 
 	if ( ! wp_next_scheduled( 'do_pings' ) ) {
@@ -5953,8 +6106,9 @@ 
  */
 function wp_get_post_parent_id( $post_ID ) {
 	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
-		return false;
+	if ( !$post || is_wp_error( $post ) ) {
+			return false;
+	}
 	return (int) $post->post_parent;
 }
 
@@ -5974,28 +6128,35 @@ 
  */
 function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
-		return 0;
+	if ( !$post_parent ) {
+			return 0;
+	}
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
-		return $post_parent;
+	if ( empty( $post_ID ) ) {
+			return $post_parent;
+	}
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
-		return 0;
+	if ( $post_parent == $post_ID ) {
+			return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
-		return $post_parent; // No loop
+	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) ) {
+			return $post_parent;
+	}
+	// No loop
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
-		return 0;
+	if ( isset( $loop[$post_ID] ) ) {
+			return 0;
+	}
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach ( array_keys( $loop ) as $loop_member ) {
+			wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	}
 
 	return $post_parent;
 }
@@ -6013,10 +6174,11 @@ 
 	$post = get_post( $post );
 	$thumbnail_id = absint( $thumbnail_id );
 	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
-			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
-		else
-			return delete_post_meta( $post->ID, '_thumbnail_id' );
+		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) ) {
+					return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+		} else {
+					return delete_post_meta( $post->ID, '_thumbnail_id' );
+		}
 	}
 	return false;
 }
@@ -6031,8 +6193,9 @@ 
  */
 function delete_post_thumbnail( $post ) {
 	$post = get_post( $post );
-	if ( $post )
-		return delete_post_meta( $post->ID, '_thumbnail_id' );
+	if ( $post ) {
+			return delete_post_meta( $post->ID, '_thumbnail_id' );
+	}
 	return false;
 }
 

src/wp-includes/ms-blogs.php

Indentation +1 added lines, -1 removed lines

@@ -845,7 +845,7 @@
 		 *
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
- 		 */
+		 */
 		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
 	}
 

Braces +71 added lines, -48 removed lines

@@ -60,11 +60,13 @@ 
  */
 function get_blogaddress_by_name( $blogname ) {
 	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
-			$blogname = 'www';
+		if ( $blogname == 'main' ) {
+					$blogname = 'www';
+		}
 		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		if ( !empty( $blogname ) ) {
+					$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		}
 	} else {
 		$url = network_home_url( $blogname );
 	}
@@ -128,8 +130,9 @@ 
 		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
 			$key = md5( $fields['domain'] . $fields['path'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
@@ -145,8 +148,9 @@ 
 		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
 			$key = md5( $fields['domain'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
@@ -163,12 +167,13 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
-			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
-		else
-			$blog_id = $fields;
+		if ( ! $fields ) {
+					$blog_id = get_current_blog_id();
+		} elseif ( ! is_numeric( $fields ) ) {
+					$blog_id = get_id_from_blogname( $fields );
+		} else {
+					$blog_id = $fields;
+		}
 	}
 
 	$blog_id = (int) $blog_id;
@@ -305,15 +310,18 @@ 
 function update_blog_details( $blog_id, $details = array() ) {
 	global $wpdb;
 
-	if ( empty($details) )
-		return false;
+	if ( empty($details) ) {
+			return false;
+	}
 
-	if ( is_object($details) )
-		$details = get_object_vars($details);
+	if ( is_object($details) ) {
+			$details = get_object_vars($details);
+	}
 
 	$current_details = get_site( $blog_id );
-	if ( empty($current_details) )
-		return false;
+	if ( empty($current_details) ) {
+			return false;
+	}
 
 	$current_details = get_object_vars($current_details);
 
@@ -332,8 +340,9 @@ 
 
 	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	// If spam status changed, issue actions.
 	if ( $details['spam'] != $current_details['spam'] ) {
@@ -629,11 +638,13 @@ 
 function get_blog_option( $id, $option, $default = false ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if ( get_current_blog_id() == $id ) {
+			return get_option( $option, $default );
+	}
 
 	switch_to_blog( $id );
 	$value = get_option( $option, $default );
@@ -674,11 +685,13 @@ 
 function add_blog_option( $id, $option, $value ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return add_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = add_option( $option, $value );
@@ -699,11 +712,13 @@ 
 function delete_blog_option( $id, $option ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if ( get_current_blog_id() == $id ) {
+			return delete_option( $option );
+	}
 
 	switch_to_blog( $id );
 	$return = delete_option( $option );
@@ -726,11 +741,13 @@ 
 function update_blog_option( $id, $option, $value, $deprecated = null ) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return update_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = update_option( $option, $value );
@@ -965,16 +982,19 @@ 
 function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
-		return $value;
+	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) ) {
+			return $value;
+	}
 
 	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	refresh_blog_details( $blog_id );
 
@@ -1040,8 +1060,9 @@ 
 	global $wpdb;
 
 	$details = get_site( $id );
-	if ( $details )
-		return $details->$pref;
+	if ( $details ) {
+			return $details->$pref;
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
 }
@@ -1061,8 +1082,10 @@ 
 function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, 'MU' );
+	}
+	// never used
 
 	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
 }

Doc Comments +1 added lines, -1 removed lines

@@ -790,7 +790,7 @@
  *
  * @param int  $new_blog   The id of the blog you want to switch to. Default: current blog
  * @param bool $deprecated Deprecated argument
- * @return true Always returns True.
+ * @return boolean Always returns True.
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
 	global $wpdb, $wp_roles;

Spacing +287 added lines, -287 removed lines

@@ -18,7 +18,7 @@ 
 function wpmu_update_blogs_date() {
 	global $wpdb;
 
-	update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+	update_blog_details($wpdb->blogid, array('last_updated' => current_time('mysql', true)));
 	/**
 	 * Fires after the blog details are updated.
 	 *
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param int $blog_id Site ID.
 	 */
-	do_action( 'wpmu_blog_updated', $wpdb->blogid );
+	do_action('wpmu_blog_updated', $wpdb->blogid);
 }
 
 /**
@@ -37,17 +37,17 @@ 
  * @param int $blog_id Blog ID
  * @return string Full URL of the blog if found. Empty string if not.
  */
-function get_blogaddress_by_id( $blog_id ) {
-	$bloginfo = get_site( (int) $blog_id );
+function get_blogaddress_by_id($blog_id) {
+	$bloginfo = get_site((int) $blog_id);
 
-	if ( empty( $bloginfo ) ) {
+	if (empty($bloginfo)) {
 		return '';
 	}
 
-	$scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
-	$scheme = empty( $scheme ) ? 'http' : $scheme;
+	$scheme = parse_url($bloginfo->home, PHP_URL_SCHEME);
+	$scheme = empty($scheme) ? 'http' : $scheme;
 
-	return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
+	return esc_url($scheme.'://'.$bloginfo->domain.$bloginfo->path);
 }
 
 /**
@@ -58,17 +58,17 @@ 
  * @param string $blogname The (subdomain or directory) name
  * @return string
  */
-function get_blogaddress_by_name( $blogname ) {
-	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
+function get_blogaddress_by_name($blogname) {
+	if (is_subdomain_install()) {
+		if ($blogname == 'main')
 			$blogname = 'www';
-		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		$url = rtrim(network_home_url(), '/');
+		if ( ! empty($blogname))
+			$url = preg_replace('|^([^\.]+://)|', "\${1}".$blogname.'.', $url);
 	} else {
-		$url = network_home_url( $blogname );
+		$url = network_home_url($blogname);
 	}
-	return esc_url( $url . '/' );
+	return esc_url($url.'/');
 }
 
 /**
@@ -80,30 +80,30 @@ 
  * @param string $slug A site's slug.
  * @return int|null The site ID, or null if no site is found for the given slug.
  */
-function get_id_from_blogname( $slug ) {
+function get_id_from_blogname($slug) {
 	$current_network = get_network();
-	$slug = trim( $slug, '/' );
+	$slug = trim($slug, '/');
 
-	if ( is_subdomain_install() ) {
-		$domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
+	if (is_subdomain_install()) {
+		$domain = $slug.'.'.preg_replace('|^www\.|', '', $current_network->domain);
 		$path = $current_network->path;
 	} else {
 		$domain = $current_network->domain;
-		$path = $current_network->path . $slug . '/';
+		$path = $current_network->path.$slug.'/';
 	}
 
-	$site_ids = get_sites( array(
+	$site_ids = get_sites(array(
 		'number' => 1,
 		'fields' => 'ids',
 		'domain' => $domain,
 		'path' => $path,
-	) );
+	));
 
-	if ( empty( $site_ids ) ) {
+	if (empty($site_ids)) {
 		return null;
 	}
 
-	return array_shift( $site_ids );
+	return array_shift($site_ids);
 }
 
 /**
@@ -119,42 +119,42 @@ 
  *                                  Default is true.
  * @return WP_Site|false Blog details on success. False on failure.
  */
-function get_blog_details( $fields = null, $get_all = true ) {
+function get_blog_details($fields = null, $get_all = true) {
 	global $wpdb;
 
-	if ( is_array($fields ) ) {
-		if ( isset($fields['blog_id']) ) {
+	if (is_array($fields)) {
+		if (isset($fields['blog_id'])) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
-			$key = md5( $fields['domain'] . $fields['path'] );
+		} elseif (isset($fields['domain']) && isset($fields['path'])) {
+			$key = md5($fields['domain'].$fields['path']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
 			}
-		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
-			$key = md5( $fields['domain'] );
+		} elseif (isset($fields['domain']) && is_subdomain_install()) {
+			$key = md5($fields['domain']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
@@ -163,10 +163,10 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
+		if ( ! $fields)
 			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
+		elseif ( ! is_numeric($fields))
+			$blog_id = get_id_from_blogname($fields);
 		else
 			$blog_id = $fields;
 	}
@@ -174,15 +174,15 @@ 
 	$blog_id = (int) $blog_id;
 
 	$all = $get_all == true ? '' : 'short';
-	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
+	$details = wp_cache_get($blog_id.$all, 'blog-details');
 
-	if ( $details ) {
-		if ( ! is_object( $details ) ) {
-			if ( $details == -1 ) {
+	if ($details) {
+		if ( ! is_object($details)) {
+			if ($details == -1) {
 				return false;
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
-				wp_cache_delete( $blog_id . $all, 'blog-details' );
+				wp_cache_delete($blog_id.$all, 'blog-details');
 				unset($details);
 			}
 		} else {
@@ -191,18 +191,18 @@ 
 	}
 
 	// Try the other cache.
-	if ( $get_all ) {
-		$details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+	if ($get_all) {
+		$details = wp_cache_get($blog_id.'short', 'blog-details');
 	} else {
-		$details = wp_cache_get( $blog_id, 'blog-details' );
+		$details = wp_cache_get($blog_id, 'blog-details');
 		// If short was requested and full cache is set, we can return.
-		if ( $details ) {
-			if ( ! is_object( $details ) ) {
-				if ( $details == -1 ) {
+		if ($details) {
+			if ( ! is_object($details)) {
+				if ($details == -1) {
 					return false;
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
-					wp_cache_delete( $blog_id, 'blog-details' );
+					wp_cache_delete($blog_id, 'blog-details');
 					unset($details);
 				}
 			} else {
@@ -211,29 +211,29 @@ 
 		}
 	}
 
-	if ( empty($details) ) {
-		$details = WP_Site::get_instance( $blog_id );
-		if ( ! $details ) {
+	if (empty($details)) {
+		$details = WP_Site::get_instance($blog_id);
+		if ( ! $details) {
 			// Set the full cache.
-			wp_cache_set( $blog_id, -1, 'blog-details' );
+			wp_cache_set($blog_id, -1, 'blog-details');
 			return false;
 		}
 	}
 
-	if ( ! $details instanceof WP_Site ) {
-		$details = new WP_Site( $details );
+	if ( ! $details instanceof WP_Site) {
+		$details = new WP_Site($details);
 	}
 
-	if ( ! $get_all ) {
-		wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	if ( ! $get_all) {
+		wp_cache_set($blog_id.$all, $details, 'blog-details');
 		return $details;
 	}
 
-	switch_to_blog( $blog_id );
-	$details->blogname   = get_option( 'blogname' );
-	$details->siteurl    = get_option( 'siteurl' );
-	$details->post_count = get_option( 'post_count' );
-	$details->home       = get_option( 'home' );
+	switch_to_blog($blog_id);
+	$details->blogname   = get_option('blogname');
+	$details->siteurl    = get_option('siteurl');
+	$details->post_count = get_option('post_count');
+	$details->home       = get_option('home');
 	restore_current_blog();
 
 	/**
@@ -244,12 +244,12 @@ 
 	 *
 	 * @param object $details The blog details.
 	 */
-	$details = apply_filters_deprecated( 'blog_details', array( $details ), '4.7.0', 'site_details' );
+	$details = apply_filters_deprecated('blog_details', array($details), '4.7.0', 'site_details');
 
-	wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	wp_cache_set($blog_id.$all, $details, 'blog-details');
 
-	$key = md5( $details->domain . $details->path );
-	wp_cache_set( $key, $details, 'blog-lookup' );
+	$key = md5($details->domain.$details->path);
+	wp_cache_set($key, $details, 'blog-lookup');
 
 	return $details;
 }
@@ -261,14 +261,14 @@ 
  *
  * @param int $blog_id Optional. Blog ID. Defaults to current blog.
  */
-function refresh_blog_details( $blog_id = 0 ) {
+function refresh_blog_details($blog_id = 0) {
 	$blog_id = (int) $blog_id;
-	if ( ! $blog_id ) {
+	if ( ! $blog_id) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$details = get_site( $blog_id );
-	if ( ! $details ) {
+	$details = get_site($blog_id);
+	if ( ! $details) {
 		// Make sure clean_blog_cache() gets the blog ID
 		// when the blog has been previously cached as
 		// non-existent.
@@ -279,7 +279,7 @@ 
 		);
 	}
 
-	clean_blog_cache( $details );
+	clean_blog_cache($details);
 
 	/**
 	 * Fires after the blog details cache is cleared.
@@ -288,7 +288,7 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'refresh_blog_details', $blog_id );
+	do_action('refresh_blog_details', $blog_id);
 }
 
 /**
@@ -302,17 +302,17 @@ 
  * @param array $details Array of details keyed by blogs table field names.
  * @return bool True if update succeeds, false otherwise.
  */
-function update_blog_details( $blog_id, $details = array() ) {
+function update_blog_details($blog_id, $details = array()) {
 	global $wpdb;
 
-	if ( empty($details) )
+	if (empty($details))
 		return false;
 
-	if ( is_object($details) )
+	if (is_object($details))
 		$details = get_object_vars($details);
 
-	$current_details = get_site( $blog_id );
-	if ( empty($current_details) )
+	$current_details = get_site($blog_id);
+	if (empty($current_details))
 		return false;
 
 	$current_details = get_object_vars($current_details);
@@ -321,23 +321,23 @@ 
 	$details['last_updated'] = current_time('mysql', true);
 
 	$update_details = array();
-	$fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-	foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
-		if ( 'path' === $field ) {
-			$details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
+	$fields = array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+	foreach (array_intersect(array_keys($details), $fields) as $field) {
+		if ('path' === $field) {
+			$details[$field] = trailingslashit('/'.trim($details[$field], '/'));
 		}
 
-		$update_details[ $field ] = $details[ $field ];
+		$update_details[$field] = $details[$field];
 	}
 
-	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, $update_details, array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
 	// If spam status changed, issue actions.
-	if ( $details['spam'] != $current_details['spam'] ) {
-		if ( $details['spam'] == 1 ) {
+	if ($details['spam'] != $current_details['spam']) {
+		if ($details['spam'] == 1) {
 			/**
 			 * Fires when the 'spam' status is added to a blog.
 			 *
@@ -345,7 +345,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the 'spam' status is removed from a blog.
@@ -354,13 +354,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
 	}
 
 	// If mature status changed, issue actions.
-	if ( $details['mature'] != $current_details['mature'] ) {
-		if ( $details['mature'] == 1 ) {
+	if ($details['mature'] != $current_details['mature']) {
+		if ($details['mature'] == 1) {
 			/**
 			 * Fires when the 'mature' status is added to a blog.
 			 *
@@ -368,7 +368,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the 'mature' status is removed from a blog.
@@ -377,13 +377,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
 	}
 
 	// If archived status changed, issue actions.
-	if ( $details['archived'] != $current_details['archived'] ) {
-		if ( $details['archived'] == 1 ) {
+	if ($details['archived'] != $current_details['archived']) {
+		if ($details['archived'] == 1) {
 			/**
 			 * Fires when the 'archived' status is added to a blog.
 			 *
@@ -391,7 +391,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the 'archived' status is removed from a blog.
@@ -400,13 +400,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
 	}
 
 	// If deleted status changed, issue actions.
-	if ( $details['deleted'] != $current_details['deleted'] ) {
-		if ( $details['deleted'] == 1 ) {
+	if ($details['deleted'] != $current_details['deleted']) {
+		if ($details['deleted'] == 1) {
 			/**
 			 * Fires when the 'deleted' status is added to a blog.
 			 *
@@ -414,7 +414,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the 'deleted' status is removed from a blog.
@@ -423,13 +423,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
 	}
 
-	if ( isset( $details['public'] ) ) {
-		switch_to_blog( $blog_id );
-		update_option( 'blog_public', $details['public'] );
+	if (isset($details['public'])) {
+		switch_to_blog($blog_id);
+		update_option('blog_public', $details['public']);
 		restore_current_blog();
 	}
 
@@ -447,24 +447,24 @@ 
  *
  * @param WP_Site $blog The site object to be cleared from cache.
  */
-function clean_blog_cache( $blog ) {
+function clean_blog_cache($blog) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
 	$blog_id = $blog->blog_id;
-	$domain_path_key = md5( $blog->domain . $blog->path );
+	$domain_path_key = md5($blog->domain.$blog->path);
 
-	wp_cache_delete( $blog_id, 'sites' );
-	wp_cache_delete( $blog_id, 'site-details' );
-	wp_cache_delete( $blog_id, 'blog-details' );
-	wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-	wp_cache_delete( $domain_path_key, 'blog-lookup' );
-	wp_cache_delete( $domain_path_key, 'blog-id-cache' );
-	wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
-	wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
+	wp_cache_delete($blog_id, 'sites');
+	wp_cache_delete($blog_id, 'site-details');
+	wp_cache_delete($blog_id, 'blog-details');
+	wp_cache_delete($blog_id.'short', 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-lookup');
+	wp_cache_delete($domain_path_key, 'blog-id-cache');
+	wp_cache_delete('current_blog_'.$blog->domain, 'site-options');
+	wp_cache_delete('current_blog_'.$blog->domain.$blog->path, 'site-options');
 
 	/**
 	 * Fires immediately after a site has been removed from the object cache.
@@ -475,9 +475,9 @@ 
 	 * @param WP_Site $blog            Site object.
 	 * @param string  $domain_path_key md5 hash of domain and path.
 	 */
-	do_action( 'clean_site_cache', $blog_id, $blog, $domain_path_key );
+	do_action('clean_site_cache', $blog_id, $blog, $domain_path_key);
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set('last_changed', microtime(), 'sites');
 }
 
 /**
@@ -487,14 +487,14 @@ 
  *
  * @param int $site_id Optional. Site ID. Default is the current site ID.
  */
-function clean_site_details_cache( $site_id = 0 ) {
+function clean_site_details_cache($site_id = 0) {
 	$site_id = (int) $site_id;
-	if ( ! $site_id ) {
+	if ( ! $site_id) {
 		$site_id = get_current_blog_id();
 	}
 
-	wp_cache_delete( $site_id, 'site-details' );
-	wp_cache_delete( $site_id, 'blog-details' );
+	wp_cache_delete($site_id, 'site-details');
+	wp_cache_delete($site_id, 'blog-details');
 }
 
 /**
@@ -508,20 +508,20 @@ 
  * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
  * @return WP_Site|null The site object or null if not found.
  */
-function get_site( $site = null ) {
-	if ( empty( $site ) ) {
+function get_site($site = null) {
+	if (empty($site)) {
 		$site = get_current_blog_id();
 	}
 
-	if ( $site instanceof WP_Site ) {
+	if ($site instanceof WP_Site) {
 		$_site = $site;
-	} elseif ( is_object( $site ) ) {
-		$_site = new WP_Site( $site );
+	} elseif (is_object($site)) {
+		$_site = new WP_Site($site);
 	} else {
-		$_site = WP_Site::get_instance( $site );
+		$_site = WP_Site::get_instance($site);
 	}
 
-	if ( ! $_site ) {
+	if ( ! $_site) {
 		return null;
 	}
 
@@ -532,7 +532,7 @@ 
 	 *
 	 * @param WP_Site $_site Site data.
 	 */
-	$_site = apply_filters( 'get_site', $_site );
+	$_site = apply_filters('get_site', $_site);
 
 	return $_site;
 }
@@ -548,14 +548,14 @@ 
  *
  * @param array $ids ID list.
  */
-function _prime_site_caches( $ids ) {
+function _prime_site_caches($ids) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
-	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($ids, 'sites');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_sites = $wpdb->get_results(sprintf("SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_site_cache( $fresh_sites );
+		update_site_cache($fresh_sites);
 	}
 }
 
@@ -566,14 +566,14 @@ 
  *
  * @param array $sites Array of site objects.
  */
-function update_site_cache( $sites ) {
-	if ( ! $sites ) {
+function update_site_cache($sites) {
+	if ( ! $sites) {
 		return;
 	}
 
-	foreach ( $sites as $site ) {
-		wp_cache_add( $site->blog_id, $site, 'sites' );
-		wp_cache_add( $site->blog_id . 'short', $site, 'blog-details' );
+	foreach ($sites as $site) {
+		wp_cache_add($site->blog_id, $site, 'sites');
+		wp_cache_add($site->blog_id.'short', $site, 'blog-details');
 	}
 }
 
@@ -632,10 +632,10 @@ 
  * }
  * @return array List of sites.
  */
-function get_sites( $args = array() ) {
+function get_sites($args = array()) {
 	$query = new WP_Site_Query();
 
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -655,17 +655,17 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_blog_option( $id, $option, $default = false ) {
+function get_blog_option($id, $option, $default = false) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if (get_current_blog_id() == $id)
+		return get_option($option, $default);
 
-	switch_to_blog( $id );
-	$value = get_option( $option, $default );
+	switch_to_blog($id);
+	$value = get_option($option, $default);
 	restore_current_blog();
 
 	/**
@@ -678,7 +678,7 @@ 
 	 * @param string  $value The option value.
 	 * @param int     $id    Blog ID.
 	 */
-	return apply_filters( "blog_option_{$option}", $value, $id );
+	return apply_filters("blog_option_{$option}", $value, $id);
 }
 
 /**
@@ -700,17 +700,17 @@ 
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_blog_option( $id, $option, $value ) {
+function add_blog_option($id, $option, $value) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return add_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = add_option( $option, $value );
+	switch_to_blog($id);
+	$return = add_option($option, $value);
 	restore_current_blog();
 
 	return $return;
@@ -725,17 +725,17 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_blog_option( $id, $option ) {
+function delete_blog_option($id, $option) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if (get_current_blog_id() == $id)
+		return delete_option($option);
 
-	switch_to_blog( $id );
-	$return = delete_option( $option );
+	switch_to_blog($id);
+	$return = delete_option($option);
 	restore_current_blog();
 
 	return $return;
@@ -752,17 +752,17 @@ 
  * @param mixed  $deprecated Not used.
  * @return bool True on success, false on failure.
  */
-function update_blog_option( $id, $option, $value, $deprecated = null ) {
+function update_blog_option($id, $option, $value, $deprecated = null) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1.0');
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return update_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = update_option( $option, $value );
+	switch_to_blog($id);
+	$return = update_option($option, $value);
 	restore_current_blog();
 
 	return $return;
@@ -792,11 +792,11 @@ 
  * @param bool $deprecated Deprecated argument
  * @return true Always returns True.
  */
-function switch_to_blog( $new_blog, $deprecated = null ) {
+function switch_to_blog($new_blog, $deprecated = null) {
 	global $wpdb, $wp_roles;
 
 	$blog_id = get_current_blog_id();
-	if ( empty( $new_blog ) ) {
+	if (empty($new_blog)) {
 		$new_blog = $blog_id;
 	}
 
@@ -807,7 +807,7 @@ 
 	 * set the right vars, do the associated actions, but skip
 	 * the extra unnecessary work
 	 */
-	if ( $new_blog == $blog_id ) {
+	if ($new_blog == $blog_id) {
 		/**
 		 * Fires when the blog is switched.
 		 *
@@ -816,46 +816,46 @@ 
 		 * @param int $new_blog New blog ID.
 		 * @param int $new_blog Blog ID.
 		 */
-		do_action( 'switch_blog', $new_blog, $new_blog );
+		do_action('switch_blog', $new_blog, $new_blog);
 		$GLOBALS['switched'] = true;
 		return true;
 	}
 
-	$wpdb->set_blog_id( $new_blog );
+	$wpdb->set_blog_id($new_blog);
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 	$prev_blog_id = $blog_id;
 	$GLOBALS['blog_id'] = $new_blog;
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $new_blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($new_blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups)) {
 			$global_groups = $wp_object_cache->global_groups;
 		} else {
 			$global_groups = false;
 		}
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		$wp_roles = new WP_Roles();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $new_blog );
+		$current_user->for_blog($new_blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $new_blog, $prev_blog_id );
+	do_action('switch_blog', $new_blog, $prev_blog_id);
 	$GLOBALS['switched'] = true;
 
 	return true;
@@ -879,32 +879,32 @@ 
 function restore_current_blog() {
 	global $wpdb, $wp_roles;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
+	if (empty($GLOBALS['_wp_switched_stack'])) {
 		return false;
 	}
 
-	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+	$blog = array_pop($GLOBALS['_wp_switched_stack']);
 	$blog_id = get_current_blog_id();
 
-	if ( $blog_id == $blog ) {
+	if ($blog_id == $blog) {
 		/** This filter is documented in wp-includes/ms-blogs.php */
-		do_action( 'switch_blog', $blog, $blog );
+		do_action('switch_blog', $blog, $blog);
 		// If we still have items in the switched stack, consider ourselves still 'switched'
-		$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+		$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 		return true;
 	}
 
-	$wpdb->set_blog_id( $blog );
+	$wpdb->set_blog_id($blog);
 	$prev_blog_id = $blog_id;
 	$GLOBALS['blog_id'] = $blog;
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups)) {
 			$global_groups = $wp_object_cache->global_groups;
 		} else {
 			$global_groups = false;
@@ -912,27 +912,27 @@ 
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		$wp_roles = new WP_Roles();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $blog );
+		$current_user->for_blog($blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $blog, $prev_blog_id );
+	do_action('switch_blog', $blog, $prev_blog_id);
 
 	// If we still have items in the switched stack, consider ourselves still 'switched'
-	$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+	$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 
 	return true;
 }
@@ -947,7 +947,7 @@ 
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-	return ! empty( $GLOBALS['_wp_switched_stack'] );
+	return ! empty($GLOBALS['_wp_switched_stack']);
 }
 
 /**
@@ -958,7 +958,7 @@ 
  * @param int $id The blog id
  * @return string Whether the blog is archived or not
  */
-function is_archived( $id ) {
+function is_archived($id) {
 	return get_blog_status($id, 'archived');
 }
 
@@ -971,7 +971,7 @@ 
  * @param string $archived The new status
  * @return string $archived
  */
-function update_archived( $id, $archived ) {
+function update_archived($id, $archived) {
 	update_blog_status($id, 'archived', $archived);
 	return $archived;
 }
@@ -989,55 +989,55 @@ 
  * @param null   $deprecated
  * @return string|false $value
  */
-function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
+function update_blog_status($blog_id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1.0');
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+	if ( ! in_array($pref, array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
 		return $value;
 
-	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
-	if ( 'spam' == $pref ) {
-		if ( $value == 1 ) {
+	if ('spam' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
-	} elseif ( 'mature' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('mature' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
-	} elseif ( 'archived' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('archived' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
-	} elseif ( 'deleted' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('deleted' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
-	} elseif ( 'public' == $pref ) {
+	} elseif ('public' == $pref) {
 		/**
 		 * Fires after the current blog's 'public' setting is updated.
 		 *
@@ -1046,7 +1046,7 @@ 
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
  		 */
-		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
+		do_action('update_blog_public', $blog_id, $value); // Moved here from update_blog_public().
 	}
 
 	return $value;
@@ -1063,14 +1063,14 @@ 
  * @param string $pref A field name
  * @return bool|string|null $value
  */
-function get_blog_status( $id, $pref ) {
+function get_blog_status($id, $pref) {
 	global $wpdb;
 
-	$details = get_site( $id );
-	if ( $details )
+	$details = get_site($id);
+	if ($details)
 		return $details->$pref;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+	return $wpdb->get_var($wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id));
 }
 
 /**
@@ -1085,13 +1085,13 @@ 
  * @param int   $quantity   The maximum number of blogs to retrieve. Default is 40.
  * @return array The list of blogs
  */
-function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
+function get_last_updated($deprecated = '', $start = 0, $quantity = 40) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, 'MU'); // never used
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+	return $wpdb->get_results($wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity), ARRAY_A);
 }
 
 /**
@@ -1103,10 +1103,10 @@ 
  *                           for information on accepted arguments. Default empty array.
  * @return int|array List of networks or number of found networks if `$count` argument is true.
  */
-function get_networks( $args = array() ) {
+function get_networks($args = array()) {
 	$query = new WP_Network_Query();
 
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -1122,21 +1122,21 @@ 
  * @param WP_Network|int|null $network Optional. Network to retrieve. Default is the current network.
  * @return WP_Network|null The network object or null if not found.
  */
-function get_network( $network = null ) {
+function get_network($network = null) {
 	global $current_site;
-	if ( empty( $network ) && isset( $current_site ) ) {
+	if (empty($network) && isset($current_site)) {
 		$network = $current_site;
 	}
 
-	if ( $network instanceof WP_Network ) {
+	if ($network instanceof WP_Network) {
 		$_network = $network;
-	} elseif ( is_object( $network ) ) {
-		$_network = new WP_Network( $network );
+	} elseif (is_object($network)) {
+		$_network = new WP_Network($network);
 	} else {
-		$_network = WP_Network::get_instance( $network );
+		$_network = WP_Network::get_instance($network);
 	}
 
-	if ( ! $_network ) {
+	if ( ! $_network) {
 		return null;
 	}
 
@@ -1147,7 +1147,7 @@ 
 	 *
 	 * @param WP_Network $_network Network data.
 	 */
-	$_network = apply_filters( 'get_network', $_network );
+	$_network = apply_filters('get_network', $_network);
 
 	return $_network;
 }
@@ -1161,15 +1161,15 @@ 
  *
  * @param int|array $ids Network ID or an array of network IDs to remove from cache.
  */
-function clean_network_cache( $ids ) {
+function clean_network_cache($ids) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
-	foreach ( (array) $ids as $id ) {
-		wp_cache_delete( $id, 'networks' );
+	foreach ((array) $ids as $id) {
+		wp_cache_delete($id, 'networks');
 
 		/**
 		 * Fires immediately after a network has been removed from the object cache.
@@ -1178,10 +1178,10 @@ 
 		 *
 		 * @param int $id Network ID.
 		 */
-		do_action( 'clean_network_cache', $id );
+		do_action('clean_network_cache', $id);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'networks' );
+	wp_cache_set('last_changed', microtime(), 'networks');
 }
 
 /**
@@ -1195,9 +1195,9 @@ 
  *
  * @param array $networks Array of network row objects.
  */
-function update_network_cache( $networks ) {
-	foreach ( (array) $networks as $network ) {
-		wp_cache_add( $network->id, $network, 'networks' );
+function update_network_cache($networks) {
+	foreach ((array) $networks as $network) {
+		wp_cache_add($network->id, $network, 'networks');
 	}
 }
 
@@ -1212,14 +1212,14 @@ 
  *
  * @param array $network_ids Array of network IDs.
  */
-function _prime_network_caches( $network_ids ) {
+function _prime_network_caches($network_ids) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($network_ids, 'networks');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_networks = $wpdb->get_results(sprintf("SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_network_cache( $fresh_networks );
+		update_network_cache($fresh_networks);
 	}
 }
 
@@ -1232,13 +1232,13 @@ 
  * @param string $old_status The old post status
  * @param object $post       Post object
  */
-function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+function _update_blog_date_on_post_publish($new_status, $old_status, $post) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $new_status && 'publish' != $old_status ) {
+	if ('publish' != $new_status && 'publish' != $old_status) {
 		return;
 	}
 
@@ -1254,15 +1254,15 @@ 
  *
  * @param int $post_id Post ID
  */
-function _update_blog_date_on_post_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_blog_date_on_post_delete($post_id) {
+	$post = get_post($post_id);
 
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $post->post_status ) {
+	if ('publish' != $post->post_status) {
 		return;
 	}
 
@@ -1276,10 +1276,10 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _update_posts_count_on_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_posts_count_on_delete($post_id) {
+	$post = get_post($post_id);
 
-	if ( ! $post || 'publish' !== $post->post_status ) {
+	if ( ! $post || 'publish' !== $post->post_status) {
 		return;
 	}
 
@@ -1294,12 +1294,12 @@ 
  * @param string $new_status The status the post is changing to.
  * @param string $old_status The status the post is changing from.
  */
-function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
-	if ( $new_status === $old_status ) {
+function _update_posts_count_on_transition_post_status($new_status, $old_status) {
+	if ($new_status === $old_status) {
 		return;
 	}
 
-	if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+	if ('publish' !== $new_status && 'publish' !== $old_status) {
 		return;
 	}
 

src/wp-includes/ms-files.php

Braces +11 added lines, -6 removed lines

@@ -11,8 +11,9 @@ 
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( !is_multisite() )
+if ( !is_multisite() ) {
 	die( 'Multisite support not enabled' );
+}
 
 ms_file_constants();
 
@@ -30,17 +31,20 @@ 
 }
 
 $mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
+if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) {
 	$mime[ 'type' ] = mime_content_type( $file );
+}
 
-if ( $mime[ 'type' ] )
+if ( $mime[ 'type' ] ) {
 	$mimetype = $mime[ 'type' ];
-else
+} else {
 	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+}
 
 header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
+if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
 	header( 'Content-Length: ' . filesize( $file ) );
+}
 
 // Optional support for X-Sendfile and X-Accel-Redirect
 if ( WPMU_ACCEL_REDIRECT ) {
@@ -60,8 +64,9 @@ 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+}
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 // If string is empty, return 0. If not, attempt to parse into a timestamp

Spacing +39 added lines, -39 removed lines

@@ -8,76 +8,76 @@
  * @subpackage Multisite
  */
 
-define( 'SHORTINIT', true );
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+define('SHORTINIT', true);
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( !is_multisite() )
-	die( 'Multisite support not enabled' );
+if ( ! is_multisite())
+	die('Multisite support not enabled');
 
 ms_file_constants();
 
-error_reporting( 0 );
+error_reporting(0);
 
-if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+if ($current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1') {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
-if ( !is_file( $file ) ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+$file = rtrim(BLOGUPLOADDIR, '/').'/'.str_replace('..', '', $_GET['file']);
+if ( ! is_file($file)) {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-	$mime[ 'type' ] = mime_content_type( $file );
+$mime = wp_check_filetype($file);
+if (false === $mime['type'] && function_exists('mime_content_type'))
+	$mime['type'] = mime_content_type($file);
 
-if ( $mime[ 'type' ] )
-	$mimetype = $mime[ 'type' ];
+if ($mime['type'])
+	$mimetype = $mime['type'];
 else
-	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+	$mimetype = 'image/'.substr($file, strrpos($file, '.') + 1);
 
-header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
-	header( 'Content-Length: ' . filesize( $file ) );
+header('Content-Type: '.$mimetype); // always send this
+if (false === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS'))
+	header('Content-Length: '.filesize($file));
 
 // Optional support for X-Sendfile and X-Accel-Redirect
-if ( WPMU_ACCEL_REDIRECT ) {
-	header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) );
+if (WPMU_ACCEL_REDIRECT) {
+	header('X-Accel-Redirect: '.str_replace(WP_CONTENT_DIR, '', $file));
 	exit;
-} elseif ( WPMU_SENDFILE ) {
-	header( 'X-Sendfile: ' . $file );
+} elseif (WPMU_SENDFILE) {
+	header('X-Sendfile: '.$file);
 	exit;
 }
 
-$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag = '"' . md5( $last_modified ) . '"';
-header( "Last-Modified: $last_modified GMT" );
-header( 'ETag: ' . $etag );
-header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
+$last_modified = gmdate('D, d M Y H:i:s', filemtime($file));
+$etag = '"'.md5($last_modified).'"';
+header("Last-Modified: $last_modified GMT");
+header('ETag: '.$etag);
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 100000000).' GMT');
 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
-$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
+$client_etag = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
 
-$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
+$client_last_modified = trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 // If string is empty, return 0. If not, attempt to parse into a timestamp
-$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
+$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
 
 // Make a timestamp for our most recent modification...
 $modified_timestamp = strtotime($last_modified);
 
-if ( ( $client_last_modified && $client_etag )
-	? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-	: ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+if (($client_last_modified && $client_etag)
+	? (($client_modified_timestamp >= $modified_timestamp) && ($client_etag == $etag))
+	: (($client_modified_timestamp >= $modified_timestamp) || ($client_etag == $etag))
 	) {
-	status_header( 304 );
+	status_header(304);
 	exit;
 }
 
 // If we made it this far, just serve the file
-readfile( $file );
+readfile($file);
 flush();

src/wp-includes/compat.php

Braces +15 added lines, -10 removed lines

@@ -161,13 +161,15 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
-		return false;
+	if ( !isset($packs[$algo]) ) {
+			return false;
+	}
 
 	$pack = $packs[$algo];
 
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
+	if (strlen($key) > 64) {
+			$key = pack($pack, $algo($key));
+	}
 
 	$key = str_pad($key, 64, chr(0));
 
@@ -176,8 +178,9 @@ 
 
 	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ( $raw_output ) {
+			return pack( $pack, $hmac );
+	}
 	return $hmac;
 }
 
@@ -210,8 +213,9 @@ 
 		}
 
 		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		if ( $assoc_array ) {
+					$res = _json_decode_object_helper( $res );
+		}
 		return $res;
 	}
 
@@ -220,8 +224,9 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
+		if ( is_object($data) ) {
+					$data = get_object_vars($data);
+		}
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }

Doc Comments +5 added lines, -1 removed lines

@@ -8,6 +8,10 @@ 
 
 // If gettext isn't available
 if ( !function_exists('_') ) {
+
+	/**
+	 * @param string $string
+	 */
 	function _($string) {
 		return $string;
 	}
@@ -366,7 +370,7 @@ 
 	 *
 	 * @internal This is a compatibility function for PHP <5.5
 	 *
-	 * @return bool|string Returns the error message on success, "No Error" if no error has occurred,
+	 * @return false|string Returns the error message on success, "No Error" if no error has occurred,
 	 *                     or false on failure.
 	 */
 	function json_last_error_msg() {

Indentation +2 added lines, -2 removed lines

@@ -472,8 +472,8 @@
 
 				foreach ( array_keys( $head ) as $key ) {
 					if ( isset( $key, $bref ) &&
-					     isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
-					     isset( $head[ $key ] ) && is_array( $head[ $key ] )
+						 isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
+						 isset( $head[ $key ] ) && is_array( $head[ $key ] )
 					) {
 						$bref_stack[] = &$bref[ $key ];
 						$head_stack[] = $head[ $key ];

Spacing +112 added lines, -112 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // If gettext isn't available
-if ( !function_exists('_') ) {
+if ( ! function_exists('_')) {
 	function _($string) {
 		return $string;
 	}
@@ -27,21 +27,21 @@ 
  *             false  : Used for testing - return false for future calls to this function
  *             'reset': Used for testing - restore default behavior of this function
  */
-function _wp_can_use_pcre_u( $set = null ) {
+function _wp_can_use_pcre_u($set = null) {
 	static $utf8_pcre = 'reset';
 
-	if ( null !== $set ) {
+	if (null !== $set) {
 		$utf8_pcre = $set;
 	}
 
-	if ( 'reset' === $utf8_pcre ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ('reset' === $utf8_pcre) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 
 	return $utf8_pcre;
 }
 
-if ( ! function_exists( 'mb_substr' ) ) :
+if ( ! function_exists('mb_substr')) :
 	/**
 	 * Compat function to mimic mb_substr().
 	 *
@@ -57,8 +57,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return string Extracted substring.
 	 */
-	function mb_substr( $str, $start, $length = null, $encoding = null ) {
-		return _mb_substr( $str, $start, $length, $encoding );
+	function mb_substr($str, $start, $length = null, $encoding = null) {
+		return _mb_substr($str, $start, $length, $encoding);
 	}
 endif;
 
@@ -79,24 +79,24 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return string Extracted substring.
  */
-function _mb_substr( $str, $start, $length = null, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_substr($str, $start, $length = null, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different
 	 * charset just use built-in substr().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return is_null($length) ? substr($str, $start) : substr($str, $start, $length);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		$chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-		return implode( '', $chars );
+		preg_match_all('/./us', $str, $match);
+		$chars = is_null($length) ? array_slice($match[0], $start) : array_slice($match[0], $start, $length);
+		return implode('', $chars);
 	}
 
 	$regex = '/(
@@ -112,26 +112,26 @@ 
 	)/x';
 
 	// Start with 1 element instead of 0 since the first thing we do is pop.
-	$chars = array( '' );
+	$chars = array('');
 	do {
 		// We had some string left over from the last round, but we counted it in that last round.
-		array_pop( $chars );
+		array_pop($chars);
 
 		/*
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+		$pieces = preg_split($regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		$chars = array_merge( $chars, $pieces );
+		$chars = array_merge($chars, $pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) );
+	} while (count($pieces) > 1 && $str = array_pop($pieces));
 
-	return join( '', array_slice( $chars, $start, $length ) );
+	return join('', array_slice($chars, $start, $length));
 }
 
-if ( ! function_exists( 'mb_strlen' ) ) :
+if ( ! function_exists('mb_strlen')) :
 	/**
 	 * Compat function to mimic mb_strlen().
 	 *
@@ -144,8 +144,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return int String length of `$str`.
 	 */
-	function mb_strlen( $str, $encoding = null ) {
-		return _mb_strlen( $str, $encoding );
+	function mb_strlen($str, $encoding = null) {
+		return _mb_strlen($str, $encoding);
 	}
 endif;
 
@@ -163,23 +163,23 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return int String length of `$str`.
  */
-function _mb_strlen( $str, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_strlen($str, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different charset
 	 * just use built-in strlen().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return strlen( $str );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return strlen($str);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		return count( $match[0] );
+		preg_match_all('/./us', $str, $match);
+		return count($match[0]);
 	}
 
 	$regex = '/(?:
@@ -204,19 +204,19 @@ 
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000 );
+		$pieces = preg_split($regex, $str, 1000);
 
 		// Increment.
-		$count += count( $pieces );
+		$count += count($pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( $str = array_pop( $pieces ) );
+	} while ($str = array_pop($pieces));
 
 	// Fencepost: preg_split() always returns one extra item in the array.
 	return --$count;
 }
 
-if ( !function_exists('hash_hmac') ):
+if ( ! function_exists('hash_hmac')):
 /**
  * Compat function to mimic hash_hmac().
  *
@@ -255,7 +255,7 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
+	if ( ! isset($packs[$algo]))
 		return false;
 
 	$pack = $packs[$algo];
@@ -268,44 +268,44 @@ 
 	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
 	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
 
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+	$hmac = $algo($opad.pack($pack, $algo($ipad.$data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ($raw_output)
+		return pack($pack, $hmac);
 	return $hmac;
 }
 
-if ( !function_exists('json_encode') ) {
-	function json_encode( $string ) {
+if ( ! function_exists('json_encode')) {
+	function json_encode($string) {
 		global $wp_json;
 
-		if ( ! ( $wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		return $wp_json->encodeUnsafe( $string );
+		return $wp_json->encodeUnsafe($string);
 	}
 }
 
-if ( !function_exists('json_decode') ) {
+if ( ! function_exists('json_decode')) {
 	/**
 	 * @global Services_JSON $wp_json
 	 * @param string $string
 	 * @param bool   $assoc_array
 	 * @return object|array
 	 */
-	function json_decode( $string, $assoc_array = false ) {
+	function json_decode($string, $assoc_array = false) {
 		global $wp_json;
 
-		if ( ! ($wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		$res = $wp_json->decode($string);
+		if ($assoc_array)
+			$res = _json_decode_object_helper($res);
 		return $res;
 	}
 
@@ -314,13 +314,13 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
+		if (is_object($data))
 			$data = get_object_vars($data);
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }
 
-if ( ! function_exists( 'hash_equals' ) ) :
+if ( ! function_exists('hash_equals')) :
 /**
  * Timing attack safe string comparison
  *
@@ -336,16 +336,16 @@ 
  * @param string $b Actual, user supplied, string.
  * @return bool Whether strings are equal.
  */
-function hash_equals( $a, $b ) {
-	$a_length = strlen( $a );
-	if ( $a_length !== strlen( $b ) ) {
+function hash_equals($a, $b) {
+	$a_length = strlen($a);
+	if ($a_length !== strlen($b)) {
 		return false;
 	}
 	$result = 0;
 
 	// Do not attempt to "optimize" this.
-	for ( $i = 0; $i < $a_length; $i++ ) {
-		$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+	for ($i = 0; $i < $a_length; $i++) {
+		$result |= ord($a[$i]) ^ ord($b[$i]);
 	}
 
 	return $result === 0;
@@ -354,11 +354,11 @@ 
 
 // JSON_PRETTY_PRINT was introduced in PHP 5.4
 // Defined here to prevent a notice when using it with wp_json_encode()
-if ( ! defined( 'JSON_PRETTY_PRINT' ) ) {
-	define( 'JSON_PRETTY_PRINT', 128 );
+if ( ! defined('JSON_PRETTY_PRINT')) {
+	define('JSON_PRETTY_PRINT', 128);
 }
 
-if ( ! function_exists( 'json_last_error_msg' ) ) :
+if ( ! function_exists('json_last_error_msg')) :
 	/**
 	 * Retrieves the error string of the last json_encode() or json_decode() call.
 	 *
@@ -371,41 +371,41 @@ 
 	 */
 	function json_last_error_msg() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
 		// Just in case JSON_ERROR_NONE is not defined.
-		$error_code_none = defined( 'JSON_ERROR_NONE' ) ? JSON_ERROR_NONE : 0;
+		$error_code_none = defined('JSON_ERROR_NONE') ? JSON_ERROR_NONE : 0;
 
-		switch ( true ) {
+		switch (true) {
 			case $last_error_code === $error_code_none:
 				return 'No error';
 
-			case defined( 'JSON_ERROR_DEPTH' ) && JSON_ERROR_DEPTH === $last_error_code:
+			case defined('JSON_ERROR_DEPTH') && JSON_ERROR_DEPTH === $last_error_code:
 				return 'Maximum stack depth exceeded';
 
-			case defined( 'JSON_ERROR_STATE_MISMATCH' ) && JSON_ERROR_STATE_MISMATCH === $last_error_code:
+			case defined('JSON_ERROR_STATE_MISMATCH') && JSON_ERROR_STATE_MISMATCH === $last_error_code:
 				return 'State mismatch (invalid or malformed JSON)';
 
-			case defined( 'JSON_ERROR_CTRL_CHAR' ) && JSON_ERROR_CTRL_CHAR === $last_error_code:
+			case defined('JSON_ERROR_CTRL_CHAR') && JSON_ERROR_CTRL_CHAR === $last_error_code:
 				return 'Control character error, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_SYNTAX' ) && JSON_ERROR_SYNTAX === $last_error_code:
+			case defined('JSON_ERROR_SYNTAX') && JSON_ERROR_SYNTAX === $last_error_code:
 				return 'Syntax error';
 
-			case defined( 'JSON_ERROR_UTF8' ) && JSON_ERROR_UTF8 === $last_error_code:
+			case defined('JSON_ERROR_UTF8') && JSON_ERROR_UTF8 === $last_error_code:
 				return 'Malformed UTF-8 characters, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_RECURSION' ) && JSON_ERROR_RECURSION === $last_error_code:
+			case defined('JSON_ERROR_RECURSION') && JSON_ERROR_RECURSION === $last_error_code:
 				return 'Recursion detected';
 
-			case defined( 'JSON_ERROR_INF_OR_NAN' ) && JSON_ERROR_INF_OR_NAN === $last_error_code:
+			case defined('JSON_ERROR_INF_OR_NAN') && JSON_ERROR_INF_OR_NAN === $last_error_code:
 				return 'Inf and NaN cannot be JSON encoded';
 
-			case defined( 'JSON_ERROR_UNSUPPORTED_TYPE' ) && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
+			case defined('JSON_ERROR_UNSUPPORTED_TYPE') && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
 				return 'Type is not supported';
 
 			default:
@@ -414,8 +414,8 @@ 
 	}
 endif;
 
-if ( ! interface_exists( 'JsonSerializable' ) ) {
-	define( 'WP_JSON_SERIALIZE_COMPATIBLE', true );
+if ( ! interface_exists('JsonSerializable')) {
+	define('WP_JSON_SERIALIZE_COMPATIBLE', true);
 	/**
 	 * JsonSerializable interface.
 	 *
@@ -431,11 +431,11 @@ 
 }
 
 // random_int was introduced in PHP 7.0
-if ( ! function_exists( 'random_int' ) ) {
-	require ABSPATH . WPINC . '/random_compat/random.php';
+if ( ! function_exists('random_int')) {
+	require ABSPATH.WPINC.'/random_compat/random.php';
 }
 
-if ( ! function_exists( 'array_replace_recursive' ) ) :
+if ( ! function_exists('array_replace_recursive')) :
 	/**
 	 * PHP-agnostic version of {@link array_replace_recursive()}.
 	 *
@@ -457,31 +457,31 @@ 
 	 *
 	 * @return array
 	 */
-	function array_replace_recursive( $base = array(), $replacements = array() ) {
-		foreach ( array_slice( func_get_args(), 1 ) as $replacements ) {
-			$bref_stack = array( &$base );
-			$head_stack = array( $replacements );
+	function array_replace_recursive($base = array(), $replacements = array()) {
+		foreach (array_slice(func_get_args(), 1) as $replacements) {
+			$bref_stack = array(&$base);
+			$head_stack = array($replacements);
 
 			do {
-				end( $bref_stack );
+				end($bref_stack);
 
-				$bref = &$bref_stack[ key( $bref_stack ) ];
-				$head = array_pop( $head_stack );
+				$bref = &$bref_stack[key($bref_stack)];
+				$head = array_pop($head_stack);
 
-				unset( $bref_stack[ key( $bref_stack ) ] );
+				unset($bref_stack[key($bref_stack)]);
 
-				foreach ( array_keys( $head ) as $key ) {
-					if ( isset( $key, $bref ) &&
-					     isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
-					     isset( $head[ $key ] ) && is_array( $head[ $key ] )
+				foreach (array_keys($head) as $key) {
+					if (isset($key, $bref) &&
+					     isset($bref[$key]) && is_array($bref[$key]) &&
+					     isset($head[$key]) && is_array($head[$key])
 					) {
-						$bref_stack[] = &$bref[ $key ];
-						$head_stack[] = $head[ $key ];
+						$bref_stack[] = &$bref[$key];
+						$head_stack[] = $head[$key];
 					} else {
-						$bref[ $key ] = $head[ $key ];
+						$bref[$key] = $head[$key];
 					}
 				}
-			} while ( count( $head_stack ) );
+			} while (count($head_stack));
 		}
 
 		return $base;
@@ -489,7 +489,7 @@ 
 endif;
 
 // SPL can be disabled on PHP 5.2
-if ( ! function_exists( 'spl_autoload_register' ) ):
+if ( ! function_exists('spl_autoload_register')):
 	$_wp_spl_autoloaders = array();
 
 	/**
@@ -499,18 +499,18 @@ 
 	 *
 	 * @param string $classname Class to attempt autoloading.
 	 */
-	function __autoload( $classname ) {
+	function __autoload($classname) {
 		global $_wp_spl_autoloaders;
-		foreach ( $_wp_spl_autoloaders as $autoloader ) {
-			if ( ! is_callable( $autoloader ) ) {
+		foreach ($_wp_spl_autoloaders as $autoloader) {
+			if ( ! is_callable($autoloader)) {
 				// Avoid the extra warning if the autoloader isn't callable.
 				continue;
 			}
 
-			call_user_func( $autoloader, $classname );
+			call_user_func($autoloader, $classname);
 
 			// If it has been autoloaded, stop processing.
-			if ( class_exists( $classname, false ) ) {
+			if (class_exists($classname, false)) {
 				return;
 			}
 		}
@@ -527,21 +527,21 @@ 
 	 * @param bool     $prepend           Whether the function should be prepended to the stack.
 	 *                                    Default false.
 	 */
-	function spl_autoload_register( $autoload_function, $throw = true, $prepend = false ) {
-		if ( $throw && ! is_callable( $autoload_function ) ) {
+	function spl_autoload_register($autoload_function, $throw = true, $prepend = false) {
+		if ($throw && ! is_callable($autoload_function)) {
 			// String not translated to match PHP core.
-			throw new Exception( 'Function not callable' );
+			throw new Exception('Function not callable');
 		}
 
 		global $_wp_spl_autoloaders;
 
 		// Don't allow multiple registration.
-		if ( in_array( $autoload_function, $_wp_spl_autoloaders ) ) {
+		if (in_array($autoload_function, $_wp_spl_autoloaders)) {
 			return;
 		}
 
-		if ( $prepend ) {
-			array_unshift( $_wp_spl_autoloaders, $autoload_function );
+		if ($prepend) {
+			array_unshift($_wp_spl_autoloaders, $autoload_function);
 		} else {
 			$_wp_spl_autoloaders[] = $autoload_function;
 		}
@@ -555,11 +555,11 @@ 
 	 * @param callable $function The function to unregister.
 	 * @return bool True if the function was unregistered, false if it could not be.
 	 */
-	function spl_autoload_unregister( $function ) {
+	function spl_autoload_unregister($function) {
 		global $_wp_spl_autoloaders;
-		foreach ( $_wp_spl_autoloaders as &$autoloader ) {
-			if ( $autoloader === $function ) {
-				unset( $autoloader );
+		foreach ($_wp_spl_autoloaders as &$autoloader) {
+			if ($autoloader === $function) {
+				unset($autoloader);
 				return true;
 			}
 		}

src/wp-includes/Text/Diff/Engine/shell.php

Indentation +142 added lines, -142 removed lines

@@ -16,147 +16,147 @@
  */
 class Text_Diff_Engine_shell {
 
-    /**
-     * Path to the diff executable
-     *
-     * @var string
-     */
-    var $_diffCommand = 'diff';
-
-    /**
-     * Returns the array of differences.
-     *
-     * @param array $from_lines lines of text from old file
-     * @param array $to_lines   lines of text from new file
-     *
-     * @return array all changes made (array with Text_Diff_Op_* objects)
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $temp_dir = Text_Diff::_getTempDir();
-
-        // Execute gnu diff or similar to get a standard diff file.
-        $from_file = tempnam($temp_dir, 'Text_Diff');
-        $to_file = tempnam($temp_dir, 'Text_Diff');
-        $fp = fopen($from_file, 'w');
-        fwrite($fp, implode("\n", $from_lines));
-        fclose($fp);
-        $fp = fopen($to_file, 'w');
-        fwrite($fp, implode("\n", $to_lines));
-        fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
-        unlink($from_file);
-        unlink($to_file);
-
-        if (is_null($diff)) {
-            // No changes were made
-            return array(new Text_Diff_Op_copy($from_lines));
-        }
-
-        $from_line_no = 1;
-        $to_line_no = 1;
-        $edits = array();
-
-        // Get changed lines by parsing something like:
-        // 0a1,2
-        // 1,2c4,6
-        // 1,5d6
-        preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
-            $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $match) {
-            if (!isset($match[5])) {
-                // This paren is not set every time (see regex).
-                $match[5] = false;
-            }
-
-            if ($match[3] == 'a') {
-                $from_line_no--;
-            }
-
-            if ($match[3] == 'd') {
-                $to_line_no--;
-            }
-
-            if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
-                // copied lines
-                assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
-                array_push($edits,
-                    new Text_Diff_Op_copy(
-                        $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
-                        $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
-            }
-
-            switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
-            }
-        }
-
-        if (!empty($from_lines)) {
-            // Some lines might still be pending. Add them as copied
-            array_push($edits,
-                new Text_Diff_Op_copy(
-                    $this->_getLines($from_lines, $from_line_no,
-                                     $from_line_no + count($from_lines) - 1),
-                    $this->_getLines($to_lines, $to_line_no,
-                                     $to_line_no + count($to_lines) - 1)));
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Get lines from either the old or new text
-     *
-     * @access private
-     *
-     * @param array &$text_lines Either $from_lines or $to_lines
-     * @param int   &$line_no    Current line number
-     * @param int   $end         Optional end line, when we want to chop more
-     *                           than one line.
-     *
-     * @return array The chopped lines
-     */
-    function _getLines(&$text_lines, &$line_no, $end = false)
-    {
-        if (!empty($end)) {
-            $lines = array();
-            // We can shift even more
-            while ($line_no <= $end) {
-                array_push($lines, array_shift($text_lines));
-                $line_no++;
-            }
-        } else {
-            $lines = array(array_shift($text_lines));
-            $line_no++;
-        }
-
-        return $lines;
-    }
+	/**
+	 * Path to the diff executable
+	 *
+	 * @var string
+	 */
+	var $_diffCommand = 'diff';
+
+	/**
+	 * Returns the array of differences.
+	 *
+	 * @param array $from_lines lines of text from old file
+	 * @param array $to_lines   lines of text from new file
+	 *
+	 * @return array all changes made (array with Text_Diff_Op_* objects)
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$temp_dir = Text_Diff::_getTempDir();
+
+		// Execute gnu diff or similar to get a standard diff file.
+		$from_file = tempnam($temp_dir, 'Text_Diff');
+		$to_file = tempnam($temp_dir, 'Text_Diff');
+		$fp = fopen($from_file, 'w');
+		fwrite($fp, implode("\n", $from_lines));
+		fclose($fp);
+		$fp = fopen($to_file, 'w');
+		fwrite($fp, implode("\n", $to_lines));
+		fclose($fp);
+		$diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+		unlink($from_file);
+		unlink($to_file);
+
+		if (is_null($diff)) {
+			// No changes were made
+			return array(new Text_Diff_Op_copy($from_lines));
+		}
+
+		$from_line_no = 1;
+		$to_line_no = 1;
+		$edits = array();
+
+		// Get changed lines by parsing something like:
+		// 0a1,2
+		// 1,2c4,6
+		// 1,5d6
+		preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
+			$matches, PREG_SET_ORDER);
+
+		foreach ($matches as $match) {
+			if (!isset($match[5])) {
+				// This paren is not set every time (see regex).
+				$match[5] = false;
+			}
+
+			if ($match[3] == 'a') {
+				$from_line_no--;
+			}
+
+			if ($match[3] == 'd') {
+				$to_line_no--;
+			}
+
+			if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
+				// copied lines
+				assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+				array_push($edits,
+					new Text_Diff_Op_copy(
+						$this->_getLines($from_lines, $from_line_no, $match[1] - 1),
+						$this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
+			}
+
+			switch ($match[3]) {
+			case 'd':
+				// deleted lines
+				array_push($edits,
+					new Text_Diff_Op_delete(
+						$this->_getLines($from_lines, $from_line_no, $match[2])));
+				$to_line_no++;
+				break;
+
+			case 'c':
+				// changed lines
+				array_push($edits,
+					new Text_Diff_Op_change(
+						$this->_getLines($from_lines, $from_line_no, $match[2]),
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				break;
+
+			case 'a':
+				// added lines
+				array_push($edits,
+					new Text_Diff_Op_add(
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				$from_line_no++;
+				break;
+			}
+		}
+
+		if (!empty($from_lines)) {
+			// Some lines might still be pending. Add them as copied
+			array_push($edits,
+				new Text_Diff_Op_copy(
+					$this->_getLines($from_lines, $from_line_no,
+									 $from_line_no + count($from_lines) - 1),
+					$this->_getLines($to_lines, $to_line_no,
+									 $to_line_no + count($to_lines) - 1)));
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Get lines from either the old or new text
+	 *
+	 * @access private
+	 *
+	 * @param array &$text_lines Either $from_lines or $to_lines
+	 * @param int   &$line_no    Current line number
+	 * @param int   $end         Optional end line, when we want to chop more
+	 *                           than one line.
+	 *
+	 * @return array The chopped lines
+	 */
+	function _getLines(&$text_lines, &$line_no, $end = false)
+	{
+		if (!empty($end)) {
+			$lines = array();
+			// We can shift even more
+			while ($line_no <= $end) {
+				array_push($lines, array_shift($text_lines));
+				$line_no++;
+			}
+		} else {
+			$lines = array(array_shift($text_lines));
+			$line_no++;
+		}
+
+		return $lines;
+	}
 
 }

Switch Indentation +23 added lines, -23 removed lines

@@ -91,29 +91,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+            	case 'd':
+                	// deleted lines
+                	array_push($edits,
+                    	new Text_Diff_Op_delete(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2])));
+                	$to_line_no++;
+                	break;
+
+            	case 'c':
+                	// changed lines
+                	array_push($edits,
+                    	new Text_Diff_Op_change(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2]),
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	break;
+
+            	case 'a':
+                	// added lines
+                	array_push($edits,
+                    	new Text_Diff_Op_add(
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	$from_line_no++;
+                	break;
             }
         }
 

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $fp = fopen($to_file, 'w');
         fwrite($fp, implode("\n", $to_lines));
         fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
         unlink($from_file);
         unlink($to_file);
 
@@ -68,7 +68,7 @@ 
             $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            if (!isset($match[5])) {
+            if ( ! isset($match[5])) {
                 // This paren is not set every time (see regex).
                 $match[5] = false;
             }
@@ -117,7 +117,7 @@ 
             }
         }
 
-        if (!empty($from_lines)) {
+        if ( ! empty($from_lines)) {
             // Some lines might still be pending. Add them as copied
             array_push($edits,
                 new Text_Diff_Op_copy(
@@ -144,7 +144,7 @@ 
      */
     function _getLines(&$text_lines, &$line_no, $end = false)
     {
-        if (!empty($end)) {
+        if ( ! empty($end)) {
             $lines = array();
             // We can shift even more
             while ($line_no <= $end) {

src/wp-includes/Text/Diff/Engine/xdiff.php

Indentation +32 added lines, -32 removed lines

@@ -15,22 +15,22 @@ 
  */
 class Text_Diff_Engine_xdiff {
 
-    /**
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+	/**
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
 
-        /* Convert the two input arrays into strings for xdiff processing. */
-        $from_string = implode("\n", $from_lines);
-        $to_string = implode("\n", $to_lines);
+		/* Convert the two input arrays into strings for xdiff processing. */
+		$from_string = implode("\n", $from_lines);
+		$to_string = implode("\n", $to_lines);
 
-        /* Diff the two strings and convert the result to an array. */
-        $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
-        $diff = explode("\n", $diff);
+		/* Diff the two strings and convert the result to an array. */
+		$diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+		$diff = explode("\n", $diff);
 
-        /* Walk through the diff one line at a time.  We build the $edits
+		/* Walk through the diff one line at a time.  We build the $edits
          * array of diff operations by reading the first character of the
          * xdiff output (which is in the "unified diff" format).
          *
@@ -38,27 +38,27 @@ 
          * lines using this approach, so we can't add Text_Diff_Op_changed
          * instances to the $edits array.  The result is still perfectly
          * valid, albeit a little less descriptive and efficient. */
-        $edits = array();
-        foreach ($diff as $line) {
-            if (!strlen($line)) {
-                continue;
-            }
-            switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+		$edits = array();
+		foreach ($diff as $line) {
+			if (!strlen($line)) {
+				continue;
+			}
+			switch ($line[0]) {
+			case ' ':
+				$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+				break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+			case '+':
+				$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+				break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
-            }
-        }
+			case '-':
+				$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+				break;
+			}
+		}
 
-        return $edits;
-    }
+		return $edits;
+	}
 
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+            	case ' ':
+                	$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+                	break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+            	case '+':
+                	$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+                	break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+            	case '-':
+                	$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+                	break;
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
          * valid, albeit a little less descriptive and efficient. */
         $edits = array();
         foreach ($diff as $line) {
-            if (!strlen($line)) {
+            if ( ! strlen($line)) {
                 continue;
             }
             switch ($line[0]) {

src/wp-includes/Text/Diff.php

Indentation +356 added lines, -356 removed lines

@@ -17,43 +17,43 @@ 
  */
 class Text_Diff {
 
-    /**
-     * Array of changes.
-     *
-     * @var array
-     */
-    var $_edits;
-
-    /**
-     * Computes diffs between sequences of strings.
-     *
-     * @param string $engine     Name of the diffing engine to use.  'auto'
-     *                           will automatically select the best.
-     * @param array $params      Parameters to pass to the diffing engine.
-     *                           Normally an array of two arrays, each
-     *                           containing the lines from a file.
-     */
-    function __construct( $engine, $params )
-    {
-        // Backward compatibility workaround.
-        if (!is_string($engine)) {
-            $params = array($engine, $params);
-            $engine = 'auto';
-        }
-
-        if ($engine == 'auto') {
-            $engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
-        } else {
-            $engine = basename($engine);
-        }
-
-        // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
-        $diff_engine = new $class();
-
-        $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
-    }
+	/**
+	 * Array of changes.
+	 *
+	 * @var array
+	 */
+	var $_edits;
+
+	/**
+	 * Computes diffs between sequences of strings.
+	 *
+	 * @param string $engine     Name of the diffing engine to use.  'auto'
+	 *                           will automatically select the best.
+	 * @param array $params      Parameters to pass to the diffing engine.
+	 *                           Normally an array of two arrays, each
+	 *                           containing the lines from a file.
+	 */
+	function __construct( $engine, $params )
+	{
+		// Backward compatibility workaround.
+		if (!is_string($engine)) {
+			$params = array($engine, $params);
+			$engine = 'auto';
+		}
+
+		if ($engine == 'auto') {
+			$engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
+		} else {
+			$engine = basename($engine);
+		}
+
+		// WP #7391
+		require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
+		$class = 'Text_Diff_Engine_' . $engine;
+		$diff_engine = new $class();
+
+		$this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -62,230 +62,230 @@ 
 		self::__construct( $engine, $params );
 	}
 
-    /**
-     * Returns the array of differences.
-     */
-    function getDiff()
-    {
-        return $this->_edits;
-    }
-
-    /**
-     * returns the number of new (added) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of new lines
-     */
-    function countAddedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_add') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->nfinal();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Returns the number of deleted (removed) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of deleted lines
-     */
-    function countDeletedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_delete') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->norig();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Computes a reversed diff.
-     *
-     * Example:
-     * <code>
-     * $diff = new Text_Diff($lines1, $lines2);
-     * $rev = $diff->reverse();
-     * </code>
-     *
-     * @return Text_Diff  A Diff object representing the inverse of the
-     *                    original diff.  Note that we purposely don't return a
-     *                    reference here, since this essentially is a clone()
-     *                    method.
-     */
-    function reverse()
-    {
-        if (version_compare(zend_version(), '2', '>')) {
-            $rev = clone($this);
-        } else {
-            $rev = $this;
-        }
-        $rev->_edits = array();
-        foreach ($this->_edits as $edit) {
-            $rev->_edits[] = $edit->reverse();
-        }
-        return $rev;
-    }
-
-    /**
-     * Checks for an empty diff.
-     *
-     * @return boolean  True if two sequences were identical.
-     */
-    function isEmpty()
-    {
-        foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Computes the length of the Longest Common Subsequence (LCS).
-     *
-     * This is mostly for diagnostic purposes.
-     *
-     * @return integer  The length of the LCS.
-     */
-    function lcs()
-    {
-        $lcs = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                $lcs += count($edit->orig);
-            }
-        }
-        return $lcs;
-    }
-
-    /**
-     * Gets the original set of lines.
-     *
-     * This reconstructs the $from_lines parameter passed to the constructor.
-     *
-     * @return array  The original sequence of strings.
-     */
-    function getOriginal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->orig) {
-                array_splice($lines, count($lines), 0, $edit->orig);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Gets the final set of lines.
-     *
-     * This reconstructs the $to_lines parameter passed to the constructor.
-     *
-     * @return array  The sequence of strings.
-     */
-    function getFinal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->final) {
-                array_splice($lines, count($lines), 0, $edit->final);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Removes trailing newlines from a line of text. This is meant to be used
-     * with array_walk().
-     *
-     * @param string $line  The line to trim.
-     * @param integer $key  The index of the line in the array. Not used.
-     */
-    static function trimNewlines(&$line, $key)
-    {
-        $line = str_replace(array("\n", "\r"), '', $line);
-    }
-
-    /**
-     * Determines the location of the system temporary directory.
-     *
-     * @static
-     *
-     * @access protected
-     *
-     * @return string  A directory name which can be used for temp files.
-     *                 Returns false if one could not be found.
-     */
-    function _getTempDir()
-    {
-        $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
-                               'c:\windows\temp', 'c:\winnt\temp');
-
-        /* Try PHP's upload_tmp_dir directive. */
-        $tmp = ini_get('upload_tmp_dir');
-
-        /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
-            $tmp = getenv('TMPDIR');
-        }
-
-        /* If we still cannot determine a value, then cycle through a list of
+	/**
+	 * Returns the array of differences.
+	 */
+	function getDiff()
+	{
+		return $this->_edits;
+	}
+
+	/**
+	 * returns the number of new (added) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of new lines
+	 */
+	function countAddedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_add') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->nfinal();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Returns the number of deleted (removed) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of deleted lines
+	 */
+	function countDeletedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_delete') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->norig();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Computes a reversed diff.
+	 *
+	 * Example:
+	 * <code>
+	 * $diff = new Text_Diff($lines1, $lines2);
+	 * $rev = $diff->reverse();
+	 * </code>
+	 *
+	 * @return Text_Diff  A Diff object representing the inverse of the
+	 *                    original diff.  Note that we purposely don't return a
+	 *                    reference here, since this essentially is a clone()
+	 *                    method.
+	 */
+	function reverse()
+	{
+		if (version_compare(zend_version(), '2', '>')) {
+			$rev = clone($this);
+		} else {
+			$rev = $this;
+		}
+		$rev->_edits = array();
+		foreach ($this->_edits as $edit) {
+			$rev->_edits[] = $edit->reverse();
+		}
+		return $rev;
+	}
+
+	/**
+	 * Checks for an empty diff.
+	 *
+	 * @return boolean  True if two sequences were identical.
+	 */
+	function isEmpty()
+	{
+		foreach ($this->_edits as $edit) {
+			if (!is_a($edit, 'Text_Diff_Op_copy')) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Computes the length of the Longest Common Subsequence (LCS).
+	 *
+	 * This is mostly for diagnostic purposes.
+	 *
+	 * @return integer  The length of the LCS.
+	 */
+	function lcs()
+	{
+		$lcs = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_copy')) {
+				$lcs += count($edit->orig);
+			}
+		}
+		return $lcs;
+	}
+
+	/**
+	 * Gets the original set of lines.
+	 *
+	 * This reconstructs the $from_lines parameter passed to the constructor.
+	 *
+	 * @return array  The original sequence of strings.
+	 */
+	function getOriginal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->orig) {
+				array_splice($lines, count($lines), 0, $edit->orig);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Gets the final set of lines.
+	 *
+	 * This reconstructs the $to_lines parameter passed to the constructor.
+	 *
+	 * @return array  The sequence of strings.
+	 */
+	function getFinal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->final) {
+				array_splice($lines, count($lines), 0, $edit->final);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Removes trailing newlines from a line of text. This is meant to be used
+	 * with array_walk().
+	 *
+	 * @param string $line  The line to trim.
+	 * @param integer $key  The index of the line in the array. Not used.
+	 */
+	static function trimNewlines(&$line, $key)
+	{
+		$line = str_replace(array("\n", "\r"), '', $line);
+	}
+
+	/**
+	 * Determines the location of the system temporary directory.
+	 *
+	 * @static
+	 *
+	 * @access protected
+	 *
+	 * @return string  A directory name which can be used for temp files.
+	 *                 Returns false if one could not be found.
+	 */
+	function _getTempDir()
+	{
+		$tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
+							   'c:\windows\temp', 'c:\winnt\temp');
+
+		/* Try PHP's upload_tmp_dir directive. */
+		$tmp = ini_get('upload_tmp_dir');
+
+		/* Otherwise, try to determine the TMPDIR environment variable. */
+		if (!strlen($tmp)) {
+			$tmp = getenv('TMPDIR');
+		}
+
+		/* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
-            $tmp_check = array_shift($tmp_locations);
-            if (@is_dir($tmp_check)) {
-                $tmp = $tmp_check;
-            }
-        }
-
-        /* If it is still empty, we have failed, so return false; otherwise
+		while (!strlen($tmp) && count($tmp_locations)) {
+			$tmp_check = array_shift($tmp_locations);
+			if (@is_dir($tmp_check)) {
+				$tmp = $tmp_check;
+			}
+		}
+
+		/* If it is still empty, we have failed, so return false; otherwise
          * return the directory determined. */
-        return strlen($tmp) ? $tmp : false;
-    }
-
-    /**
-     * Checks a diff for validity.
-     *
-     * This is here only for debugging purposes.
-     */
-    function _check($from_lines, $to_lines)
-    {
-        if (serialize($from_lines) != serialize($this->getOriginal())) {
-            trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($to_lines) != serialize($this->getFinal())) {
-            trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
-        }
-
-        $rev = $this->reverse();
-        if (serialize($to_lines) != serialize($rev->getOriginal())) {
-            trigger_error("Reversed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($from_lines) != serialize($rev->getFinal())) {
-            trigger_error("Reversed final doesn't match", E_USER_ERROR);
-        }
-
-        $prevtype = null;
-        foreach ($this->_edits as $edit) {
-            if ($prevtype == get_class($edit)) {
-                trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
-            }
-            $prevtype = get_class($edit);
-        }
-
-        return true;
-    }
+		return strlen($tmp) ? $tmp : false;
+	}
+
+	/**
+	 * Checks a diff for validity.
+	 *
+	 * This is here only for debugging purposes.
+	 */
+	function _check($from_lines, $to_lines)
+	{
+		if (serialize($from_lines) != serialize($this->getOriginal())) {
+			trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($to_lines) != serialize($this->getFinal())) {
+			trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
+		}
+
+		$rev = $this->reverse();
+		if (serialize($to_lines) != serialize($rev->getOriginal())) {
+			trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($from_lines) != serialize($rev->getFinal())) {
+			trigger_error("Reversed final doesn't match", E_USER_ERROR);
+		}
+
+		$prevtype = null;
+		foreach ($this->_edits as $edit) {
+			if ($prevtype == get_class($edit)) {
+				trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			}
+			$prevtype = get_class($edit);
+		}
+
+		return true;
+	}
 
 }
 
@@ -295,53 +295,53 @@ 
  */
 class Text_MappedDiff extends Text_Diff {
 
-    /**
-     * Computes a diff between sequences of strings.
-     *
-     * This can be used to compute things like case-insensitve diffs, or diffs
-     * which ignore changes in white-space.
-     *
-     * @param array $from_lines         An array of strings.
-     * @param array $to_lines           An array of strings.
-     * @param array $mapped_from_lines  This array should have the same size
-     *                                  number of elements as $from_lines.  The
-     *                                  elements in $mapped_from_lines and
-     *                                  $mapped_to_lines are what is actually
-     *                                  compared when computing the diff.
-     * @param array $mapped_to_lines    This array should have the same number
-     *                                  of elements as $to_lines.
-     */
-    function __construct($from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines)
-    {
-        assert(count($from_lines) == count($mapped_from_lines));
-        assert(count($to_lines) == count($mapped_to_lines));
-
-        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
-
-        $xi = $yi = 0;
-        for ($i = 0; $i < count($this->_edits); $i++) {
-            $orig = &$this->_edits[$i]->orig;
-            if (is_array($orig)) {
-                $orig = array_slice($from_lines, $xi, count($orig));
-                $xi += count($orig);
-            }
-
-            $final = &$this->_edits[$i]->final;
-            if (is_array($final)) {
-                $final = array_slice($to_lines, $yi, count($final));
-                $yi += count($final);
-            }
-        }
-    }
+	/**
+	 * Computes a diff between sequences of strings.
+	 *
+	 * This can be used to compute things like case-insensitve diffs, or diffs
+	 * which ignore changes in white-space.
+	 *
+	 * @param array $from_lines         An array of strings.
+	 * @param array $to_lines           An array of strings.
+	 * @param array $mapped_from_lines  This array should have the same size
+	 *                                  number of elements as $from_lines.  The
+	 *                                  elements in $mapped_from_lines and
+	 *                                  $mapped_to_lines are what is actually
+	 *                                  compared when computing the diff.
+	 * @param array $mapped_to_lines    This array should have the same number
+	 *                                  of elements as $to_lines.
+	 */
+	function __construct($from_lines, $to_lines,
+							 $mapped_from_lines, $mapped_to_lines)
+	{
+		assert(count($from_lines) == count($mapped_from_lines));
+		assert(count($to_lines) == count($mapped_to_lines));
+
+		parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+
+		$xi = $yi = 0;
+		for ($i = 0; $i < count($this->_edits); $i++) {
+			$orig = &$this->_edits[$i]->orig;
+			if (is_array($orig)) {
+				$orig = array_slice($from_lines, $xi, count($orig));
+				$xi += count($orig);
+			}
+
+			$final = &$this->_edits[$i]->final;
+			if (is_array($final)) {
+				$final = array_slice($to_lines, $yi, count($final));
+				$yi += count($final);
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
 	 */
 	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
+							 $mapped_from_lines, $mapped_to_lines ) {
 		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+							 $mapped_from_lines, $mapped_to_lines );
 	}
 
 }
@@ -354,23 +354,23 @@ 
  */
 class Text_Diff_Op {
 
-    var $orig;
-    var $final;
+	var $orig;
+	var $final;
 
-    function &reverse()
-    {
-        trigger_error('Abstract method', E_USER_ERROR);
-    }
+	function &reverse()
+	{
+		trigger_error('Abstract method', E_USER_ERROR);
+	}
 
-    function norig()
-    {
-        return $this->orig ? count($this->orig) : 0;
-    }
+	function norig()
+	{
+		return $this->orig ? count($this->orig) : 0;
+	}
 
-    function nfinal()
-    {
-        return $this->final ? count($this->final) : 0;
-    }
+	function nfinal()
+	{
+		return $this->final ? count($this->final) : 0;
+	}
 
 }
 
@@ -385,14 +385,14 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
-    {
-        if (!is_array($final)) {
-            $final = $orig;
-        }
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final = false )
+	{
+		if (!is_array($final)) {
+			$final = $orig;
+		}
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -401,11 +401,11 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_copy($this->final, $this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -421,10 +421,10 @@ 
 	 * PHP5 constructor.
 	 */
 	function __construct( $lines )
-    {
-        $this->orig = $lines;
-        $this->final = false;
-    }
+	{
+		$this->orig = $lines;
+		$this->final = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -433,11 +433,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_add($this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_add($this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -452,11 +452,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
-    {
-        $this->final = $lines;
-        $this->orig = false;
-    }
+	function __construct( $lines )
+	{
+		$this->final = $lines;
+		$this->orig = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -465,11 +465,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_delete($this->final);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_delete($this->final);
+		return $reverse;
+	}
 
 }
 
@@ -484,11 +484,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
-    {
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final )
+	{
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -497,10 +497,10 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_change($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_change($this->final, $this->orig);
+		return $reverse;
+	}
 
 }

Spacing +26 added lines, -26 removed lines

@@ -33,10 +33,10 @@ 
      *                           Normally an array of two arrays, each
      *                           containing the lines from a file.
      */
-    function __construct( $engine, $params )
+    function __construct($engine, $params)
     {
         // Backward compatibility workaround.
-        if (!is_string($engine)) {
+        if ( ! is_string($engine)) {
             $params = array($engine, $params);
             $engine = 'auto';
         }
@@ -48,8 +48,8 @@ 
         }
 
         // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
+        require_once dirname(__FILE__).'/Diff/Engine/'.$engine.'.php';
+        $class = 'Text_Diff_Engine_'.$engine;
         $diff_engine = new $class();
 
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
@@ -58,8 +58,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff( $engine, $params ) {
-		self::__construct( $engine, $params );
+	public function Text_Diff($engine, $params) {
+		self::__construct($engine, $params);
 	}
 
     /**
@@ -144,7 +144,7 @@ 
     function isEmpty()
     {
         foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
+            if ( ! is_a($edit, 'Text_Diff_Op_copy')) {
                 return false;
             }
         }
@@ -236,13 +236,13 @@ 
         $tmp = ini_get('upload_tmp_dir');
 
         /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
+        if ( ! strlen($tmp)) {
             $tmp = getenv('TMPDIR');
         }
 
         /* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
+        while ( ! strlen($tmp) && count($tmp_locations)) {
             $tmp_check = array_shift($tmp_locations);
             if (@is_dir($tmp_check)) {
                 $tmp = $tmp_check;
@@ -338,10 +338,10 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
-		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+	public function Text_MappedDiff($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines) {
+		self::__construct($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines);
 	}
 
 }
@@ -385,9 +385,9 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
+    function __construct($orig, $final = false)
     {
-        if (!is_array($final)) {
+        if ( ! is_array($final)) {
             $final = $orig;
         }
         $this->orig = $orig;
@@ -397,8 +397,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_copy( $orig, $final = false ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_copy($orig, $final = false) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()
@@ -420,7 +420,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $lines )
+	function __construct($lines)
     {
         $this->orig = $lines;
         $this->final = false;
@@ -429,8 +429,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_delete( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_delete($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -452,7 +452,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
+    function __construct($lines)
     {
         $this->final = $lines;
         $this->orig = false;
@@ -461,8 +461,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_add( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_add($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -484,7 +484,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
+    function __construct($orig, $final)
     {
         $this->orig = $orig;
         $this->final = $final;
@@ -493,8 +493,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_change( $orig, $final ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_change($orig, $final) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()