ntwb / wordpress

src/wp-includes/pluggable.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * These functions can be replaced via plugins. If plugins do not redefine these
- * functions, then these will be used instead.
- *
- * @package WordPress
- */
+	 * These functions can be replaced via plugins. If plugins do not redefine these
+	 * functions, then these will be used instead.
+	 *
+	 * @package WordPress
+	 */
 
 if ( !function_exists('wp_set_current_user') ) :
 /**
@@ -801,7 +801,7 @@ 
 					$cookie_name = AUTH_COOKIE;
 					$scheme = 'auth';
 				}
-	    }
+		}
 
 		if ( empty($_COOKIE[$cookie_name]) )
 			return false;

Doc Comments +7 added lines, -7 removed lines

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

Spacing +520 added lines, -520 removed lines

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

Braces +109 added lines, -75 removed lines

@@ -98,8 +98,9 @@ 
 function get_user_by( $field, $value ) {
 	$userdata = WP_User::get_data_by( $field, $value );
 
-	if ( !$userdata )
-		return false;
+	if ( !$userdata ) {
+			return false;
+	}
 
 	$user = new WP_User;
 	$user->init( $userdata );
@@ -123,8 +124,9 @@ 
 
 	$clean = _get_non_cached_ids( $user_ids, 'users' );
 
-	if ( empty( $clean ) )
-		return;
+	if ( empty( $clean ) ) {
+			return;
+	}
 
 	$list = implode( ',', $clean );
 
@@ -308,8 +310,9 @@ 
 
 	// From email and name
 	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
-		$from_name = 'WordPress';
+	if ( !isset( $from_name ) ) {
+			$from_name = 'WordPress';
+	}
 
 	/* If we don't have an email from the input headers default to wordpress@$sitename
 	 * Some hosts will block outgoing mail from this address if it doesn't exist but
@@ -347,8 +350,9 @@ 
 	$phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
 
 	// Set destination addresses
-	if ( !is_array( $to ) )
-		$to = explode( ',', $to );
+	if ( !is_array( $to ) ) {
+			$to = explode( ',', $to );
+	}
 
 	foreach ( (array) $to as $recipient ) {
 		try {
@@ -412,8 +416,9 @@ 
 
 	// Set Content-Type and charset
 	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
-		$content_type = 'text/plain';
+	if ( !isset( $content_type ) ) {
+			$content_type = 'text/plain';
+	}
 
 	/**
 	 * Filter the wp_mail() content type.
@@ -427,12 +432,14 @@ 
 	$phpmailer->ContentType = $content_type;
 
 	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->IsHTML( true );
+	if ( 'text/html' == $content_type ) {
+			$phpmailer->IsHTML( true );
+	}
 
 	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
+	if ( !isset( $charset ) ) {
+			$charset = get_bloginfo( 'charset' );
+	}
 
 	// Set the content-type and charset
 
@@ -451,8 +458,9 @@ 
 			$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) ) {
+					$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		}
 	}
 
 	if ( !empty( $attachments ) ) {
@@ -766,8 +774,9 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
+		if ( empty($_COOKIE[$cookie_name]) ) {
+					return false;
+		}
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
@@ -898,9 +907,10 @@ 
 	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
-		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-}
+	if ( COOKIEPATH != SITECOOKIEPATH ) {
+			setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
+	}
+	}
 endif;
 
 if ( !function_exists('wp_clear_auth_cookie') ) :
@@ -1048,8 +1058,9 @@ 
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
-	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+	if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+	}
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1093,12 +1104,13 @@ 
 function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
 	$nonce = '';
 
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
-		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
-		$nonce = $_REQUEST['_wpnonce'];
+	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) ) {
+			$nonce = $_REQUEST[ $query_arg ];
+	} elseif ( isset( $_REQUEST['_ajax_nonce'] ) ) {
+			$nonce = $_REQUEST['_ajax_nonce'];
+	} elseif ( isset( $_REQUEST['_wpnonce'] ) ) {
+			$nonce = $_REQUEST['_wpnonce'];
+	}
 
 	$result = wp_verify_nonce( $nonce, $action );
 
@@ -1160,13 +1172,16 @@ 
 	 */
 	$status = apply_filters( 'wp_redirect_status', $status, $location );
 
-	if ( ! $location )
-		return false;
+	if ( ! $location ) {
+			return false;
+	}
 
 	$location = wp_sanitize_redirect($location);
 
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
-		status_header($status); // This causes problems on IIS and some FastCGI setups
+	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' ) {
+			status_header($status);
+	}
+	// This causes problems on IIS and some FastCGI setups
 
 	header("Location: $location", true, $status);
 
@@ -1277,8 +1292,9 @@ 
 function wp_validate_redirect($location, $default = '') {
 	$location = trim( $location );
 	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
+	if ( substr($location, 0, 2) == '//' ) {
+			$location = 'http:' . $location;
+	}
 
 	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
 	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
@@ -1287,12 +1303,14 @@ 
 	$lp = @parse_url($test);
 
 	// Give up if malformed URL
-	if ( false === $lp )
-		return $default;
+	if ( false === $lp ) {
+			return $default;
+	}
 
 	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
-		return $default;
+	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) ) {
+			return $default;
+	}
 
 	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
 	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
@@ -1318,8 +1336,9 @@ 
 	 */
 	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-		$location = $default;
+	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) ) {
+			$location = $default;
+	}
 
 	return $location;
 }
@@ -1341,8 +1360,9 @@ 
 	}
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
-		return false;
+	if ( empty( $comment ) || empty( $comment->comment_post_ID ) ) {
+			return false;
+	}
 
 	$post    = get_post( $comment->comment_post_ID );
 	$author  = get_userdata( $post->post_author );
@@ -1467,19 +1487,22 @@ 
 
 	if ( '' == $comment->comment_author ) {
 		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: $comment->comment_author_email";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: $comment->comment_author_email";
+		}
 	} else {
 		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		}
 	}
 
 	$message_headers = "$from\n"
 		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
+	if ( isset($reply_to) ) {
+			$message_headers .= $reply_to . "\n";
+	}
 
 	/**
 	 * Filter the comment notification email text.
@@ -1558,8 +1581,9 @@ 
 	// Send to the administration and to the post author if the author can modify the comment.
 	$emails = array( get_option( 'admin_email' ) );
 	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
-			$emails[] = $user->user_email;
+		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+					$emails[] = $user->user_email;
+		}
 	}
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
@@ -1599,10 +1623,11 @@ 
 
 	$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
 
-	if ( EMPTY_TRASH_DAYS )
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-	else
-		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	if ( EMPTY_TRASH_DAYS ) {
+			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	} else {
+			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	}
 
 	$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
 
@@ -2093,10 +2118,12 @@ 
  */
 function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
-		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
-		$chars .= '-_ []{}<>~`+=,.;:/?|';
+	if ( $special_chars ) {
+			$chars .= '!@#$%^&*()';
+	}
+	if ( $extra_special_chars ) {
+			$chars .= '-_ []{}<>~`+=,.;:/?|';
+	}
 
 	$password = '';
 	for ( $i = 0; $i < $length; $i++ ) {
@@ -2163,10 +2190,11 @@ 
 	// Reset $rnd_value after 14 uses
 	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
 	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
-			static $seed = '';
-		else
-			$seed = get_transient('random_seed');
+		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+					static $seed = '';
+		} else {
+					$seed = get_transient('random_seed');
+		}
 		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
 		$rnd_value .= sha1($rnd_value);
 		$rnd_value .= sha1($rnd_value . $seed);
@@ -2185,8 +2213,9 @@ 
 	$value = abs(hexdec($value));
 
 	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	if ( $max != 0 ) {
+			$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	}
 
 	return abs(intval($value));
 }
@@ -2401,8 +2430,9 @@ 
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) ) {
+			require( ABSPATH . WPINC . '/wp-diff.php' );
+	}
 
 	$left_string  = normalize_whitespace($left_string);
 	$right_string = normalize_whitespace($right_string);
@@ -2413,8 +2443,9 @@ 
 	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
 	$diff = $renderer->render($text_diff);
 
-	if ( !$diff )
-		return '';
+	if ( !$diff ) {
+			return '';
+	}
 
 	$r  = "<table class='diff'>\n";
 
@@ -2424,18 +2455,21 @@ 
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "<thead>";
-	if ( $args['title'] )
-		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "<thead>";
+	}
+	if ( $args['title'] ) {
+			$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	}
 	if ( $args['title_left'] || $args['title_right'] ) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "</thead>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "</thead>\n";
+	}
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";
 	$r .= "</table>";

src/wp-includes/class-wp-admin-bar.php

Braces +94 added lines, -64 removed lines

@@ -60,8 +60,9 @@ 
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
-			$header_callback = '_admin_bar_bump_cb';
+		if ( empty($header_callback) ) {
+					$header_callback = '_admin_bar_bump_cb';
+		}
 
 		add_action('wp_head', $header_callback);
 
@@ -107,16 +108,19 @@ 
 	 */
 	public function add_node( $args ) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) ) {
+					$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		}
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if ( is_object( $args ) ) {
+					$args = get_object_vars( $args );
+		}
 
 		// Ensure we have a valid title.
 		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
-				return;
+			if ( empty( $args['title'] ) ) {
+							return;
+			}
 
 			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
 			// Deprecated: Generate an ID from the title.
@@ -133,12 +137,14 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ( $maybe_defaults = $this->get_node( $args['id'] ) ) {
+					$defaults = get_object_vars( $maybe_defaults );
+		}
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) {
+					$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		}
 
 		$args = wp_parse_args( $args, $defaults );
 
@@ -170,8 +176,9 @@ 
 	 * @return object Node.
 	 */
 	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
-			return clone $node;
+		if ( $node = $this->_get_node( $id ) ) {
+					return clone $node;
+		}
 	}
 
 	/**
@@ -179,22 +186,26 @@ 
 	 * @return object|void
 	 */
 	final protected function _get_node( $id ) {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
-		if ( empty( $id ) )
-			$id = 'root';
+		if ( empty( $id ) ) {
+					$id = 'root';
+		}
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if ( isset( $this->nodes[ $id ] ) ) {
+					return $this->nodes[ $id ];
+		}
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
-			return;
+		if ( ! $nodes = $this->_get_nodes() ) {
+					return;
+		}
 
 		foreach ( $nodes as &$node ) {
 			$node = clone $node;
@@ -206,8 +217,9 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		return $this->nodes;
 	}
@@ -253,16 +265,18 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ( $root ) {
+					$this->_render( $root );
+		}
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
@@ -279,13 +293,15 @@ 
 			unset( $node->group );
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
-				$node->parent = 'root';
+			if ( ! $node->parent ) {
+							$node->parent = 'root';
+			}
 		}
 
 		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
-				continue;
+			if ( 'root' == $node->id ) {
+							continue;
+			}
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
 			if ( ! $parent = $this->_get_node( $node->parent ) ) {
@@ -296,10 +312,11 @@ 
 			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
 			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
-					$node->meta['class'] = $group_class;
-				else
-					$node->meta['class'] .= ' ' . $group_class;
+				if ( empty( $node->meta['class'] ) ) {
+									$node->meta['class'] = $group_class;
+				} else {
+									$node->meta['class'] .= ' ' . $group_class;
+				}
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
@@ -357,10 +374,11 @@ 
 						$container->parent = $grandparent->id;
 
 						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
-							$grandparent->children[] = $container;
-						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+						if ( $index === false ) {
+													$grandparent->children[] = $container;
+						} else {
+													array_splice( $grandparent->children, $index, 1, array( $container ) );
+						}
 					}
 
 					$parent->parent = $container->id;
@@ -393,12 +411,13 @@ 
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
 		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
-				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
-				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
-				$class .= ' ie9';
+			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
+							$class .= ' ie7';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
+							$class .= ' ie8';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
+							$class .= ' ie9';
+			}
 		} elseif ( wp_is_mobile() ) {
 			$class .= ' mobile';
 		}
@@ -425,8 +444,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'container' || empty( $node->children ) ) {
+					return;
+		}
 
 		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
 			foreach ( $node->children as $group ) {
@@ -443,13 +463,15 @@ 
 			$this->_render_container( $node );
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'group' || empty( $node->children ) ) {
+					return;
+		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
-		else
-			$class = '';
+		if ( ! empty( $node->meta['class'] ) ) {
+					$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		} else {
+					$class = '';
+		}
 
 		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
 			foreach ( $node->children as $item ) {
@@ -462,8 +484,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
-			return;
+		if ( $node->type != 'item' ) {
+					return;
+		}
 
 		$is_parent = ! empty( $node->children );
 		$has_link  = ! empty( $node->href );
@@ -478,11 +501,13 @@ 
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$menuclass .= $node->meta['class'];
+		if ( ! empty( $node->meta['class'] ) ) {
+					$menuclass .= $node->meta['class'];
+		}
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ( $menuclass ) {
+					$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		}
 
 		?>
 
@@ -502,8 +527,10 @@ 
 					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
 				endif;
 				?>><?php
-			else:
+			else {
+				:
 				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+			}
 				if ( ! empty( $node->meta['title'] ) ) :
 					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
 				endif;
@@ -514,9 +541,11 @@ 
 
 			if ( $has_link ) :
 				?></a><?php
-			else:
+			else {
+				:
 				?></div><?php
 			endif;
+			}
 
 			if ( $is_parent ) :
 				?><div class="ab-sub-wrapper"><?php
@@ -526,8 +555,9 @@ 
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
-				echo $node->meta['html'];
+			if ( ! empty( $node->meta['html'] ) ) {
+							echo $node->meta['html'];
+			}
 
 			?>
 		</li><?php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Toolbar API: WP_Admin_Bar class
- *
- * @package WordPress
- * @subpackage Toolbar
- * @since 3.1.0
- */
+	 * Toolbar API: WP_Admin_Bar class
+	 *
+	 * @package WordPress
+	 * @subpackage Toolbar
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement the Toolbar API.

Spacing +178 added lines, -178 removed lines

@@ -21,13 +21,13 @@ 
 	 * @param string $name
 	 * @return string|array|void
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
+	public function __get($name) {
+		switch ($name) {
 			case 'proto' :
 				return is_ssl() ? 'https://' : 'http://';
 
 			case 'menu' :
-				_deprecated_argument( 'WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+				_deprecated_argument('WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.');
 				return array(); // Sorry, folks.
 		}
 	}
@@ -38,61 +38,61 @@ 
 	public function initialize() {
 		$this->user = new stdClass;
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			/* Populate settings we need for the menu based on the current user. */
-			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
-			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+			$this->user->blogs = get_blogs_of_user(get_current_user_id());
+			if (is_multisite()) {
+				$this->user->active_blog = get_active_blog_for_user(get_current_user_id());
+				$this->user->domain = empty($this->user->active_blog) ? user_admin_url() : trailingslashit(get_home_url($this->user->active_blog->blog_id));
 				$this->user->account_domain = $this->user->domain;
 			} else {
 				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->domain = trailingslashit(home_url());
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
 
-		add_action( 'wp_head', 'wp_admin_bar_header' );
+		add_action('wp_head', 'wp_admin_bar_header');
 
-		add_action( 'admin_head', 'wp_admin_bar_header' );
+		add_action('admin_head', 'wp_admin_bar_header');
 
-		if ( current_theme_supports( 'admin-bar' ) ) {
+		if (current_theme_supports('admin-bar')) {
 			/**
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args = get_theme_support('admin-bar');
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if (empty($header_callback))
 			$header_callback = '_admin_bar_bump_cb';
 
 		add_action('wp_head', $header_callback);
 
-		wp_enqueue_script( 'admin-bar' );
-		wp_enqueue_style( 'admin-bar' );
+		wp_enqueue_script('admin-bar');
+		wp_enqueue_style('admin-bar');
 
 		/**
 		 * Fires after WP_Admin_Bar is initialized.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'admin_bar_init' );
+		do_action('admin_bar_init');
 	}
 
 	/**
 	 * @param array $node
 	 */
-	public function add_menu( $node ) {
-		$this->add_node( $node );
+	public function add_menu($node) {
+		$this->add_node($node);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	public function remove_menu( $id ) {
-		$this->remove_node( $id );
+	public function remove_menu($id) {
+		$this->remove_node($id);
 	}
 
 	/**
@@ -114,22 +114,22 @@ 
 	 *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
 	 * }
 	 */
-	public function add_node( $args ) {
+	public function add_node($args) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if (func_num_args() >= 3 && is_string(func_get_arg(0)))
+			$args = array_merge(array('parent' => func_get_arg(0)), func_get_arg(2));
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if (is_object($args))
+			$args = get_object_vars($args);
 
 		// Ensure we have a valid title.
-		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+		if (empty($args['id'])) {
+			if (empty($args['title']))
 				return;
 
-			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
+			_doing_it_wrong(__METHOD__, __('The menu ID should not be empty.'), '3.3');
 			// Deprecated: Generate an ID from the title.
-			$args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+			$args['id'] = esc_attr(sanitize_title(trim($args['title'])));
 		}
 
 		$defaults = array(
@@ -142,34 +142,34 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ($maybe_defaults = $this->get_node($args['id']))
+			$defaults = get_object_vars($maybe_defaults);
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty($defaults['meta']) && ! empty($args['meta']))
+			$args['meta'] = wp_parse_args($args['meta'], $defaults['meta']);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$back_compat_parents = array(
-			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-account-with-avatar' => array('my-account', '3.3'),
+			'my-blogs'               => array('my-sites', '3.3'),
 		);
 
-		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
-			list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
-			_deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+		if (isset($back_compat_parents[$args['parent']])) {
+			list($new_parent, $version) = $back_compat_parents[$args['parent']];
+			_deprecated_argument(__METHOD__, $version, sprintf('Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent']));
 			$args['parent'] = $new_parent;
 		}
 
-		$this->_set_node( $args );
+		$this->_set_node($args);
 	}
 
 	/**
 	 * @param array $args
 	 */
-	final protected function _set_node( $args ) {
-		$this->nodes[ $args['id'] ] = (object) $args;
+	final protected function _set_node($args) {
+		$this->nodes[$args['id']] = (object) $args;
 	}
 
 	/**
@@ -178,8 +178,8 @@ 
 	 * @param string $id
 	 * @return object Node.
 	 */
-	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+	final public function get_node($id) {
+		if ($node = $this->_get_node($id))
 			return clone $node;
 	}
 
@@ -187,25 +187,25 @@ 
 	 * @param string $id
 	 * @return object|void
 	 */
-	final protected function _get_node( $id ) {
-		if ( $this->bound )
+	final protected function _get_node($id) {
+		if ($this->bound)
 			return;
 
-		if ( empty( $id ) )
+		if (empty($id))
 			$id = 'root';
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if (isset($this->nodes[$id]))
+			return $this->nodes[$id];
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes())
 			return;
 
-		foreach ( $nodes as &$node ) {
+		foreach ($nodes as &$node) {
 			$node = clone $node;
 		}
 		return $nodes;
@@ -215,7 +215,7 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		return $this->nodes;
@@ -235,10 +235,10 @@ 
 	 *                         'class', 'onclick', 'target', and 'title'.
 	 * }
 	 */
-	final public function add_group( $args ) {
+	final public function add_group($args) {
 		$args['group'] = true;
 
-		$this->add_node( $args );
+		$this->add_node($args);
 	}
 
 	/**
@@ -246,15 +246,15 @@ 
 	 *
 	 * @param string $id The ID of the item.
 	 */
-	public function remove_node( $id ) {
-		$this->_unset_node( $id );
+	public function remove_node($id) {
+		$this->_unset_node($id);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	final protected function _unset_node( $id ) {
-		unset( $this->nodes[ $id ] );
+	final protected function _unset_node($id) {
+		unset($this->nodes[$id]);
 	}
 
 	/**
@@ -262,66 +262,66 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ($root)
+			$this->_render($root);
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
-		$this->remove_node( 'root' );
-		$this->add_node( array(
+		$this->remove_node('root');
+		$this->add_node(array(
 			'id'    => 'root',
 			'group' => false,
-		) );
+		));
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
-		foreach ( $this->_get_nodes() as $node ) {
+		foreach ($this->_get_nodes() as $node) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
-			unset( $node->group );
+			$node->type = ($node->group) ? 'group' : 'item';
+			unset($node->group);
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent)
 				$node->parent = 'root';
 		}
 
-		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+		foreach ($this->_get_nodes() as $node) {
+			if ('root' == $node->id)
 				continue;
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
-			if ( ! $parent = $this->_get_node( $node->parent ) ) {
+			if ( ! $parent = $this->_get_node($node->parent)) {
 				continue;
 			}
 
 			// Generate the group class (we distinguish between top level and other level groups).
-			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
+			$group_class = ($node->parent == 'root') ? 'ab-top-menu' : 'ab-submenu';
 
-			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+			if ($node->type == 'group') {
+				if (empty($node->meta['class']))
 					$node->meta['class'] = $group_class;
 				else
-					$node->meta['class'] .= ' ' . $group_class;
+					$node->meta['class'] .= ' '.$group_class;
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
-			if ( $parent->type == 'item' && $node->type == 'item' ) {
-				$default_id = $parent->id . '-default';
-				$default    = $this->_get_node( $default_id );
+			if ($parent->type == 'item' && $node->type == 'item') {
+				$default_id = $parent->id.'-default';
+				$default    = $this->_get_node($default_id);
 
 				// The default group is added here to allow groups that are
 				// added before standard menu items to render first.
-				if ( ! $default ) {
+				if ( ! $default) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'        => $default_id,
 						'parent'    => $parent->id,
 						'type'      => 'group',
@@ -331,45 +331,45 @@ 
 						),
 						'title'     => false,
 						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					));
+					$default = $this->_get_node($default_id);
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
 			// Groups in groups aren't allowed. Add a special 'container' node.
 			// The container will invisibly wrap both groups.
-			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
-				$container_id = $parent->id . '-container';
-				$container    = $this->_get_node( $container_id );
+			} elseif ($parent->type == 'group' && $node->type == 'group') {
+				$container_id = $parent->id.'-container';
+				$container    = $this->_get_node($container_id);
 
 				// We need to create a container for this group, life is sad.
-				if ( ! $container ) {
+				if ( ! $container) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'       => $container_id,
 						'type'     => 'container',
-						'children' => array( $parent ),
+						'children' => array($parent),
 						'parent'   => false,
 						'title'    => false,
 						'href'     => false,
 						'meta'     => array(),
-					) );
+					));
 
-					$container = $this->_get_node( $container_id );
+					$container = $this->_get_node($container_id);
 
 					// Link the container node if a grandparent node exists.
-					$grandparent = $this->_get_node( $parent->parent );
+					$grandparent = $this->_get_node($parent->parent);
 
-					if ( $grandparent ) {
+					if ($grandparent) {
 						$container->parent = $grandparent->id;
 
-						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						$index = array_search($parent, $grandparent->children, true);
+						if ($index === false)
 							$grandparent->children[] = $container;
 						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+							array_splice($grandparent->children, $index, 1, array($container));
 					}
 
 					$parent->parent = $container->id;
@@ -385,7 +385,7 @@ 
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root = $this->_get_node('root');
 		$this->bound = true;
 		return $root;
 	}
@@ -395,35 +395,35 @@ 
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
-	final protected function _render( $root ) {
+	final protected function _render($root) {
 		global $is_IE;
 
 		// Add browser classes.
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
-		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+		if ($is_IE) {
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7'))
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8'))
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9'))
 				$class .= ' ie9';
-		} elseif ( wp_is_mobile() ) {
+		} elseif (wp_is_mobile()) {
 			$class .= ' mobile';
 		}
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<?php if ( ! is_admin() ) { ?>
-				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+			<?php if ( ! is_admin()) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
 			<?php } ?>
-			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
-					$this->_render_group( $group );
+			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Toolbar'); ?>" tabindex="0">
+				<?php foreach ($root->children as $group) {
+					$this->_render_group($group);
 				} ?>
 			</div>
-			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<?php if (is_user_logged_in()) : ?>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url(wp_logout_url()); ?>"><?php _e('Log Out'); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -433,13 +433,13 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+	final protected function _render_container($node) {
+		if ($node->type != 'container' || empty($node->children))
 			return;
 
-		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
-			foreach ( $node->children as $group ) {
-				$this->_render_group( $group );
+		?><div id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>" class="ab-group-container"><?php
+			foreach ($node->children as $group) {
+				$this->_render_group($group);
 			}
 		?></div><?php
 	}
@@ -447,22 +447,22 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_group( $node ) {
-		if ( $node->type == 'container' ) {
-			$this->_render_container( $node );
+	final protected function _render_group($node) {
+		if ($node->type == 'container') {
+			$this->_render_container($node);
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ($node->type != 'group' || empty($node->children))
 			return;
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		if ( ! empty($node->meta['class']))
+			$class = ' class="'.esc_attr(trim($node->meta['class'])).'"';
 		else
 			$class = '';
 
-		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
-			foreach ( $node->children as $item ) {
-				$this->_render_item( $item );
+		?><ul id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $class; ?>><?php
+			foreach ($node->children as $item) {
+				$this->_render_item($item);
 			}
 		?></ul><?php
 	}
@@ -470,84 +470,84 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+	final protected function _render_item($node) {
+		if ($node->type != 'item')
 			return;
 
-		$is_parent = ! empty( $node->children );
-		$has_link  = ! empty( $node->href );
+		$is_parent = ! empty($node->children);
+		$has_link  = ! empty($node->href);
 
-		$tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
-		$aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
+		$tabindex = isset($node->meta['tabindex']) ? (int) $node->meta['tabindex'] : '';
+		$aria_attributes = $tabindex ? 'tabindex="'.$tabindex.'"' : '';
 
 		$menuclass = '';
 
-		if ( $is_parent ) {
+		if ($is_parent) {
 			$menuclass = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty($node->meta['class']))
 			$menuclass .= $node->meta['class'];
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ($menuclass)
+			$menuclass = ' class="'.esc_attr(trim($menuclass)).'"';
 
 		?>
 
-		<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
-			if ( $has_link ):
-				?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
-					if ( ! empty( $node->meta['onclick'] ) ) :
-						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+		<li id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $menuclass; ?>><?php
+			if ($has_link):
+				?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url($node->href) ?>"<?php
+					if ( ! empty($node->meta['onclick'])) :
+						?> onclick="<?php echo esc_js($node->meta['onclick']); ?>"<?php
 					endif;
-				if ( ! empty( $node->meta['target'] ) ) :
-					?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+				if ( ! empty($node->meta['target'])) :
+					?> target="<?php echo esc_attr($node->meta['target']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['rel'] ) ) :
-					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+				if ( ! empty($node->meta['rel'])) :
+					?> rel="<?php echo esc_attr($node->meta['rel']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			else:
 				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			endif;
 
 			echo $node->title;
 
-			if ( $has_link ) :
+			if ($has_link) :
 				?></a><?php
 			else:
 				?></div><?php
 			endif;
 
-			if ( $is_parent ) :
+			if ($is_parent) :
 				?><div class="ab-sub-wrapper"><?php
-					foreach ( $node->children as $group ) {
-						$this->_render_group( $group );
+					foreach ($node->children as $group) {
+						$this->_render_group($group);
 					}
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
+			if ( ! empty($node->meta['html']))
 				echo $node->meta['html'];
 
 			?>
@@ -558,9 +558,9 @@ 
 	 * @param string $id    Unused.
 	 * @param object $node
 	 */
-	public function recursive_render( $id, $node ) {
-		_deprecated_function( __METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
-		$this->_render_item( $node );
+	public function recursive_render($id, $node) {
+		_deprecated_function(__METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()');
+		$this->_render_item($node);
 	}
 
 	/**
@@ -568,32 +568,32 @@ 
 	 */
 	public function add_menus() {
 		// User related, aligned right.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_menu', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_search_menu', 4);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_item', 7);
 
 		// Site related.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
+		add_action('admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_wp_menu', 10);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20);
+		add_action('admin_bar_menu', 'wp_admin_bar_site_menu', 30);
+		add_action('admin_bar_menu', 'wp_admin_bar_customize_menu', 40);
+		add_action('admin_bar_menu', 'wp_admin_bar_updates_menu', 50);
 
 		// Content related.
-		if ( ! is_network_admin() && ! is_user_admin() ) {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+		if ( ! is_network_admin() && ! is_user_admin()) {
+			add_action('admin_bar_menu', 'wp_admin_bar_comments_menu', 60);
+			add_action('admin_bar_menu', 'wp_admin_bar_new_content_menu', 70);
 		}
-		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		add_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 
-		add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
+		add_action('admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200);
 
 		/**
 		 * Fires after menus are added to the menu bar.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'add_admin_bar_menus' );
+		do_action('add_admin_bar_menus');
 	}
 }

src/wp-includes/theme-compat/header.php

Braces +4 added lines, -1 removed lines

@@ -35,7 +35,10 @@
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if ( is_singular() ) {
+	wp_enqueue_script( 'comment-reply' );
+}
+?>
 
 <?php wp_head(); ?>
 </head>

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+	 * @package WordPress
+	 * @subpackage Theme_Compat
+	 * @deprecated 3.0
+	 *
+	 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+	 *
+	 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines

Spacing +5 added lines, -5 removed lines

@@ -9,11 +9,11 @@ 
  */
 _deprecated_file(
 	/* translators: %s: template name */
-	sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ),
+	sprintf(__('Theme without %s'), basename(__FILE__)),
 	'3.0',
 	null,
 	/* translators: %s: template name */
-	sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )
+	sprintf(__('Please include a %s template in your theme.'), basename(__FILE__))
 );
 ?>
 <!DOCTYPE html>
@@ -27,12 +27,12 @@ 
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 
-<?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?>
+<?php if (file_exists(get_stylesheet_directory().'/images/kubrickbgwide.jpg')) { ?>
 <style type="text/css" media="screen">
 
 <?php
 // Checks to see whether it needs a sidebar
-if ( empty($withcomments) && !is_single() ) {
+if (empty($withcomments) && ! is_single()) {
 ?>
 	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
 <?php } else { // No sidebar ?>
@@ -42,7 +42,7 @@ 
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if (is_singular()) wp_enqueue_script('comment-reply'); ?>
 
 <?php wp_head(); ?>
 </head>

src/wp-includes/cron.php

Braces +72 added lines, -47 removed lines

@@ -39,8 +39,9 @@ 
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
-		return false;
+	if ( ! $event ) {
+			return false;
+	}
 
 	$key = md5(serialize($event->args));
 
@@ -73,16 +74,18 @@ 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
-		return false;
+	if ( !isset( $schedules[$recurrence] ) ) {
+			return false;
+	}
 
 	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
 	/** This filter is documented in wp-includes/cron.php */
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
-		return false;
+	if ( ! $event ) {
+			return false;
+	}
 
 	$key = md5(serialize($event->args));
 
@@ -151,10 +154,12 @@ 
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
 	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
+	if ( empty($crons[$timestamp][$hook]) ) {
+			unset( $crons[$timestamp][$hook] );
+	}
+	if ( empty($crons[$timestamp]) ) {
+			unset( $crons[$timestamp] );
+	}
 	_set_cron_array( $crons );
 }
 
@@ -178,8 +183,9 @@ 
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
-		return;
+	if ( empty( $crons ) ) {
+			return;
+	}
 
 	$key = md5( serialize( $args ) );
 	foreach ( $crons as $timestamp => $cron ) {
@@ -201,11 +207,13 @@ 
 function wp_next_scheduled( $hook, $args = array() ) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
-		return false;
+	if ( empty($crons) ) {
+			return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
-			return $timestamp;
+		if ( isset( $cron[$hook][$key] ) ) {
+					return $timestamp;
+		}
 	}
 	return false;
 }
@@ -216,11 +224,13 @@ 
  * @since 2.1.0
  */
 function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
-		$gmt_time = microtime( true );
+	if ( ! $gmt_time ) {
+			$gmt_time = microtime( true );
+	}
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
-		return;
+	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) ) {
+			return;
+	}
 
 	/*
 	 * Get the cron lock, which is a unix timestamp of when the last cron was spawned
@@ -231,21 +241,25 @@ 
 	 */
 	$lock = get_transient('doing_cron');
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
-		$lock = 0;
+	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS ) {
+			$lock = 0;
+	}
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
-		return;
+	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time ) {
+			return;
+	}
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
-		return;
+	if ( !is_array($crons) ) {
+			return;
+	}
 
 	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
-		return;
+	if ( isset($keys[0]) && $keys[0] > $gmt_time ) {
+			return;
+	}
 
 	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
 		if ( ! empty( $_POST ) || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
@@ -311,23 +325,29 @@ 
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
-		return;
+	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) ) {
+			return;
+	}
 
-	if ( false === $crons = _get_cron_array() )
-		return;
+	if ( false === $crons = _get_cron_array() ) {
+			return;
+	}
 
 	$gmt_time = microtime( true );
 	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
-		return;
+	if ( isset($keys[0]) && $keys[0] > $gmt_time ) {
+			return;
+	}
 
 	$schedules = wp_get_schedules();
 	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
+		if ( $timestamp > $gmt_time ) {
+			break;
+		}
 		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
-				continue;
+			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) ) {
+							continue;
+			}
 			spawn_cron( $gmt_time );
 			break 2;
 		}
@@ -392,11 +412,13 @@ 
 function wp_get_schedule($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
-		return false;
+	if ( empty($crons) ) {
+			return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
-			return $cron[$hook][$key]['schedule'];
+		if ( isset( $cron[$hook][$key] ) ) {
+					return $cron[$hook][$key]['schedule'];
+		}
 	}
 	return false;
 }
@@ -415,11 +437,13 @@ 
  */
 function _get_cron_array()  {
 	$cron = get_option('cron');
-	if ( ! is_array($cron) )
-		return false;
+	if ( ! is_array($cron) ) {
+			return false;
+	}
 
-	if ( !isset($cron['version']) )
-		$cron = _upgrade_cron_array($cron);
+	if ( !isset($cron['version']) ) {
+			$cron = _upgrade_cron_array($cron);
+	}
 
 	unset($cron['version']);
 
@@ -451,8 +475,9 @@ 
  * @return array An upgraded Cron info array.
  */
 function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
-		return $cron;
+	if ( isset($cron['version']) && 2 == $cron['version']) {
+			return $cron;
+	}
 
 	$new_cron = array();
 

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * WordPress CRON API
- *
- * @package WordPress
- */
+	 * WordPress CRON API
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Schedules a hook to run only once.

Spacing +98 added lines, -98 removed lines

@@ -20,20 +20,20 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
+function wp_schedule_single_event($timestamp, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	// Don't schedule a duplicate if there's already an identical event due within 10 minutes of it
 	$next = wp_next_scheduled($hook, $args);
-	if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
+	if ($next && abs($next - $timestamp) <= 10 * MINUTE_IN_SECONDS) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args);
 	/**
 	 * Filter a single event before it is scheduled.
 	 *
@@ -41,17 +41,17 @@ 
 	 *
 	 * @param object $event An object containing an event's data.
 	 */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -74,31 +74,31 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+function wp_schedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
+	if ( ! isset($schedules[$recurrence]))
 		return false;
 
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval']);
 	/** This filter is documented in wp-includes/cron.php */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -112,39 +112,39 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
+function wp_reschedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
-	$key = md5( serialize( $args ) );
+	$key = md5(serialize($args));
 	$interval = 0;
 
 	// First we try to get it from the schedule
-	if ( isset( $schedules[ $recurrence ] ) ) {
-		$interval = $schedules[ $recurrence ]['interval'];
+	if (isset($schedules[$recurrence])) {
+		$interval = $schedules[$recurrence]['interval'];
 	}
 	// Now we try to get it from the saved interval in case the schedule disappears
-	if ( 0 == $interval ) {
-		$interval = $crons[ $timestamp ][ $hook ][ $key ]['interval'];
+	if (0 == $interval) {
+		$interval = $crons[$timestamp][$hook][$key]['interval'];
 	}
 	// Now we assume something is wrong and fail to schedule
-	if ( 0 == $interval ) {
+	if (0 == $interval) {
 		return false;
 	}
 
 	$now = time();
 
-	if ( $timestamp >= $now ) {
+	if ($timestamp >= $now) {
 		$timestamp = $now + $interval;
 	} else {
-		$timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
+		$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 	}
 
-	wp_schedule_event( $timestamp, $recurrence, $hook, $args );
+	wp_schedule_event($timestamp, $recurrence, $hook, $args);
 }
 
 /**
@@ -163,20 +163,20 @@ 
  * as those used when originally scheduling the event.
  * @return false|void False when an event is not unscheduled.
  */
-function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+function wp_unschedule_event($timestamp, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
-	_set_cron_array( $crons );
+	unset($crons[$timestamp][$hook][$key]);
+	if (empty($crons[$timestamp][$hook]))
+		unset($crons[$timestamp][$hook]);
+	if (empty($crons[$timestamp]))
+		unset($crons[$timestamp]);
+	_set_cron_array($crons);
 }
 
 /**
@@ -187,25 +187,25 @@ 
  * @param string $hook Action hook, the execution of which will be unscheduled.
  * @param array $args Optional. Arguments that were to be pass to the hook's callback function.
  */
-function wp_clear_scheduled_hook( $hook, $args = array() ) {
+function wp_clear_scheduled_hook($hook, $args = array()) {
 	// Backward compatibility
 	// Previously this function took the arguments as discrete vars rather than an array like the rest of the API
-	if ( !is_array($args) ) {
-		_deprecated_argument( __FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
-		$args = array_slice( func_get_args(), 1 );
+	if ( ! is_array($args)) {
+		_deprecated_argument(__FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.'));
+		$args = array_slice(func_get_args(), 1);
 	}
 
 	// This logic duplicates wp_next_scheduled()
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
+	if (empty($crons))
 		return;
 
-	$key = md5( serialize( $args ) );
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[ $hook ][ $key ] ) ) {
-			wp_unschedule_event( $timestamp, $hook, $args );
+	$key = md5(serialize($args));
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key])) {
+			wp_unschedule_event($timestamp, $hook, $args);
 		}
 	}
 }
@@ -219,13 +219,13 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|int The UNIX timestamp of the next time the scheduled event will occur.
  */
-function wp_next_scheduled( $hook, $args = array() ) {
+function wp_next_scheduled($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $timestamp;
 	}
 	return false;
@@ -238,11 +238,11 @@ 
  *
  * @param int $gmt_time Optional. Unix timestamp. Default 0 (current time is used).
  */
-function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
-		$gmt_time = microtime( true );
+function spawn_cron($gmt_time = 0) {
+	if ( ! $gmt_time)
+		$gmt_time = microtime(true);
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
+	if (defined('DOING_CRON') || isset($_GET['doing_wp_cron']))
 		return;
 
 	/*
@@ -254,45 +254,45 @@ 
 	 */
 	$lock = get_transient('doing_cron');
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
+	if ($lock > $gmt_time + 10 * MINUTE_IN_SECONDS)
 		$lock = 0;
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
+	if ($lock + WP_CRON_LOCK_TIMEOUT > $gmt_time)
 		return;
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
+	if ( ! is_array($crons))
 		return;
 
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
-	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
-		if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
+	if (defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON) {
+		if ('GET' !== $_SERVER['REQUEST_METHOD'] || defined('DOING_AJAX') || defined('XMLRPC_REQUEST')) {
 			return;
 		}
 
-		$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-		set_transient( 'doing_cron', $doing_wp_cron );
+		$doing_wp_cron = sprintf('%.22F', $gmt_time);
+		set_transient('doing_cron', $doing_wp_cron);
 
 		ob_start();
-		wp_redirect( add_query_arg( 'doing_wp_cron', $doing_wp_cron, wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		wp_redirect(add_query_arg('doing_wp_cron', $doing_wp_cron, wp_unslash($_SERVER['REQUEST_URI'])));
 		echo ' ';
 
 		// flush any buffers and send the headers
-		while ( @ob_end_flush() );
+		while (@ob_end_flush());
 		flush();
 
-		WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
+		WP_DEBUG ? include_once(ABSPATH.'wp-cron.php') : @include_once(ABSPATH.'wp-cron.php');
 		return;
 	}
 
 	// Set the cron lock with the current unix timestamp, when the cron is being spawned.
-	$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-	set_transient( 'doing_cron', $doing_wp_cron );
+	$doing_wp_cron = sprintf('%.22F', $gmt_time);
+	set_transient('doing_cron', $doing_wp_cron);
 
 	/**
 	 * Filter the cron request arguments.
@@ -315,18 +315,18 @@ 
 	 * }
 	 * @param string $doing_wp_cron The unix timestamp of the cron lock.
 	 */
-	$cron_request = apply_filters( 'cron_request', array(
-		'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
+	$cron_request = apply_filters('cron_request', array(
+		'url'  => add_query_arg('doing_wp_cron', $doing_wp_cron, site_url('wp-cron.php')),
 		'key'  => $doing_wp_cron,
 		'args' => array(
 			'timeout'   => 0.01,
 			'blocking'  => false,
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			'sslverify' => apply_filters( 'https_local_ssl_verify', false )
+			'sslverify' => apply_filters('https_local_ssl_verify', false)
 		)
-	), $doing_wp_cron );
+	), $doing_wp_cron);
 
-	wp_remote_post( $cron_request['url'], $cron_request['args'] );
+	wp_remote_post($cron_request['url'], $cron_request['args']);
 }
 
 /**
@@ -336,24 +336,24 @@ 
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
+	if (strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON))
 		return;
 
-	if ( false === $crons = _get_cron_array() )
+	if (false === $crons = _get_cron_array())
 		return;
 
-	$gmt_time = microtime( true );
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$gmt_time = microtime(true);
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
 	$schedules = wp_get_schedules();
-	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
-		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
+	foreach ($crons as $timestamp => $cronhooks) {
+		if ($timestamp > $gmt_time) break;
+		foreach ((array) $cronhooks as $hook => $args) {
+			if (isset($schedules[$hook]['callback']) && ! call_user_func($schedules[$hook]['callback']))
 				continue;
-			spawn_cron( $gmt_time );
+			spawn_cron($gmt_time);
 			break 2;
 		}
 	}
@@ -391,9 +391,9 @@ 
  */
 function wp_get_schedules() {
 	$schedules = array(
-		'hourly'     => array( 'interval' => HOUR_IN_SECONDS,      'display' => __( 'Once Hourly' ) ),
-		'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
-		'daily'      => array( 'interval' => DAY_IN_SECONDS,       'display' => __( 'Once Daily' ) ),
+		'hourly'     => array('interval' => HOUR_IN_SECONDS, 'display' => __('Once Hourly')),
+		'twicedaily' => array('interval' => 12 * HOUR_IN_SECONDS, 'display' => __('Twice Daily')),
+		'daily'      => array('interval' => DAY_IN_SECONDS, 'display' => __('Once Daily')),
 	);
 	/**
 	 * Filter the non-default cron schedules.
@@ -402,7 +402,7 @@ 
 	 *
 	 * @param array $new_schedules An array of non-default cron schedules. Default empty.
 	 */
-	return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
+	return array_merge(apply_filters('cron_schedules', array()), $schedules);
 }
 
 /**
@@ -417,10 +417,10 @@ 
 function wp_get_schedule($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $cron[$hook][$key]['schedule'];
 	}
 	return false;
@@ -438,12 +438,12 @@ 
  *
  * @return false|array CRON info array.
  */
-function _get_cron_array()  {
+function _get_cron_array() {
 	$cron = get_option('cron');
-	if ( ! is_array($cron) )
+	if ( ! is_array($cron))
 		return false;
 
-	if ( !isset($cron['version']) )
+	if ( ! isset($cron['version']))
 		$cron = _upgrade_cron_array($cron);
 
 	unset($cron['version']);
@@ -461,7 +461,7 @@ 
  */
 function _set_cron_array($cron) {
 	$cron['version'] = 2;
-	update_option( 'cron', $cron );
+	update_option('cron', $cron);
 }
 
 /**
@@ -476,19 +476,19 @@ 
  * @return array An upgraded Cron info array.
  */
 function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
+	if (isset($cron['version']) && 2 == $cron['version'])
 		return $cron;
 
 	$new_cron = array();
 
-	foreach ( (array) $cron as $timestamp => $hooks) {
-		foreach ( (array) $hooks as $hook => $args ) {
+	foreach ((array) $cron as $timestamp => $hooks) {
+		foreach ((array) $hooks as $hook => $args) {
 			$key = md5(serialize($args['args']));
 			$new_cron[$timestamp][$hook][$key] = $args;
 		}
 	}
 
 	$new_cron['version'] = 2;
-	update_option( 'cron', $new_cron );
+	update_option('cron', $new_cron);
 	return $new_cron;
 }

src/wp-includes/feed-rss2-comments.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * RSS2 Feed Template for displaying RSS2 Comments feed.
- *
- * @package WordPress
- */
+	 * RSS2 Feed Template for displaying RSS2 Comments feed.
+	 *
+	 * @package WordPress
+	 */
 
 header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
 

Spacing +18 added lines, -18 removed lines

@@ -5,12 +5,12 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rss2').'; charset='.get_option('blog_charset'), true);
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'rss2-comments' );
+do_action('rss_tag_pre', 'rss2-comments');
 ?>
 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -19,7 +19,7 @@ 
 	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
-	do_action( 'rss2_ns' );
+	do_action('rss2_ns');
 	?>
 
 	<?php
@@ -28,17 +28,17 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'rss2_comments_ns' );
+	do_action('rss2_comments_ns');
 	?>
 >
 <channel>
 	<title><?php
-		if ( is_singular() )
-			printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
-		elseif ( is_search() )
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+		if (is_singular())
+			printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
+		elseif (is_search())
+			printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss('name'), get_search_query());
 		else
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+			printf(ent2ncr(__('Comments for %s')), get_wp_title_rss());
 	?></title>
 	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
 	<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
@@ -46,11 +46,11 @@ 
 	<lastBuildDate><?php echo mysql2date('r', get_lastcommentmodified('GMT')); ?></lastBuildDate>
 	<sy:updatePeriod><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_period', 'hourly' );
+		echo apply_filters('rss_update_period', 'hourly');
 	?></sy:updatePeriod>
 	<sy:updateFrequency><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_frequency', '1' );
+		echo apply_filters('rss_update_frequency', '1');
 	?></sy:updateFrequency>
 	<?php
 	/**
@@ -58,17 +58,17 @@ 
 	 *
 	 * @since 2.3.0
 	 */
-	do_action( 'commentsrss2_head' );
+	do_action('commentsrss2_head');
 
-	if ( have_comments() ) : while ( have_comments() ) : the_comment();
-		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
+	if (have_comments()) : while (have_comments()) : the_comment();
+		$comment_post = $GLOBALS['post'] = get_post($comment->comment_post_ID);
 	?>
 	<item>
 		<title><?php
-			if ( !is_singular() ) {
+			if ( ! is_singular()) {
 				$title = get_the_title($comment_post->ID);
 				/** This filter is documented in wp-includes/feed.php */
-				$title = apply_filters( 'the_title_rss', $title );
+				$title = apply_filters('the_title_rss', $title);
 				printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
 			} else {
 				printf(ent2ncr(__('By: %s')), get_comment_author_rss());
@@ -78,7 +78,7 @@ 
 		<dc:creator><![CDATA[<?php echo get_comment_author_rss() ?>]]></dc:creator>
 		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true, false), false); ?></pubDate>
 		<guid isPermaLink="false"><?php comment_guid() ?></guid>
-<?php if ( post_password_required($comment_post) ) : ?>
+<?php if (post_password_required($comment_post)) : ?>
 		<description><?php echo ent2ncr(__('Protected Comments: Please enter your password to view comments.')); ?></description>
 		<content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
 <?php else : // post pass ?>
@@ -93,7 +93,7 @@ 
 	 * @param int $comment->comment_ID The ID of the comment being displayed.
 	 * @param int $comment_post->ID    The ID of the post the comment is connected to.
 	 */
-	do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
+	do_action('commentrss2_item', $comment->comment_ID, $comment_post->ID);
 ?>
 	</item>
 <?php endwhile; endif; ?>

Braces +12 added lines, -8 removed lines

@@ -33,12 +33,13 @@ 
 >
 <channel>
 	<title><?php
-		if ( is_singular() )
-			printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
-		elseif ( is_search() )
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
-		else
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+		if ( is_singular() ) {
+					printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
+		} elseif ( is_search() ) {
+					printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+		} else {
+					printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+		}
 	?></title>
 	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
 	<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
@@ -81,10 +82,13 @@ 
 <?php if ( post_password_required($comment_post) ) : ?>
 		<description><?php echo ent2ncr(__('Protected Comments: Please enter your password to view comments.')); ?></description>
 		<content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
-<?php else : // post pass ?>
+<?php else {
+	: // post pass ?>
 		<description><![CDATA[<?php comment_text_rss() ?>]]></description>
 		<content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-<?php endif; // post pass
+<?php endif;
+}
+// post pass
 	/**
 	 * Fires at the end of each RSS2 comment feed item.
 	 *

src/wp-includes/ms-default-constants.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Defines constants and global variables that can be overridden, generally in wp-config.php.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Defines constants and global variables that can be overridden, generally in wp-config.php.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 /**
  * Defines Multisite upload constants.

Braces +27 added lines, -19 removed lines

@@ -23,12 +23,14 @@ 
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
 	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
-		return;
+	if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+			return;
+	}
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	if ( !defined( 'UPLOADBLOGSDIR' ) ) {
+			define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	}
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
@@ -36,8 +38,9 @@ 
 		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
+					define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		}
 	}
 }
 
@@ -52,14 +55,16 @@ 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_site->path );
+	if ( !defined( 'COOKIEPATH' ) ) {
+			define( 'COOKIEPATH', $current_site->path );
+	}
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_site->path );
+	if ( !defined( 'SITECOOKIEPATH' ) ) {
+			define( 'SITECOOKIEPATH', $current_site->path );
+	}
 
 	/**
 	 * @since 2.6.0
@@ -76,10 +81,11 @@ 
 	 * @since 2.0.0
 	 */
 	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_site->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
-		else
-			define('COOKIE_DOMAIN', '.' . $current_site->domain);
+		if ( !empty( $current_site->cookie_domain ) ) {
+					define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+		} else {
+					define('COOKIE_DOMAIN', '.' . $current_site->domain);
+		}
 	}
 }
 
@@ -96,16 +102,18 @@ 
 	 * Optional support for X-Sendfile header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
-		define( 'WPMU_SENDFILE', false );
+	if ( !defined( 'WPMU_SENDFILE' ) ) {
+			define( 'WPMU_SENDFILE', false );
+	}
 
 	/**
 	 * Optional support for X-Accel-Redirect header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
-		define( 'WPMU_ACCEL_REDIRECT', false );
-}
+	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) ) {
+			define( 'WPMU_ACCEL_REDIRECT', false );
+	}
+	}
 
 /**
  * Defines Multisite subdomain constants and handles warnings and notices.

Spacing +38 added lines, -38 removed lines

@@ -21,23 +21,23 @@ 
 	global $wpdb;
 
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
-	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
+	add_filter('default_site_option_ms_files_rewriting', '__return_true');
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
+	if ( ! get_site_option('ms_files_rewriting'))
 		return;
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	if ( ! defined('UPLOADBLOGSDIR'))
+		define('UPLOADBLOGSDIR', 'wp-content/blogs.dir');
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
-	if ( ! defined( 'UPLOADS' ) ) {
-		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+	if ( ! defined('UPLOADS')) {
+		define('UPLOADS', UPLOADBLOGSDIR."/{$wpdb->blogid}/files/");
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ('wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined('BLOGUPLOADDIR'))
+			define('BLOGUPLOADDIR', WP_CONTENT_DIR."/blogs.dir/{$wpdb->blogid}/files/");
 	}
 }
 
@@ -52,34 +52,34 @@ 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_site->path );
+	if ( ! defined('COOKIEPATH'))
+		define('COOKIEPATH', $current_site->path);
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_site->path );
+	if ( ! defined('SITECOOKIEPATH'))
+		define('SITECOOKIEPATH', $current_site->path);
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
-		if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+	if ( ! defined('ADMIN_COOKIE_PATH')) {
+		if ( ! is_subdomain_install() || trim(parse_url(get_option('siteurl'), PHP_URL_PATH), '/')) {
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH);
 		} else {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH.'wp-admin');
 		}
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_site->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+	if ( ! defined('COOKIE_DOMAIN') && is_subdomain_install()) {
+		if ( ! empty($current_site->cookie_domain))
+			define('COOKIE_DOMAIN', '.'.$current_site->cookie_domain);
 		else
-			define('COOKIE_DOMAIN', '.' . $current_site->domain);
+			define('COOKIE_DOMAIN', '.'.$current_site->domain);
 	}
 }
 
@@ -96,15 +96,15 @@ 
 	 * Optional support for X-Sendfile header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
-		define( 'WPMU_SENDFILE', false );
+	if ( ! defined('WPMU_SENDFILE'))
+		define('WPMU_SENDFILE', false);
 
 	/**
 	 * Optional support for X-Accel-Redirect header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
-		define( 'WPMU_ACCEL_REDIRECT', false );
+	if ( ! defined('WPMU_ACCEL_REDIRECT'))
+		define('WPMU_ACCEL_REDIRECT', false);
 }
 
 /**
@@ -124,41 +124,41 @@ 
 	static $subdomain_error = null;
 	static $subdomain_error_warn = null;
 
-	if ( false === $subdomain_error ) {
+	if (false === $subdomain_error) {
 		return;
 	}
 
-	if ( $subdomain_error ) {
+	if ($subdomain_error) {
 		$vhost_deprecated = sprintf(
 			/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
-			__( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+			__('The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.'),
 			'<code>VHOST</code>',
 			'<code>SUBDOMAIN_INSTALL</code>',
 			'<code>wp-config.php</code>',
 			'<code>is_subdomain_install()</code>'
 		);
-		if ( $subdomain_error_warn ) {
-			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
+		if ($subdomain_error_warn) {
+			trigger_error(__('<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.').' '.$vhost_deprecated, E_USER_WARNING);
 		} else {
-	 		_deprecated_argument( 'define()', '3.0', $vhost_deprecated );
+	 		_deprecated_argument('define()', '3.0', $vhost_deprecated);
 		}
 		return;
 	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
+	if (defined('SUBDOMAIN_INSTALL') && defined('VHOST')) {
 		$subdomain_error = true;
-		if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+		if (SUBDOMAIN_INSTALL !== ('yes' == VHOST)) {
 			$subdomain_error_warn = true;
 		}
-	} elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+	} elseif (defined('SUBDOMAIN_INSTALL')) {
 		$subdomain_error = false;
-		define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
-	} elseif ( defined( 'VHOST' ) ) {
+		define('VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no');
+	} elseif (defined('VHOST')) {
 		$subdomain_error = true;
-		define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
+		define('SUBDOMAIN_INSTALL', 'yes' == VHOST);
 	} else {
 		$subdomain_error = false;
-		define( 'SUBDOMAIN_INSTALL', false );
-		define( 'VHOST', 'no' );
+		define('SUBDOMAIN_INSTALL', false);
+		define('VHOST', 'no');
 	}
 }

src/wp-includes/deprecated.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Deprecated functions from past WordPress versions. You shouldn't use these
- * functions and look for the alternatives instead. The functions will be
- * removed in a later version.
- *
- * @package WordPress
- * @subpackage Deprecated
- */
+	 * Deprecated functions from past WordPress versions. You shouldn't use these
+	 * functions and look for the alternatives instead. The functions will be
+	 * removed in a later version.
+	 *
+	 * @package WordPress
+	 * @subpackage Deprecated
+	 */
 
 /*
  * Deprecated functions come here to die.

Doc Comments +6 added lines, -7 removed lines

@@ -610,7 +610,7 @@ 
  * @param string $feed_image
  * @param string $exclude
  * @param bool $hierarchical
- * @return false|null
+ * @return false|string
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
 				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
@@ -630,7 +630,7 @@ 
  * @see wp_list_categories()
  *
  * @param string|array $args
- * @return false|null|string
+ * @return false|string
  */
 function wp_list_cats($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
@@ -780,7 +780,7 @@ 
  * @param bool $echo
  * @param int $author_id
  * @param string $author_nicename Optional.
- * @return string|null
+ * @return string
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
 	_deprecated_function( __FUNCTION__, '2.1', 'get_author_posts_url()' );
@@ -1602,7 +1602,7 @@ 
  * @deprecated 2.8.0 Use get_the_author_meta()
  * @see get_the_author_meta()
  *
- * @return string|int The author's ID.
+ * @return string The author's ID.
  */
 function get_the_author_ID() {
 	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
@@ -2101,7 +2101,6 @@ 
  * @param string|int $name            Widget ID.
  * @param callable   $output_callback Run when widget is called.
  * @param string     $classname       Optional. Classname widget option. Default empty.
- * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
@@ -2419,7 +2418,7 @@ 
  * @see count_user_posts()
  *
  * @param int $userid User to count posts for.
- * @return int Number of posts the given user has written.
+ * @return string Number of posts the given user has written.
  */
 function get_usernumposts( $userid ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'count_user_posts()' );
@@ -3600,7 +3599,7 @@ 
  * @deprecated 4.4.0 Use get_permalink()
  * @see get_permalink()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
 function post_permalink( $post_id = 0 ) {

Spacing +525 added lines, -525 removed lines

@@ -23,11 +23,11 @@ 
  * @return array Post data.
  */
 function get_postdata($postid) {
-	_deprecated_function( __FUNCTION__, '1.5.1', 'get_post()' );
+	_deprecated_function(__FUNCTION__, '1.5.1', 'get_post()');
 
 	$post = get_post($postid);
 
-	$postdata = array (
+	$postdata = array(
 		'ID' => $post->ID,
 		'Author_ID' => $post->post_author,
 		'Date' => $post->post_date,
@@ -61,12 +61,12 @@ 
 function start_wp() {
 	global $wp_query;
 
-	_deprecated_function( __FUNCTION__, '1.5', __('new WordPress Loop') );
+	_deprecated_function(__FUNCTION__, '1.5', __('new WordPress Loop'));
 
 	// Since the old style loop is being used, advance the query iterator here.
 	$wp_query->next_post();
 
-	setup_postdata( get_post() );
+	setup_postdata(get_post());
 }
 
 /**
@@ -80,13 +80,13 @@ 
  * @return int Category ID.
  */
 function the_category_ID($echo = true) {
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
+	if ($echo)
 		echo $cat;
 
 	return $cat;
@@ -102,15 +102,15 @@ 
  * @param string $before Optional. Text to display before the category. Default empty.
  * @param string $after  Optional. Text to display after the category. Default empty.
  */
-function the_category_head( $before = '', $after = '' ) {
+function the_category_head($before = '', $after = '') {
 	global $currentcat, $previouscat;
 
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category_by_ID()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
+	if ($currentcat != $previouscat) {
 		echo $before;
 		echo get_the_category_by_ID($currentcat);
 		echo $after;
@@ -132,22 +132,22 @@ 
  * @param int    $limitprev
  * @param string $excluded_categories
  */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
+function previous_post($format = '%', $previous = 'previous post: ', $title = 'yes', $in_same_cat = 'no', $limitprev = 1, $excluded_categories = '') {
 
-	_deprecated_function( __FUNCTION__, '2.0', 'previous_post_link()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'previous_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -168,21 +168,21 @@ 
  * @param int $limitnext
  * @param string $excluded_categories
  */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function( __FUNCTION__, '2.0', 'next_post_link()' );
+function next_post($format = '%', $next = 'next post: ', $title = 'yes', $in_same_cat = 'no', $limitnext = 1, $excluded_categories = '') {
+	_deprecated_function(__FUNCTION__, '2.0', 'next_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -202,7 +202,7 @@ 
  * @return bool
  */
 function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level > 1);
@@ -221,7 +221,7 @@ 
  * @return bool
  */
 function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level >= 1);
@@ -240,15 +240,15 @@ 
  * @return bool
  */
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	$post = get_post($post_id);
 	$post_author_data = get_userdata($post->post_author);
 
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
+	if ((($user_id == $post_author_data->ID) && ! ($post->post_status == 'publish' && $author_data->user_level < 2))
 			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
+			 || ($author_data->user_level >= 10)) {
 		return true;
 	} else {
 		return false;
@@ -268,7 +268,7 @@ 
  * @return bool
  */
 function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit, one can delete
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -287,7 +287,7 @@ 
  * @return bool
  */
 function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
@@ -306,7 +306,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's date
  */
 function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
@@ -325,7 +325,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's comments
  */
 function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit a post, one can edit comments made on it
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -344,7 +344,7 @@ 
  * @return bool returns true if $user_id can delete $post_id's comments
  */
 function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit comments, one can delete comments
 	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
@@ -362,11 +362,11 @@ 
  * @return bool
  */
 function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+	if ($user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID)
 		return true;
 	else
 		return false;
@@ -395,11 +395,11 @@ 
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
 						 $show_description = true, $show_rating = false,
 						 $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
@@ -430,7 +430,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -454,12 +454,12 @@ 
  * @param int $limit Limit to X entries. If not specified, all entries are shown.
  * @return array
  */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+function get_linkobjectsbyname($cat_name = "noname", $orderby = 'name', $limit = -1) {
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	return get_linkobjects($cat_id, $orderby, $limit);
@@ -506,9 +506,9 @@ 
  * @return array
  */
 function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
-	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+	$links = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'limit' => $limit));
 
 	$links_array = array();
 	foreach ($links as $link)
@@ -539,7 +539,7 @@ 
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
 									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -566,7 +566,7 @@ 
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
 							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -581,7 +581,7 @@ 
  * @return int Only returns 0.
  */
 function get_autotoggle($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1' );
+	_deprecated_function(__FUNCTION__, '2.1');
 	return 0;
 }
 
@@ -613,9 +613,9 @@ 
  * @return false|null
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
-				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
-				   $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=false) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
+				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children = false, $child_of = 0, $categories = 0,
+				   $recurse = 0, $feed = '', $feed_image = '', $exclude = '', $hierarchical = false) {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_categories()');
 
 	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -633,22 +633,22 @@ 
  * @return false|null|string
  */
 function wp_list_cats($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_categories()');
 
-	$r = wp_parse_args( $args );
+	$r = wp_parse_args($args);
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
+	if (isset($r['optionall']) && isset($r['all']))
 		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
+	if (isset($r['sort_column']))
 		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
+	if (isset($r['sort_order']))
 		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
+	if (isset($r['optiondates']))
 		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
+	if (isset($r['optioncount']))
 		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
+	if (isset($r['list']))
 		$r['style'] = $r['list'] ? 'list' : 'break';
 	$r['title_li'] = '';
 
@@ -677,14 +677,14 @@ 
 function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
 		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
 		$selected = 0, $exclude = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_dropdown_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_dropdown_categories()');
 
 	$show_option_all = '';
-	if ( $optionall )
+	if ($optionall)
 		$show_option_all = $all;
 
 	$show_option_none = '';
-	if ( $optionnone )
+	if ($optionnone)
 		$show_option_none = __('None');
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
@@ -709,7 +709,7 @@ 
  * @return null|string
  */
 function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_authors()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_authors()');
 
 	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
 	return wp_list_authors($args);
@@ -727,7 +727,7 @@ 
  * @return array
  */
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_get_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_get_post_categories()');
 	return wp_get_post_categories($post_ID);
 }
 
@@ -745,7 +745,7 @@ 
  * @return bool|mixed
  */
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_set_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_set_post_categories()');
 	return wp_set_post_categories($post_ID, $post_categories);
 }
 
@@ -764,8 +764,8 @@ 
  * @param bool $show_post_count
  * @return string|null
  */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_get_archives()' );
+function get_archives($type = '', $limit = '', $format = 'html', $before = '', $after = '', $show_post_count = false) {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_get_archives()');
 	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 	return wp_get_archives($args);
 }
@@ -783,11 +783,11 @@ 
  * @return string|null
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_author_posts_url()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_author_posts_url()');
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -808,9 +808,9 @@ 
  * @param string $more_file
  * @return string
  */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_link_pages()' );
+function link_pages($before = '<br />', $after = '<br />', $next_or_number = 'number', $nextpagelink = 'next page', $previouspagelink = 'previous page',
+					$pagelink = '%', $more_file = '') {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_link_pages()');
 
 	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 	return wp_link_pages($args);
@@ -827,7 +827,7 @@ 
  * @return string
  */
 function get_settings($option) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_option()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_option()');
 
 	return get_option($option);
 }
@@ -840,7 +840,7 @@ 
  * @see the_permalink()
  */
 function permalink_link() {
-	_deprecated_function( __FUNCTION__, '1.2', 'the_permalink()' );
+	_deprecated_function(__FUNCTION__, '1.2', 'the_permalink()');
 	the_permalink();
 }
 
@@ -854,7 +854,7 @@ 
  * @param string $deprecated
  */
 function permalink_single_rss($deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.3', 'the_permalink_rss()' );
+	_deprecated_function(__FUNCTION__, '2.3', 'the_permalink_rss()');
 	the_permalink_rss();
 }
 
@@ -869,11 +869,11 @@ 
  * @return null|string
  */
 function wp_get_links($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
 
-	if ( strpos( $args, '=' ) === false ) {
+	if (strpos($args, '=') === false) {
 		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
+		$args = add_query_arg('category', $cat_id, $args);
 	}
 
 	$defaults = array(
@@ -892,7 +892,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -923,81 +923,81 @@ 
  */
 function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
 			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if (substr($orderby, 0, 1) == '_') {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ($category == -1) //get_bookmarks uses '' to signify all categories
 		$category = '';
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
+	if ( ! $results)
 		return;
 
 	$output = '';
 
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
+	foreach ((array) $results as $row) {
+		if ( ! isset($row->recently_updated))
 			$row->recently_updated = false;
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_prepend');
 		$the_link = '#';
-		if ( !empty($row->link_url) )
+		if ( ! empty($row->link_url))
 			$the_link = esc_url($row->link_url);
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ('' != $rel)
+			$rel = ' rel="'.$rel.'"';
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
+		if ($show_updated)
 			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+				$title .= ' ('.__('Last updated').' '.date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)).')';
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ('' != $title)
+			$title = ' title="'.$title.'"';
 
-		$alt = ' alt="' . $name . '"';
+		$alt = ' alt="'.$name.'"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ('' != $target)
+			$target = ' target="'.$target.'"';
 
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+		if ($row->link_image != null && $show_images) {
+			if (strpos($row->link_image, 'http') !== false)
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$row->link_image\" $alt $title />";
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_append');
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ($show_description && '' != $desc)
+			$output .= $between.$desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
+			$output .= $between.get_linkrating($row);
 		}
 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
+	if ( ! $echo)
 		return $output;
 	echo $output;
 }
@@ -1015,29 +1015,29 @@ 
  * @param string $order Sort link categories by 'name' or 'id'
  */
 function get_links_list($order = 'name') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
 
 	$order = strtolower($order);
 
 	// Handle link category sorting
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ('_' == substr($order, 0, 1)) {
 		$direction = 'DESC';
-		$order = substr($order,1);
+		$order = substr($order, 1);
 	}
 
-	if ( !isset($direction) )
+	if ( ! isset($direction))
 		$direction = '';
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
 	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
+	if ($cats) {
+		foreach ((array) $cats as $cat) {
 			// Handle each category.
 
 			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+			echo '  <li id="linkcat-'.$cat->term_id.'" class="linkcat"><h2>'.apply_filters('link_category', $cat->name)."</h2>\n\t<ul>\n";
 			// Call get_links() with all the appropriate params
 			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
 
@@ -1059,8 +1059,8 @@ 
  * @param string $file the page to open in the popup window
  * @param bool $count the number of links in the db
  */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function( __FUNCTION__, '2.1' );
+function links_popup_script($text = 'Links', $width = 400, $height = 400, $file = 'links.all.php', $count = true) {
+	_deprecated_function(__FUNCTION__, '2.1');
 }
 
 /**
@@ -1073,8 +1073,8 @@ 
  * @param object $link Link object.
  * @return mixed Value of the 'link_rating' field, false otherwise.
  */
-function get_linkrating( $link ) {
-	_deprecated_function( __FUNCTION__, '2.1', 'sanitize_bookmark_field()' );
+function get_linkrating($link) {
+	_deprecated_function(__FUNCTION__, '2.1', 'sanitize_bookmark_field()');
 	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
 }
 
@@ -1089,16 +1089,16 @@ 
  * @return string
  */
 function get_linkcatname($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_category()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_category()');
 
 	$id = (int) $id;
 
-	if ( empty($id) )
+	if (empty($id))
 		return '';
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
+	if (empty($cats) || ! is_array($cats))
 		return '';
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
@@ -1117,7 +1117,7 @@ 
  * @param string $link_text
  */
 function comments_rss_link($link_text = 'Comments RSS') {
-	_deprecated_function( __FUNCTION__, '2.5', 'post_comments_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'post_comments_feed_link()');
 	post_comments_feed_link($link_text);
 }
 
@@ -1133,11 +1133,11 @@ 
  * @return string
  */
 function get_category_rss_link($echo = false, $cat_ID = 1) {
-	_deprecated_function( __FUNCTION__, '2.5', 'get_category_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'get_category_feed_link()');
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1154,10 +1154,10 @@ 
  * @return string
  */
 function get_author_rss_link($echo = false, $author_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.5', 'get_author_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'get_author_feed_link()');
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1172,8 +1172,8 @@ 
  * @return string
  */
 function comments_rss() {
-	_deprecated_function( __FUNCTION__, '2.2', 'get_post_comments_feed_link()' );
-	return esc_url( get_post_comments_feed_link() );
+	_deprecated_function(__FUNCTION__, '2.2', 'get_post_comments_feed_link()');
+	return esc_url(get_post_comments_feed_link());
 }
 
 /**
@@ -1189,7 +1189,7 @@ 
  * @return int The new user's ID.
  */
 function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0', 'wp_create_user()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'wp_create_user()');
 	return wp_create_user($username, $password, $email);
 }
 
@@ -1199,7 +1199,7 @@ 
  * @deprecated 2.5.0
  */
 function gzip_compression() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function(__FUNCTION__, '2.5');
 	return false;
 }
 
@@ -1215,8 +1215,8 @@ 
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7', 'get_comment()' );
+function get_commentdata($comment_ID, $no_cache = 0, $include_unapproved = false) {
+	_deprecated_function(__FUNCTION__, '2.7', 'get_comment()');
 	return get_comment($comment_ID, ARRAY_A);
 }
 
@@ -1230,9 +1230,9 @@ 
  * @param int $cat_ID Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+function get_catname($cat_ID) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_cat_name()');
+	return get_cat_name($cat_ID);
 }
 
 /**
@@ -1248,25 +1248,25 @@ 
  * @param array $visited Optional. Category Term IDs that have already been added.
  * @return string
  */
-function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_term_children()' );
-	if ( 0 == $id )
+function get_category_children($id, $before = '/', $after = '', $visited = array()) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_term_children()');
+	if (0 == $id)
 		return '';
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
-	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
+	foreach ((array) $cat_ids as $cat_id) {
+		if ($cat_id == $id)
 			continue;
 
-		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
+		$category = get_category($cat_id);
+		if (is_wp_error($category))
 			return $category;
-		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
+		if ($category->parent == $id && ! in_array($category->term_id, $visited)) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
-			$chain .= get_category_children( $category->term_id, $before, $after );
+			$chain .= get_category_children($category->term_id, $before, $after);
 		}
 	}
 	return $chain;
@@ -1284,11 +1284,11 @@ 
  * @return object List of all of the category IDs.
  */
 function get_all_category_ids() {
-	_deprecated_function( __FUNCTION__, '4.0', 'get_terms()' );
+	_deprecated_function(__FUNCTION__, '4.0', 'get_terms()');
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
+	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category')) {
+		$cat_ids = get_terms('category', array('fields' => 'ids', 'get' => 'all'));
+		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
 	return $cat_ids;
@@ -1304,7 +1304,7 @@ 
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'description\')');
 	return get_the_author_meta('description');
 }
 
@@ -1316,7 +1316,7 @@ 
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'description\')');
 	the_author_meta('description');
 }
 
@@ -1330,7 +1330,7 @@ 
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'login\')');
 	return get_the_author_meta('login');
 }
 
@@ -1342,7 +1342,7 @@ 
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'login\')');
 	the_author_meta('login');
 }
 
@@ -1356,7 +1356,7 @@ 
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')');
 	return get_the_author_meta('first_name');
 }
 
@@ -1368,7 +1368,7 @@ 
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'first_name\')');
 	the_author_meta('first_name');
 }
 
@@ -1382,7 +1382,7 @@ 
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')');
 	return get_the_author_meta('last_name');
 }
 
@@ -1394,7 +1394,7 @@ 
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'last_name\')');
 	the_author_meta('last_name');
 }
 
@@ -1408,7 +1408,7 @@ 
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')');
 	return get_the_author_meta('nickname');
 }
 
@@ -1420,7 +1420,7 @@ 
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'nickname\')');
 	the_author_meta('nickname');
 }
 
@@ -1434,7 +1434,7 @@ 
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'email\')');
 	return get_the_author_meta('email');
 }
 
@@ -1446,7 +1446,7 @@ 
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'email\')');
 	the_author_meta('email');
 }
 
@@ -1460,7 +1460,7 @@ 
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')');
 	return get_the_author_meta('icq');
 }
 
@@ -1472,7 +1472,7 @@ 
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'icq\')');
 	the_author_meta('icq');
 }
 
@@ -1486,7 +1486,7 @@ 
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')');
 	return get_the_author_meta('yim');
 }
 
@@ -1498,7 +1498,7 @@ 
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'yim\')');
 	the_author_meta('yim');
 }
 
@@ -1512,7 +1512,7 @@ 
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')');
 	return get_the_author_meta('msn');
 }
 
@@ -1524,7 +1524,7 @@ 
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'msn\')');
 	the_author_meta('msn');
 }
 
@@ -1538,7 +1538,7 @@ 
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')');
 	return get_the_author_meta('aim');
 }
 
@@ -1550,7 +1550,7 @@ 
  * @see the_author_meta()
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'aim\')');
 	the_author_meta('aim');
 }
 
@@ -1564,8 +1564,8 @@ 
  * @param int $auth_id The ID of the author.
  * @return string The author's display name.
  */
-function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')' );
+function get_author_name($auth_id = false) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')');
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1579,7 +1579,7 @@ 
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'url\')');
 	return get_the_author_meta('url');
 }
 
@@ -1591,7 +1591,7 @@ 
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'url\')');
 	the_author_meta('url');
 }
 
@@ -1605,7 +1605,7 @@ 
  * @return string|int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')');
 	return get_the_author_meta('ID');
 }
 
@@ -1617,7 +1617,7 @@ 
  * @see the_author_meta()
  */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'ID\')');
 	the_author_meta('ID');
 }
 
@@ -1649,23 +1649,23 @@ 
  * @param int $cut Optional. Amount of words to keep for the content.
  * @param int $encode_html Optional. How to encode the content.
  */
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
+function the_content_rss($more_link_text = '(more...)', $stripteaser = 0, $more_file = '', $cut = 0, $encode_html = 0) {
+	_deprecated_function(__FUNCTION__, '2.9', 'the_content_feed');
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
+	if ($cut && ! $encode_html)
 		$encode_html = 2;
-	if ( 1== $encode_html ) {
+	if (1 == $encode_html) {
 		$content = esc_html($content);
 		$cut = 0;
-	} elseif ( 0 == $encode_html ) {
+	} elseif (0 == $encode_html) {
 		$content = make_url_footnote($content);
-	} elseif ( 2 == $encode_html ) {
+	} elseif (2 == $encode_html) {
 		$content = strip_tags($content);
 	}
-	if ( $cut ) {
+	if ($cut) {
 		$blah = explode(' ', $content);
-		if ( count($blah) > $cut ) {
+		if (count($blah) > $cut) {
 			$k = $cut;
 			$use_dotdotdot = 1;
 		} else {
@@ -1674,7 +1674,7 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
+		for ($i = 0; $i < $k; $i++)
 			$excerpt .= $blah[$i].' ';
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
@@ -1695,20 +1695,20 @@ 
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
  */
-function make_url_footnote( $content ) {
-	_deprecated_function( __FUNCTION__, '2.9', '' );
-	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
+function make_url_footnote($content) {
+	_deprecated_function(__FUNCTION__, '2.9', '');
+	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$links_summary = "\n";
-	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
+	for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
 		$link_match = $matches[0][$i];
-		$link_number = '['.($i+1).']';
+		$link_number = '['.($i + 1).']';
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
-		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-		$links_summary .= "\n" . $link_number . ' ' . $link_url;
+		$content = str_replace($link_match, $link_text.' '.$link_number, $content);
+		$link_url = ((strtolower(substr($link_url, 0, 7)) != 'http://') && (strtolower(substr($link_url, 0, 8)) != 'https://')) ? get_option('home').$link_url : $link_url;
+		$links_summary .= "\n".$link_number.' '.$link_url;
 	}
-	$content  = strip_tags( $content );
+	$content  = strip_tags($content);
 	$content .= $links_summary;
 	return $content;
 }
@@ -1734,9 +1734,9 @@ 
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _c( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function _c($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1751,9 +1751,9 @@ 
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function translate_with_context($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1772,9 +1772,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_nx()' );
-	return before_last_bar( _n( $single, $plural, $number, $domain ) );
+function _nc($single, $plural, $number, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_nx()');
+	return before_last_bar(_n($single, $plural, $number, $domain));
 }
 
 /**
@@ -1785,7 +1785,7 @@ 
  * @see _n()
  */
 function __ngettext() {
-	_deprecated_function( __FUNCTION__, '2.8', '_n()' );
+	_deprecated_function(__FUNCTION__, '2.8', '_n()');
 	$args = func_get_args();
 	return call_user_func_array('_n', $args);
 }
@@ -1798,7 +1798,7 @@ 
  * @see _n_noop()
  */
 function __ngettext_noop() {
-	_deprecated_function( __FUNCTION__, '2.8', '_n_noop()' );
+	_deprecated_function(__FUNCTION__, '2.8', '_n_noop()');
 	$args = func_get_args();
 	return call_user_func_array('_n_noop', $args);
 
@@ -1814,7 +1814,7 @@ 
  * @return array List of all options.
  */
 function get_alloptions() {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_load_alloptions()' );
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_load_alloptions()');
 	return wp_load_alloptions();
 }
 
@@ -1832,14 +1832,14 @@ 
  * @return string
  */
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_link()');
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+	if (('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
 		return __('Missing Attachment');
 
-	if ( $permalink )
+	if ($permalink)
 		$url = get_attachment_link($_post->ID);
 
 	$post_title = esc_attr($_post->post_title);
@@ -1859,31 +1859,31 @@ 
  * @param bool $fullsize Optional, default to false. Whether to have full image.
  * @return array Icon URL and full path to file, respectively.
  */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image_src()' );
+function get_attachment_icon_src($id = 0, $fullsize = false) {
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image_src()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+	if ( ! $fullsize && $src = wp_get_attachment_thumb_url($post->ID)) {
 		// We have a thumbnail desired, specified and existing
 
 		$src_file = basename($src);
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
+	} elseif (wp_attachment_is_image($post->ID)) {
 		// We have an image without a thumbnail
 
-		$src = wp_get_attachment_url( $post->ID );
+		$src = wp_get_attachment_url($post->ID);
 		$src_file = & $file;
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+	} elseif ($src = wp_mime_type_icon($post->ID)) {
 		// No thumb, no image. We'll look for a mime-related icon instead.
 
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
+		$icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+		$src_file = $icon_dir.'/'.basename($src);
 	}
 
-	if ( !isset($src) || !$src )
+	if ( ! isset($src) || ! $src)
 		return false;
 
 	return array($src, $src_file);
@@ -1901,27 +1901,27 @@ 
  * @param array $max_dims Optional. Dimensions of image.
  * @return false|string HTML content.
  */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+	if ( ! $src = get_attachment_icon_src($post->ID, $fullsize))
 		return false;
 
 	list($src, $src_file) = $src;
 
 	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+	if (($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file)) {
 
 		$imagesize = getimagesize($src_file);
 
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1]) {
 			$actual_aspect = $imagesize[0] / $imagesize[1];
 			$desired_aspect = $max_dims[0] / $max_dims[1];
 
-			if ( $actual_aspect >= $desired_aspect ) {
+			if ($actual_aspect >= $desired_aspect) {
 				$height = $actual_aspect * $max_dims[0];
 				$constraint = "width='{$max_dims[0]}' ";
 				$post->iconsize = array($max_dims[0], $height);
@@ -1942,7 +1942,7 @@ 
 
 	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
 
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
+	return apply_filters('attachment_icon', $icon, $post->ID);
 }
 
 /**
@@ -1958,12 +1958,12 @@ 
  * @return false|string
  */
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+	if ($innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
 		return $innerHTML;
 
 	$innerHTML = esc_attr($post->post_title);
@@ -1985,8 +1985,8 @@ 
  *                            'attribute', 'js', 'db', or 'display'. Default 'raw'.
  * @return object|array Bookmark object or array, depending on the type specified by `$output`.
  */
-function get_link( $bookmark_id, $output = OBJECT, $filter = 'raw' ) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmark()');
 	return get_bookmark($bookmark_id, $output, $filter);
 }
 
@@ -2001,9 +2001,9 @@ 
  * @param array $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function sanitize_url( $url, $protocols = null ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_url_raw()' );
-	return esc_url_raw( $url, $protocols );
+function sanitize_url($url, $protocols = null) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_url_raw()');
+	return esc_url_raw($url, $protocols);
 }
 
 /**
@@ -2022,12 +2022,12 @@ 
  * @param string $context Optional. How the URL will be used. Default is 'display'.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
+function clean_url($url, $protocols = null, $context = 'display') {
+	if ($context == 'db')
+		_deprecated_function('clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()');
 	else
-		_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
-	return esc_url( $url, $protocols, $context );
+		_deprecated_function(__FUNCTION__, '3.0', 'esc_url()');
+	return esc_url($url, $protocols, $context);
 }
 
 /**
@@ -2042,9 +2042,9 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_js()' );
-	return esc_js( $text );
+function js_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_js()');
+	return esc_js($text);
 }
 
 /**
@@ -2059,13 +2059,13 @@ 
  * @param false        $double_encode Whether to double encode. Unused.
  * @return string Escaped `$string`.
  */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_html()' );
-	if ( func_num_args() > 1 ) { // Maintain backwards compat for people passing additional args
+function wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_html()');
+	if (func_num_args() > 1) { // Maintain backwards compat for people passing additional args
 		$args = func_get_args();
-		return call_user_func_array( '_wp_specialchars', $args );
+		return call_user_func_array('_wp_specialchars', $args);
 	} else {
-		return esc_html( $string );
+		return esc_html($string);
 	}
 }
 
@@ -2079,9 +2079,9 @@ 
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_attr()' );
-	return esc_attr( $text );
+function attribute_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_attr()');
+	return esc_attr($text);
 }
 
 /**
@@ -2104,10 +2104,10 @@ 
  * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_register_sidebar_widget()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2115,11 +2115,11 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
+	if ( ! empty($classname) && is_string($classname))
 		$options['classname'] = $classname;
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
@@ -2135,7 +2135,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_sidebar_widget($id) {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_unregister_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_unregister_sidebar_widget()');
 	return wp_unregister_sidebar_widget($id);
 }
 
@@ -2159,10 +2159,10 @@ 
  * @param int $height Widget height.
  */
 function register_widget_control($name, $control_callback, $width = '', $height = '') {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_register_widget_control()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2170,13 +2170,13 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
+	if ( ! empty($width))
 		$options['width'] = $width;
-	if ( !empty($height) )
+	if ( ! empty($height))
 		$options['height'] = $height;
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_widget_control', $args);
@@ -2192,7 +2192,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_widget_control($id) {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_unregister_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_unregister_widget_control()');
 	return wp_unregister_widget_control($id);
 }
 
@@ -2208,32 +2208,32 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True deletion completed and false if user_id is not a number.
  */
-function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'delete_user_meta()' );
+function delete_usermeta($user_id, $meta_key, $meta_value = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'delete_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
+	if (is_array($meta_value) || is_object($meta_value))
 		$meta_value = serialize($meta_value);
-	$meta_value = trim( $meta_value );
+	$meta_value = trim($meta_value);
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	if ( ! empty($meta_value))
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value));
 	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2254,28 +2254,28 @@ 
  * @param string $meta_key Optional. Metadata key.
  * @return mixed
  */
-function get_usermeta( $user_id, $meta_key = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'get_user_meta()' );
+function get_usermeta($user_id, $meta_key = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'get_user_meta()');
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
+	if ( ! $user_id)
 		return false;
 
-	if ( !empty($meta_key) ) {
+	if ( ! empty($meta_key)) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
+		if (false !== $user && isset($user->$meta_key))
 			$metas = array($user->$meta_key);
 		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+			$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 	} else {
-		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+		$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
 	}
 
-	if ( empty($metas) ) {
-		if ( empty($meta_key) )
+	if (empty($metas)) {
+		if (empty($meta_key))
 			return array();
 		else
 			return '';
@@ -2283,7 +2283,7 @@ 
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if (count($metas) == 1)
 		return $metas[0];
 	else
 		return $metas;
@@ -2307,15 +2307,15 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True on successful update, false on failure.
  */
-function update_usermeta( $user_id, $meta_key, $meta_value ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'update_user_meta()' );
+function update_usermeta($user_id, $meta_key, $meta_value) {
+	_deprecated_function(__FUNCTION__, '3.0', 'update_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
+	if (is_string($meta_value))
 		$meta_value = stripslashes($meta_value);
 	$meta_value = maybe_serialize($meta_value);
 
@@ -2323,25 +2323,25 @@ 
 		return delete_usermeta($user_id, $meta_key);
 	}
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur)
+		do_action('update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	if ( ! $cur)
+		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value'));
+	elseif ($cur->meta_value != $meta_value)
+		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key'));
 	else
 		return false;
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	if ( ! $cur)
+		do_action('added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value);
 	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+		do_action('updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2362,14 +2362,14 @@ 
  * @param int $id Site ID.
  * @return array List of users that are part of that site ID
  */
-function get_users_of_blog( $id = '' ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_users_of_blog($id = '') {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
+	if (empty($id))
 		$id = (int) $blog_id;
 	$blog_prefix = $wpdb->get_blog_prefix($id);
-	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+	$users = $wpdb->get_results("SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id");
 	return $users;
 }
 
@@ -2382,13 +2382,13 @@ 
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
-function automatic_feed_links( $add = true ) {
-	_deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
+function automatic_feed_links($add = true) {
+	_deprecated_function(__FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )");
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
+	if ($add)
+		add_theme_support('automatic-feed-links');
 	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+		remove_action('wp_head', 'feed_links_extra', 3); // Just do this yourself in 3.0+
 }
 
 /**
@@ -2402,13 +2402,13 @@ 
  * @param false|int $user Optional. User ID to retrieve the field for. Default false (current user).
  * @return string The author's field from the current author's DB object.
  */
-function get_profile( $field, $user = false ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'get_the_author_meta()' );
-	if ( $user ) {
-		$user = get_user_by( 'login', $user );
+function get_profile($field, $user = false) {
+	_deprecated_function(__FUNCTION__, '3.0', 'get_the_author_meta()');
+	if ($user) {
+		$user = get_user_by('login', $user);
 		$user = $user->ID;
 	}
-	return get_the_author_meta( $field, $user );
+	return get_the_author_meta($field, $user);
 }
 
 /**
@@ -2421,9 +2421,9 @@ 
  * @param int $userid User to count posts for.
  * @return int Number of posts the given user has written.
  */
-function get_usernumposts( $userid ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'count_user_posts()' );
-	return count_user_posts( $userid );
+function get_usernumposts($userid) {
+	_deprecated_function(__FUNCTION__, '3.0', 'count_user_posts()');
+	return count_user_posts($userid);
 }
 
 /**
@@ -2437,7 +2437,7 @@ 
  * @return string An HTML entity
  */
 function funky_javascript_callback($matches) {
-	return "&#".base_convert($matches[1],16,10).";";
+	return "&#".base_convert($matches[1], 16, 10).";";
 }
 
 /**
@@ -2455,12 +2455,12 @@ 
  * @return string Fixed text.
  */
 function funky_javascript_fix($text) {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ($is_winIE || $is_macIE)
+		$text = preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
 
@@ -2477,9 +2477,9 @@ 
  * @param string $taxonomy Name of taxonomy object
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $taxonomy );
+function is_taxonomy($taxonomy) {
+	_deprecated_function(__FUNCTION__, '3.0', 'taxonomy_exists()');
+	return taxonomy_exists($taxonomy);
 }
 
 /**
@@ -2494,9 +2494,9 @@ 
  * @param int $parent ID of parent term under which to confine the exists search.
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term( $term, $taxonomy = '', $parent = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'term_exists()' );
-	return term_exists( $term, $taxonomy, $parent );
+function is_term($term, $taxonomy = '', $parent = 0) {
+	_deprecated_function(__FUNCTION__, '3.0', 'term_exists()');
+	return term_exists($term, $taxonomy, $parent);
 }
 
 /**
@@ -2512,11 +2512,11 @@ 
  * @return bool
  */
 function is_plugin_page() {
-	_deprecated_function( __FUNCTION__, '3.1'  );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
+	if (isset($plugin_page))
 		return true;
 
 	return false;
@@ -2535,7 +2535,7 @@ 
  * @return bool Always return True
  */
 function update_category_cache() {
-	_deprecated_function( __FUNCTION__, '3.1'  );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return true;
 }
@@ -2549,7 +2549,7 @@ 
  * @return bool
  */
 function wp_timezone_supported() {
-	_deprecated_function( __FUNCTION__, '3.2' );
+	_deprecated_function(__FUNCTION__, '3.2');
 
 	return true;
 }
@@ -2569,9 +2569,9 @@ 
  * @param bool   $extended      Optional. Unused.
  */
 function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
+	wp_editor($content, $id, array('media_buttons' => $media_buttons));
 }
 
 /**
@@ -2584,20 +2584,20 @@ 
  * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
  */
 function get_user_metavalues($ids) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
+	foreach ($ids as $id)
 		$objects[$id] = array();
 
 	$metas = update_meta_cache('user', $ids);
 
-	foreach ( $metas as $id => $meta ) {
-		foreach ( $meta as $key => $metavalues ) {
-			foreach ( $metavalues as $value ) {
-				$objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
+	foreach ($metas as $id => $meta) {
+		foreach ($meta as $key => $metavalues) {
+			foreach ($metavalues as $value) {
+				$objects[$id][] = (object) array('user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
 			}
 		}
 	}
@@ -2618,23 +2618,23 @@ 
  * @return object|array The now sanitized User Object or Array (will be the same type as $user)
  */
 function sanitize_user_object($user, $context = 'display') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
+	if (is_object($user)) {
+		if ( ! isset($user->ID))
 			$user->ID = 0;
-		if ( ! ( $user instanceof WP_User ) ) {
+		if ( ! ($user instanceof WP_User)) {
 			$vars = get_object_vars($user);
-			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
+			foreach (array_keys($vars) as $field) {
+				if (is_string($user->$field) || is_numeric($user->$field))
 					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
+		if ( ! isset($user['ID']))
 			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
+		foreach (array_keys($user) as $field)
 			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
 		$user['filter'] = $context;
 	}
@@ -2657,17 +2657,17 @@ 
  * @return string
  */
 function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
+	if (empty($posts))
 		return;
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
+	if (empty($post->post_title))
 		$post->post_title = $start ? __('First Post') : __('Last Post');
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2678,10 +2678,10 @@ 
 
 	$link = $start ? "<link rel='start' title='" : "<link rel='end' title='";
 	$link .= esc_attr($title);
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$boundary = $start ? 'start' : 'end';
-	return apply_filters( "{$boundary}_post_rel_link", $link );
+	return apply_filters("{$boundary}_post_rel_link", $link);
 }
 
 /**
@@ -2695,7 +2695,7 @@ 
  * @param string $excluded_categories Optional. Excluded categories IDs.
  */
 function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
 }
@@ -2709,10 +2709,10 @@ 
  * @return string
  */
 function get_index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	$link = "<link rel='index' title='" . esc_attr( get_bloginfo( 'name', 'display' ) ) . "' href='" . esc_url( user_trailingslashit( get_bloginfo( 'url', 'display' ) ) ) . "' />\n";
-	return apply_filters( "index_rel_link", $link );
+	$link = "<link rel='index' title='".esc_attr(get_bloginfo('name', 'display'))."' href='".esc_url(user_trailingslashit(get_bloginfo('url', 'display')))."' />\n";
+	return apply_filters("index_rel_link", $link);
 }
 
 /**
@@ -2722,7 +2722,7 @@ 
  * @deprecated 3.3.0
  */
 function index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_index_rel_link();
 }
@@ -2736,13 +2736,13 @@ 
  * @param string $title Optional. Link title format. Default '%title'.
  * @return string
  */
-function get_parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+function get_parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
+	if ( ! empty($GLOBALS['post']) && ! empty($GLOBALS['post']->post_parent))
 		$post = get_post($GLOBALS['post']->post_parent);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2752,10 +2752,10 @@ 
 	$title = apply_filters('the_title', $title, $post->ID);
 
 	$link = "<link rel='up' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
-	return apply_filters( "parent_post_rel_link", $link );
+	return apply_filters("parent_post_rel_link", $link);
 }
 
 /**
@@ -2766,8 +2766,8 @@ 
  *
  * @param string $title Optional. Link title format. Default '%title'.
  */
-function parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+function parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_parent_post_rel_link($title);
 }
@@ -2780,18 +2780,18 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+function wp_admin_bar_dashboard_view_site_menu($wp_admin_bar) {
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$user_id = get_current_user_id();
 
-	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+	if (0 != $user_id) {
+		if (is_admin())
+			$wp_admin_bar->add_menu(array('id' => 'view-site', 'title' => __('Visit Site'), 'href' => home_url()));
+		elseif (is_multisite())
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => get_dashboard_url($user_id)));
 		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => admin_url()));
 	}
 }
 
@@ -2805,10 +2805,10 @@ 
  * @param int $blog_id Site ID
  * @return bool True if the current users belong to $blog_id, false if not.
  */
-function is_blog_user( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'is_user_member_of_blog()' );
+function is_blog_user($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.3', 'is_user_member_of_blog()');
 
-	return is_user_member_of_blog( get_current_user_id(), $blog_id );
+	return is_user_member_of_blog(get_current_user_id(), $blog_id);
 }
 
 /**
@@ -2824,8 +2824,8 @@ 
  * @param string $mode     Type of access you required to the stream.
  * @return false Always false.
  */
-function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fopen($filename, $mode) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 	return false;
 }
 
@@ -2841,10 +2841,10 @@ 
  * @param mixed  $fp     Unused.
  * @param string $string Message to log.
  */
-function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
+function debug_fwrite($fp, $string) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
+	if ( ! empty($GLOBALS['debug']))
+		error_log($string);
 }
 
 /**
@@ -2858,8 +2858,8 @@ 
  *
  * @param mixed $fp Unused.
  */
-function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fclose($fp) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 }
 
 /**
@@ -2876,21 +2876,21 @@ 
  * @return array Theme list with theme data.
  */
 function get_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_themes()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_themes()');
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
+	if (isset($wp_themes))
 		return $wp_themes;
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		if (isset($wp_themes[$name]))
+			$wp_themes[$name.'/'.$theme->get_stylesheet()] = $theme;
 		else
-			$wp_themes[ $name ] = $theme;
+			$wp_themes[$name] = $theme;
 	}
 
 	return $wp_themes;
@@ -2906,12 +2906,12 @@ 
  * @param string $theme Theme name.
  * @return array|null Null, if theme name does not exist. Theme data, if exists.
  */
-function get_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )' );
+function get_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )');
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if (is_array($themes) && array_key_exists($theme, $themes))
+		return $themes[$theme];
 	return null;
 }
 
@@ -2925,9 +2925,9 @@ 
  * @return string
  */
 function get_current_theme() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
 
-	if ( $theme = get_option( 'current_theme' ) )
+	if ($theme = get_option('current_theme'))
 		return $theme;
 
 	return wp_get_theme()->get('Name');
@@ -2946,10 +2946,10 @@ 
  * @return string The pre block without paragraph/line-break conversion.
  */
 function clean_pre($matches) {
-	_deprecated_function( __FUNCTION__, '3.4' );
+	_deprecated_function(__FUNCTION__, '3.4');
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
+	if (is_array($matches))
+		$text = $matches[1].$matches[2]."</pre>";
 	else
 		$text = $matches;
 
@@ -2972,15 +2972,15 @@ 
  * @param callable $admin_head_callback Call on custom header administration screen.
  * @param callable $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )' );
+function add_custom_image_header($wp_head_callback, $admin_head_callback, $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )');
 	$args = array(
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-header', $args );
+	return add_theme_support('custom-header', $args);
 }
 
 /**
@@ -2993,8 +2993,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_image_header() {
-	_deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-header\' )' );
-	return remove_theme_support( 'custom-header' );
+	_deprecated_function(__FUNCTION__, '3.4', 'remove_theme_support( \'custom-header\' )');
+	return remove_theme_support('custom-header');
 }
 
 /**
@@ -3008,16 +3008,16 @@ 
  * @param callable $admin_head_callback Call on custom background administration screen.
  * @param callable $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
+function add_custom_background($wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )');
 	$args = array();
-	if ( $wp_head_callback )
+	if ($wp_head_callback)
 		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
+	if ($admin_head_callback)
 		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-background', $args );
+	return add_theme_support('custom-background', $args);
 }
 
 /**
@@ -3030,8 +3030,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_background() {
-	_deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-background\' )' );
-	return remove_theme_support( 'custom-background' );
+	_deprecated_function(__FUNCTION__, '3.4', 'remove_theme_support( \'custom-background\' )');
+	return remove_theme_support('custom-background');
 }
 
 /**
@@ -3044,9 +3044,9 @@ 
  * @param string $theme_file Theme file path.
  * @return array Theme data.
  */
-function get_theme_data( $theme_file ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
-	$theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+function get_theme_data($theme_file) {
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
+	$theme = new WP_Theme(basename(dirname($theme_file)), dirname(dirname($theme_file)));
 
 	$theme_data = array(
 		'Name' => $theme->get('Name'),
@@ -3062,9 +3062,9 @@ 
 		'AuthorName' => $theme->get('Author'),
 	);
 
-	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+	foreach (apply_filters('extra_theme_headers', array()) as $extra_header) {
+		if ( ! isset($theme_data[$extra_header]))
+			$theme_data[$extra_header] = $theme->get($extra_header);
 	}
 
 	return $theme_data;
@@ -3081,10 +3081,10 @@ 
  *
  * @param array $pages list of page objects
  */
-function update_page_cache( &$pages ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'update_post_cache()' );
+function update_page_cache(&$pages) {
+	_deprecated_function(__FUNCTION__, '3.4', 'update_post_cache()');
 
-	update_post_cache( $pages );
+	update_post_cache($pages);
 }
 
 /**
@@ -3099,10 +3099,10 @@ 
  *
  * @param int $id Page ID to clean
  */
-function clean_page_cache( $id ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'clean_post_cache()' );
+function clean_page_cache($id) {
+	_deprecated_function(__FUNCTION__, '3.4', 'clean_post_cache()');
 
-	clean_post_cache( $id );
+	clean_post_cache($id);
 }
 
 /**
@@ -3117,9 +3117,9 @@ 
  * @param string $action Nonce action.
  * @return string Are you sure message.
  */
-function wp_explain_nonce( $action ) {
-	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
-	return __( 'Are you sure you want to do this?' );
+function wp_explain_nonce($action) {
+	_deprecated_function(__FUNCTION__, '3.4.1', 'wp_nonce_ays()');
+	return __('Are you sure you want to do this?');
 }
 
 /**
@@ -3131,9 +3131,9 @@ 
  *
  * @param int $post_id An optional post ID.
  */
-function sticky_class( $post_id = null ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'post_class()' );
-	if ( is_sticky( $post_id ) )
+function sticky_class($post_id = null) {
+	_deprecated_function(__FUNCTION__, '3.5', 'post_class()');
+	if (is_sticky($post_id))
 		echo ' sticky';
 }
 
@@ -3149,8 +3149,8 @@ 
  *
  * @param WP_Post &$post Post object, passed by reference (unused).
  */
-function _get_post_ancestors( &$post ) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+function _get_post_ancestors(&$post) {
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -3163,23 +3163,23 @@ 
  * @param string $file Filename of the image to load.
  * @return resource The resulting image resource on success, Error string on failure.
  */
-function wp_load_image( $file ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
+function wp_load_image($file) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_get_image_editor()');
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if (is_numeric($file))
+		$file = get_attached_file($file);
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file($file))
 		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
 
-	if ( ! function_exists('imagecreatefromstring') )
+	if ( ! function_exists('imagecreatefromstring'))
 		return __('The GD image library is not installed.');
 
 	// Set artificially high because GD uses uncompressed images in memory
-	@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-	$image = imagecreatefromstring( file_get_contents( $file ) );
+	@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
+	$image = imagecreatefromstring(file_get_contents($file));
 
-	if ( !is_resource( $image ) )
+	if ( ! is_resource($image))
 		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
 
 	return $image;
@@ -3209,22 +3209,22 @@ 
  * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
  * @return mixed WP_Error on failure. String with new destination path.
  */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
+function image_resize($file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_get_image_editor()');
 
-	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($file);
+	if (is_wp_error($editor))
 		return $editor;
-	$editor->set_quality( $jpeg_quality );
+	$editor->set_quality($jpeg_quality);
 
-	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
+	$resized = $editor->resize($max_w, $max_h, $crop);
+	if (is_wp_error($resized))
 		return $resized;
 
-	$dest_file = $editor->generate_filename( $suffix, $dest_path );
-	$saved = $editor->save( $dest_file );
+	$dest_file = $editor->generate_filename($suffix, $dest_path);
+	$saved = $editor->save($dest_file);
 
-	if ( is_wp_error( $saved ) )
+	if (is_wp_error($saved))
 		return $saved;
 
 	return $dest_file;
@@ -3244,9 +3244,9 @@ 
  * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
  * @return WP_Post|null Post object or array holding post contents and information
  */
-function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'get_post()' );
-	return get_post( $postid, $mode );
+function wp_get_single_post($postid = 0, $mode = OBJECT) {
+	_deprecated_function(__FUNCTION__, '3.5', 'get_post()');
+	return get_post($postid, $mode);
 }
 
 /**
@@ -3261,9 +3261,9 @@ 
  * @return bool False if does not authenticate, true if username and password authenticates.
  */
 function user_pass_ok($user_login, $user_pass) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_authenticate()' );
-	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_authenticate()');
+	$user = wp_authenticate($user_login, $user_pass);
+	if (is_wp_error($user))
 		return false;
 
 	return true;
@@ -3288,10 +3288,10 @@ 
  * @return bool
  */
 function gd_edit_image_support($mime_type) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_image_editor_supports()' );
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_image_editor_supports()');
 
-	if ( function_exists('imagetypes') ) {
-		switch( $mime_type ) {
+	if (function_exists('imagetypes')) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return (imagetypes() & IMG_JPG) != 0;
 			case 'image/png':
@@ -3300,7 +3300,7 @@ 
 				return (imagetypes() & IMG_GIF) != 0;
 		}
 	} else {
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return function_exists('imagecreatefromjpeg');
 			case 'image/png':
@@ -3322,22 +3322,22 @@ 
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
  */
-function wp_convert_bytes_to_hr( $bytes ) {
-	_deprecated_function( __FUNCTION__, '3.6', 'size_format()' );
+function wp_convert_bytes_to_hr($bytes) {
+	_deprecated_function(__FUNCTION__, '3.6', 'size_format()');
 
-	$units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-	$log   = log( $bytes, KB_IN_BYTES );
+	$units = array(0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB');
+	$log   = log($bytes, KB_IN_BYTES);
 	$power = (int) $log;
-	$size  = pow( KB_IN_BYTES, $log - $power );
+	$size  = pow(KB_IN_BYTES, $log - $power);
 
-	if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {
-		$unit = $units[ $power ];
+	if ( ! is_nan($size) && array_key_exists($power, $units)) {
+		$unit = $units[$power];
 	} else {
 		$size = $bytes;
 		$unit = $units[0];
 	}
 
-	return $size . $unit;
+	return $size.$unit;
 }
 
 /**
@@ -3350,9 +3350,9 @@ 
  * @param string $t Search terms to "tidy", e.g. trim.
  * @return string Trimmed search terms.
  */
-function _search_terms_tidy( $t ) {
-	_deprecated_function( __FUNCTION__, '3.7' );
-	return trim( $t, "\"'\n\r " );
+function _search_terms_tidy($t) {
+	_deprecated_function(__FUNCTION__, '3.7');
+	return trim($t, "\"'\n\r ");
 }
 
 /**
@@ -3368,10 +3368,10 @@ 
  */
 function rich_edit_exists() {
 	global $wp_rich_edit_exists;
-	_deprecated_function( __FUNCTION__, '3.9' );
+	_deprecated_function(__FUNCTION__, '3.9');
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset($wp_rich_edit_exists))
+		$wp_rich_edit_exists = file_exists(ABSPATH.WPINC.'/js/tinymce/tinymce.js');
 
 	return $wp_rich_edit_exists;
 }
@@ -3386,7 +3386,7 @@ 
  * @param int $count Number of topics.
  * @return int Number of topics.
  */
-function default_topic_count_text( $count ) {
+function default_topic_count_text($count) {
 	return $count;
 }
 
@@ -3401,8 +3401,8 @@ 
  * @param string $content The text to format.
  * @return string The very same text.
  */
-function format_to_post( $content ) {
-	_deprecated_function( __FUNCTION__, '3.9' );
+function format_to_post($content) {
+	_deprecated_function(__FUNCTION__, '3.9');
 	return $content;
 }
 
@@ -3417,8 +3417,8 @@ 
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-	_deprecated_function( __FUNCTION__, '4.0', 'wpdb::esc_like()' );
-	return str_replace( array( "%", "_" ), array( "\\%", "\\_" ), $text );
+	_deprecated_function(__FUNCTION__, '4.0', 'wpdb::esc_like()');
+	return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
 }
 
 /**
@@ -3433,14 +3433,14 @@ 
  * @param string $url The URL to test.
  * @return bool Whether SSL access is available.
  */
-function url_is_accessable_via_ssl( $url ) {
-	_deprecated_function( __FUNCTION__, '4.0' );
+function url_is_accessable_via_ssl($url) {
+	_deprecated_function(__FUNCTION__, '4.0');
 
-	$response = wp_remote_get( set_url_scheme( $url, 'https' ) );
+	$response = wp_remote_get(set_url_scheme($url, 'https'));
 
-	if ( !is_wp_error( $response ) ) {
-		$status = wp_remote_retrieve_response_code( $response );
-		if ( 200 == $status || 401 == $status ) {
+	if ( ! is_wp_error($response)) {
+		$status = wp_remote_retrieve_response_code($response);
+		if (200 == $status || 401 == $status) {
 			return true;
 		}
 	}
@@ -3458,7 +3458,7 @@ 
  * @deprecated 4.3.0
  */
 function preview_theme() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 }
 
 /**
@@ -3471,7 +3471,7 @@ 
  * @return string
  */
 function _preview_theme_template_filter() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3485,7 +3485,7 @@ 
  * @return string
  */
 function _preview_theme_stylesheet_filter() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3499,8 +3499,8 @@ 
  * @param string $content
  * @return string
  */
-function preview_theme_ob_filter( $content ) {
-	_deprecated_function( __FUNCTION__, '4.3' );
+function preview_theme_ob_filter($content) {
+	_deprecated_function(__FUNCTION__, '4.3');
 	return $content;
 }
 
@@ -3516,8 +3516,8 @@ 
  * @param array $matches
  * @return string
  */
-function preview_theme_ob_filter_callback( $matches ) {
-	_deprecated_function( __FUNCTION__, '4.3' );
+function preview_theme_ob_filter_callback($matches) {
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3534,9 +3534,9 @@ 
  * @return string The formatted text after filter is applied.
  */
 function wp_richedit_pre($text) {
-	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3', 'format_for_editor()');
 
-	if ( empty( $text ) ) {
+	if (empty($text)) {
 		/**
 		 * Filter text returned for the rich text editor.
 		 *
@@ -3552,15 +3552,15 @@ 
 		 *
 		 * @param string $output Text for the rich text editor.
 		 */
-		return apply_filters( 'richedit_pre', '' );
+		return apply_filters('richedit_pre', '');
 	}
 
 	$output = convert_chars($text);
 	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset'));
 
 	/** This filter is documented in wp-includes/deprecated.php */
-	return apply_filters( 'richedit_pre', $output );
+	return apply_filters('richedit_pre', $output);
 }
 
 /**
@@ -3577,10 +3577,10 @@ 
  * @return string Formatted text after filter applied.
  */
 function wp_htmledit_pre($output) {
-	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3', 'format_for_editor()');
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( ! empty($output))
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset')); // convert only < > &
 
 	/**
 	 * Filter the text before it is formatted for the HTML editor.
@@ -3590,7 +3590,7 @@ 
 	 *
 	 * @param string $output The HTML-formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters('htmledit_pre', $output);
 }
 
 /**
@@ -3603,10 +3603,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
-function post_permalink( $post_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '4.4', 'get_permalink()' );
+function post_permalink($post_id = 0) {
+	_deprecated_function(__FUNCTION__, '4.4', 'get_permalink()');
 
-	return get_permalink( $post_id );
+	return get_permalink($post_id);
 }
 
 /**
@@ -3625,44 +3625,44 @@ 
  *                               returns false. Default 1.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-	_deprecated_function( __FUNCTION__, '4.4', 'WP_Http' );
+function wp_get_http($url, $file_path = false, $red = 1) {
+	_deprecated_function(__FUNCTION__, '4.4', 'WP_Http');
 
-	@set_time_limit( 60 );
+	@set_time_limit(60);
 
-	if ( $red > 5 )
+	if ($red > 5)
 		return false;
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		$options['method'] = 'HEAD';
 	else
 		$options['method'] = 'GET';
 
-	$response = wp_safe_remote_request( $url, $options );
+	$response = wp_safe_remote_request($url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	$headers = wp_remote_retrieve_headers($response);
+	$headers['response'] = wp_remote_retrieve_response_code($response);
 
 	// WP_HTTP no longer follows redirects for HEAD requests.
-	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
-		return wp_get_http( $headers['location'], $file_path, ++$red );
+	if ('HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset($headers['location'])) {
+		return wp_get_http($headers['location'], $file_path, ++$red);
 	}
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		return $headers;
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
+	if ( ! $out_fp)
 		return $headers;
 
-	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
+	fwrite($out_fp, wp_remote_retrieve_body($response));
 	fclose($out_fp);
 	clearstatcache();
 
@@ -3679,9 +3679,9 @@ 
  * @param string|bool $force Optional Whether to force SSL login. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_login( $force = null ) {
-	_deprecated_function( __FUNCTION__, '4.4', 'force_ssl_admin()' );
-	return force_ssl_admin( $force );
+function force_ssl_login($force = null) {
+	_deprecated_function(__FUNCTION__, '4.4', 'force_ssl_admin()');
+	return force_ssl_admin($force);
 }
 
 /**
@@ -3693,7 +3693,7 @@ 
  * @return string Full path to comments popup template file.
  */
 function get_comments_popup_template() {
-	_deprecated_function( __FUNCTION__, '4.5' );
+	_deprecated_function(__FUNCTION__, '4.5');
 
 	return '';
 }
@@ -3707,7 +3707,7 @@ 
  * @return bool
  */
 function is_comments_popup() {
-	_deprecated_function( __FUNCTION__, '4.5' );
+	_deprecated_function(__FUNCTION__, '4.5');
 
 	return false;
 }
@@ -3719,7 +3719,7 @@ 
  * @deprecated 4.5.0
  */
 function comments_popup_script() {
-	_deprecated_function( __FUNCTION__, '4.5' );
+	_deprecated_function(__FUNCTION__, '4.5');
 }
 
 /**
@@ -3731,8 +3731,8 @@ 
  * @param string $text Content to replace links to open in a new window.
  * @return string Content that has filtered links.
  */
-function popuplinks( $text ) {
-	_deprecated_function( __FUNCTION__, '4.5' );
+function popuplinks($text) {
+	_deprecated_function(__FUNCTION__, '4.5');
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }

Braces +388 added lines, -270 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
-		echo $cat;
+	if ( $echo ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -399,8 +407,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -459,8 +468,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -511,8 +521,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -638,18 +649,24 @@ 
 	$r = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
-		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
-		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
-		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
-		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
-		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
-		$r['style'] = $r['list'] ? 'list' : 'break';
+	if ( isset($r['optionall']) && isset($r['all'])) {
+			$r['show_option_all'] = $r['all'];
+	}
+	if ( isset($r['sort_column']) ) {
+			$r['orderby'] = $r['sort_column'];
+	}
+	if ( isset($r['sort_order']) ) {
+			$r['order'] = $r['sort_order'];
+	}
+	if ( isset($r['optiondates']) ) {
+			$r['show_last_update'] = $r['optiondates'];
+	}
+	if ( isset($r['optioncount']) ) {
+			$r['show_count'] = $r['optioncount'];
+	}
+	if ( isset($r['list']) ) {
+			$r['style'] = $r['list'] ? 'list' : 'break';
+	}
 	$r['title_li'] = '';
 
 	return wp_list_categories($r);
@@ -680,12 +697,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -787,8 +806,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -931,64 +951,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ( $category == -1 ) {
+		//get_bookmarks uses '' to signify all categories
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+				// If it's a relative path
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -997,8 +1031,9 @@ 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
-		return $output;
+	if ( !$echo ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1026,8 +1061,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1093,13 +1129,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1137,8 +1175,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1157,8 +1196,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1250,19 +1290,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1653,8 +1696,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1674,8 +1718,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1836,11 +1881,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1862,8 +1909,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1883,8 +1931,9 @@ 
 		$src_file = $icon_dir . '/' . basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1904,11 +1953,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1960,11 +2011,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2023,10 +2076,11 @@ 
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2107,20 +2161,23 @@ 
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
-		$options['classname'] = $classname;
+	if ( !empty($classname) && is_string($classname) ) {
+			$options['classname'] = $classname;
+	}
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
 }
@@ -2162,22 +2219,26 @@ 
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_widget_control()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
-		$options['width'] = $width;
-	if ( !empty($height) )
-		$options['height'] = $height;
+	if ( !empty($width) ) {
+			$options['width'] = $width;
+	}
+	if ( !empty($height) ) {
+			$options['height'] = $height;
+	}
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_widget_control', $args);
 }
@@ -2211,29 +2272,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2259,35 +2325,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2310,13 +2380,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2325,23 +2397,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2366,8 +2441,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
-		$id = (int) $blog_id;
+	if ( empty($id) ) {
+			$id = (int) $blog_id;
+	}
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
 	return $users;
@@ -2385,10 +2461,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+
 }
 
 /**
@@ -2459,10 +2537,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2516,8 +2595,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2589,8 +2669,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2621,21 +2702,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2661,14 +2746,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2739,11 +2826,13 @@ 
 function get_parent_post_rel_link( $title = '%title' ) {
 	_deprecated_function( __FUNCTION__, '3.3' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2786,12 +2875,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2843,9 +2933,10 @@ 
  */
 function debug_fwrite( $fp, $string ) {
 	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $string );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2879,18 +2970,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2910,8 +3003,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2927,8 +3021,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2948,10 +3043,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2978,8 +3074,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -3011,12 +3108,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3063,8 +3163,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3133,9 +3234,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3166,21 +3268,25 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
-	if ( ! is_file( $file ) )
-		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	if ( ! is_file( $file ) ) {
+			return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory
 	@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 	$image = imagecreatefromstring( file_get_contents( $file ) );
 
-	if ( !is_resource( $image ) )
-		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	if ( !is_resource( $image ) ) {
+			return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	}
 
 	return $image;
 }
@@ -3213,19 +3319,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3263,8 +3372,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3370,8 +3480,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3579,8 +3690,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// convert only < > &
 
 	/**
 	 * Filter the text before it is formatted for the HTML editor.
@@ -3630,21 +3743,24 @@ 
 
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -3654,13 +3770,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);

src/wp-includes/class-wp-customize-manager.php

Braces +31 added lines, -21 removed lines

@@ -441,8 +441,9 @@ 
 		 */
 		do_action( 'customize_register', $this );
 
-		if ( $this->is_preview() && ! is_admin() )
-			$this->customize_preview_init();
+		if ( $this->is_preview() && ! is_admin() ) {
+					$this->customize_preview_init();
+		}
 	}
 
 	/**
@@ -457,8 +458,9 @@ 
 	 * @return int
 	 */
 	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
-			return 200;
+		if ( $this->is_preview() && ! is_admin() ) {
+					return 200;
+		}
 
 		return $status;
 	}
@@ -1056,8 +1058,9 @@ 
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
 	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+		if ( isset( $this->sections[ $id ] ) ) {
+					return $this->sections[ $id ];
+		}
 	}
 
 	/**
@@ -1127,8 +1130,9 @@ 
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
 	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+		if ( isset( $this->controls[ $id ] ) ) {
+					return $this->controls[ $id ];
+		}
 	}
 
 	/**
@@ -1592,12 +1596,14 @@ 
 	 * @return mixed
 	 */
 	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
-			return 'blank';
+		if ( 'blank' === $color ) {
+					return 'blank';
+		}
 
 		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		if ( empty( $color ) ) {
+					$color = get_theme_support( 'custom-header', 'default-text-color' );
+		}
 
 		return $color;
 	}
@@ -1615,13 +1621,15 @@ 
  * @return string|void
  */
 function sanitize_hex_color( $color ) {
-	if ( '' === $color )
-		return '';
+	if ( '' === $color ) {
+			return '';
+	}
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) )
-		return $color;
-}
+	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+			return $color;
+	}
+	}
 
 /**
  * Sanitizes a hex color without a hash. Use sanitize_hex_color() when possible.
@@ -1640,8 +1648,9 @@ 
 function sanitize_hex_color_no_hash( $color ) {
 	$color = ltrim( $color, '#' );
 
-	if ( '' === $color )
-		return '';
+	if ( '' === $color ) {
+			return '';
+	}
 
 	return sanitize_hex_color( '#' . $color ) ? $color : null;
 }
@@ -1658,8 +1667,9 @@ 
  * @return string
  */
 function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) )
-		return '#' . $unhashed;
+	if ( $unhashed = sanitize_hex_color_no_hash( $color ) ) {
+			return '#' . $unhashed;
+	}
 
 	return $color;
 }

Doc Comments +2 added lines, -2 removed lines

@@ -339,8 +339,8 @@
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $ajax_message AJAX return
-	 * @param mixed $message UI message
+	 * @param integer $ajax_message AJAX return
+	 * @param string $message UI message
 	 */
 	protected function wp_die( $ajax_message, $message = null ) {
 		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Customize Manager classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.4.0
- */
+	 * WordPress Customize Manager classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.4.0
+	 */
 
 /**
  * Customize Manager class.

Spacing +503 added lines, -503 removed lines

@@ -109,7 +109,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $components = array( 'widgets', 'nav_menus', 'selective_refresh' );
+	protected $components = array('widgets', 'nav_menus', 'selective_refresh');
 
 	/**
 	 * Registered instances of WP_Customize_Section.
@@ -205,41 +205,41 @@ 
 	 * @since 3.4.0
 	 */
 	public function __construct() {
-		require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+		require_once(ABSPATH.WPINC.'/class-wp-customize-setting.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-panel.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-section.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menus-panel.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-themes-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-sidebar-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-section.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');
 
 		/**
 		 * Filter the core Customizer components to load.
@@ -256,54 +256,54 @@ 
 		 * @param array                $components List of core components to load.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
+		$components = apply_filters('customize_loaded_components', $this->components, $this);
 
-		if ( in_array( 'widgets', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
-			$this->widgets = new WP_Customize_Widgets( $this );
+		if (in_array('widgets', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-widgets.php');
+			$this->widgets = new WP_Customize_Widgets($this);
 		}
 
-		if ( in_array( 'nav_menus', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
-			$this->nav_menus = new WP_Customize_Nav_Menus( $this );
+		if (in_array('nav_menus', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-nav-menus.php');
+			$this->nav_menus = new WP_Customize_Nav_Menus($this);
 		}
 
-		if ( in_array( 'selective_refresh', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
-			$this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
+		if (in_array('selective_refresh', $components, true)) {
+			require_once(ABSPATH.WPINC.'/customize/class-wp-customize-selective-refresh.php');
+			$this->selective_refresh = new WP_Customize_Selective_Refresh($this);
 		}
 
-		add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
+		add_filter('wp_die_handler', array($this, 'wp_die_handler'));
 
-		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action('setup_theme', array($this, 'setup_theme'));
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 
 		// Run wp_redirect_status late to make sure we override the status last.
-		add_action( 'wp_redirect_status', array( $this, 'wp_redirect_status' ), 1000 );
+		add_action('wp_redirect_status', array($this, 'wp_redirect_status'), 1000);
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
-		remove_action( 'init', 'wp_cron' );
+		remove_action('init', 'wp_cron');
 
 		// Do not run update checks when rendering the controls.
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
-		add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action('wp_ajax_customize_save', array($this, 'save'));
+		add_action('wp_ajax_customize_refresh_nonces', array($this, 'refresh_nonces'));
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
+		add_action('customize_register', array($this, 'register_controls'));
+		add_action('customize_register', array($this, 'register_dynamic_settings'), 11); // allow code to create settings first
+		add_action('customize_controls_init', array($this, 'prepare_controls'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_control_scripts'));
 
 		// Render Panel, Section, and Control templates.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_panel_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_section_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_control_templates' ), 1 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_panel_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_section_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_control_templates'), 1);
 
 		// Export the settings to JS via the _wpCustomizeSettings variable.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_pane_settings' ), 1000 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'customize_pane_settings'), 1000);
 	}
 
 	/**
@@ -316,20 +316,20 @@ 
 	 * @param string|null $action Whether the supplied AJAX action is being run.
 	 * @return bool True if it's an AJAX request, false otherwise.
 	 */
-	public function doing_ajax( $action = null ) {
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		if ( ! $doing_ajax ) {
+	public function doing_ajax($action = null) {
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		if ( ! $doing_ajax) {
 			return false;
 		}
 
-		if ( ! $action ) {
+		if ( ! $action) {
 			return true;
 		} else {
 			/*
 			 * Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
 			 * to check before admin-ajax.php gets to that point.
 			 */
-			return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
+			return isset($_REQUEST['action']) && wp_unslash($_REQUEST['action']) === $action;
 		}
 	}
 
@@ -342,16 +342,16 @@ 
 	 * @param mixed $ajax_message AJAX return
 	 * @param mixed $message UI message
 	 */
-	protected function wp_die( $ajax_message, $message = null ) {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
-			wp_die( $ajax_message );
+	protected function wp_die($ajax_message, $message = null) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
+			wp_die($ajax_message);
 		}
 
-		if ( ! $message ) {
-			$message = __( 'Cheatin’ uh?' );
+		if ( ! $message) {
+			$message = __('Cheatin’ uh?');
 		}
 
-		wp_die( $message );
+		wp_die($message);
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	 * @return string
 	 */
 	public function wp_die_handler() {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
 			return '_ajax_wp_die_handler';
 		}
 
@@ -379,41 +379,41 @@ 
 	public function setup_theme() {
 		send_origin_headers();
 
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( is_admin() && ! $doing_ajax_or_is_customized ) {
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if (is_admin() && ! $doing_ajax_or_is_customized) {
 			auth_redirect();
-		} elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) {
-			$this->wp_die( 0, __( 'You must be logged in to complete this action.' ) );
+		} elseif ($doing_ajax_or_is_customized && ! is_user_logged_in()) {
+			$this->wp_die(0, __('You must be logged in to complete this action.'));
 		}
 
-		show_admin_bar( false );
+		show_admin_bar(false);
 
-		if ( ! current_user_can( 'customize' ) ) {
-			$this->wp_die( -1, __( 'You are not allowed to customize the appearance of this site.' ) );
+		if ( ! current_user_can('customize')) {
+			$this->wp_die( -1, __('You are not allowed to customize the appearance of this site.') );
 		}
 
 		$this->original_stylesheet = get_stylesheet();
 
-		$this->theme = wp_get_theme( isset( $_REQUEST['theme'] ) ? $_REQUEST['theme'] : null );
+		$this->theme = wp_get_theme(isset($_REQUEST['theme']) ? $_REQUEST['theme'] : null);
 
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			// Once the theme is loaded, we'll validate it.
-			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'));
 		} else {
 			// If the requested theme is not the active theme and the user doesn't have the
 			// switch_themes cap, bail.
-			if ( ! current_user_can( 'switch_themes' ) ) {
-				$this->wp_die( -1, __( 'You are not allowed to edit theme options on this site.' ) );
+			if ( ! current_user_can('switch_themes')) {
+				$this->wp_die( -1, __('You are not allowed to edit theme options on this site.') );
 			}
 
 			// If the theme has errors while loading, bail.
-			if ( $this->theme()->errors() ) {
+			if ($this->theme()->errors()) {
 				$this->wp_die( -1, $this->theme()->errors()->get_error_message() );
 			}
 
 			// If the theme isn't allowed per multisite settings, bail.
-			if ( ! $this->theme()->is_allowed() ) {
-				$this->wp_die( -1, __( 'The requested theme does not exist.' ) );
+			if ( ! $this->theme()->is_allowed()) {
+				$this->wp_die( -1, __('The requested theme does not exist.') );
 			}
 		}
 
@@ -426,9 +426,9 @@ 
 	 * @since 3.4.0
 	 */
 	public function after_setup_theme() {
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_SERVER['customized'] ) );
-		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme() ) {
-			wp_redirect( 'themes.php?broken=true' );
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_SERVER['customized']));
+		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme()) {
+			wp_redirect('themes.php?broken=true');
 			exit;
 		}
 	}
@@ -441,24 +441,24 @@ 
 	 */
 	public function start_previewing_theme() {
 		// Bail if we're already previewing.
-		if ( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = true;
 
-		if ( ! $this->is_theme_active() ) {
-			add_filter( 'template', array( $this, 'get_template' ) );
-			add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			add_filter('template', array($this, 'get_template'));
+			add_filter('stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			add_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			add_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			add_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -468,7 +468,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'start_previewing_theme', $this );
+		do_action('start_previewing_theme', $this);
 	}
 
 	/**
@@ -479,24 +479,24 @@ 
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
-		if ( ! $this->is_preview() ) {
+		if ( ! $this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = false;
 
-		if ( ! $this->is_theme_active() ) {
-			remove_filter( 'template', array( $this, 'get_template' ) );
-			remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			remove_filter('template', array($this, 'get_template'));
+			remove_filter('stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			remove_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			remove_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			remove_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -506,7 +506,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'stop_previewing_theme', $this );
+		do_action('stop_previewing_theme', $this);
 	}
 
 	/**
@@ -517,7 +517,7 @@ 
 	 * @return WP_Theme
 	 */
 	public function theme() {
-		if ( ! $this->theme ) {
+		if ( ! $this->theme) {
 			$this->theme = wp_get_theme();
 		}
 		return $this->theme;
@@ -604,9 +604,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_register', $this );
+		do_action('customize_register', $this);
 
-		if ( $this->is_preview() && ! is_admin() )
+		if ($this->is_preview() && ! is_admin())
 			$this->customize_preview_init();
 	}
 
@@ -621,8 +621,8 @@ 
 	 * @param $status
 	 * @return int
 	 */
-	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
+	public function wp_redirect_status($status) {
+		if ($this->is_preview() && ! is_admin())
 			return 200;
 
 		return $status;
@@ -637,15 +637,15 @@ 
 	 * @return array
 	 */
 	public function unsanitized_post_values() {
-		if ( ! isset( $this->_post_values ) ) {
-			if ( isset( $_POST['customized'] ) ) {
-				$this->_post_values = json_decode( wp_unslash( $_POST['customized'] ), true );
+		if ( ! isset($this->_post_values)) {
+			if (isset($_POST['customized'])) {
+				$this->_post_values = json_decode(wp_unslash($_POST['customized']), true);
 			}
-			if ( empty( $this->_post_values ) ) { // if not isset or if JSON error
+			if (empty($this->_post_values)) { // if not isset or if JSON error
 				$this->_post_values = array();
 			}
 		}
-		if ( empty( $this->_post_values ) ) {
+		if (empty($this->_post_values)) {
 			return array();
 		} else {
 			return $this->_post_values;
@@ -662,10 +662,10 @@ 
 	 * @param mixed $default value returned $setting has no post value (added in 4.2.0).
 	 * @return string|mixed $post_value Sanitized value or the $default provided
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value($setting, $default = null) {
 		$post_values = $this->unsanitized_post_values();
-		if ( array_key_exists( $setting->id, $post_values ) ) {
-			return $setting->sanitize( $post_values[ $setting->id ] );
+		if (array_key_exists($setting->id, $post_values)) {
+			return $setting->sanitize($post_values[$setting->id]);
 		} else {
 			return $default;
 		}
@@ -680,9 +680,9 @@ 
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
 	 */
-	public function set_post_value( $setting_id, $value ) {
+	public function set_post_value($setting_id, $value) {
 		$this->unsanitized_post_values();
-		$this->_post_values[ $setting_id ] = $value;
+		$this->_post_values[$setting_id] = $value;
 
 		/**
 		 * Announce when a specific setting's unsanitized post value has been set.
@@ -696,7 +696,7 @@ 
 		 * @param mixed                $value Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this  WP_Customize_Manager instance.
 		 */
-		do_action( "customize_post_value_set_{$setting_id}", $value, $this );
+		do_action("customize_post_value_set_{$setting_id}", $value, $this);
 
 		/**
 		 * Announce when any setting's unsanitized post value has been set.
@@ -712,7 +712,7 @@ 
 		 * @param mixed                $value      Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_post_value_set', $setting_id, $value, $this );
+		do_action('customize_post_value_set', $setting_id, $value, $this);
 	}
 
 	/**
@@ -721,20 +721,20 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_init() {
-		$this->nonce_tick = check_ajax_referer( 'preview-customize_' . $this->get_stylesheet(), 'nonce' );
+		$this->nonce_tick = check_ajax_referer('preview-customize_'.$this->get_stylesheet(), 'nonce');
 
 		$this->prepare_controls();
 
-		wp_enqueue_script( 'customize-preview' );
-		add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
-		add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
-		add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
-		add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
+		wp_enqueue_script('customize-preview');
+		add_action('wp', array($this, 'customize_preview_override_404_status'));
+		add_action('wp_head', array($this, 'customize_preview_base'));
+		add_action('wp_head', array($this, 'customize_preview_html5'));
+		add_action('wp_head', array($this, 'customize_preview_loading_style'));
+		add_action('wp_footer', array($this, 'customize_preview_settings'), 20);
+		add_action('shutdown', array($this, 'customize_preview_signature'), 1000);
+		add_filter('wp_die_handler', array($this, 'remove_preview_signature'));
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->preview();
 		}
 
@@ -746,7 +746,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_preview_init', $this );
+		do_action('customize_preview_init', $this);
 	}
 
 	/**
@@ -757,8 +757,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
-		if ( is_404() ) {
-			status_header( 200 );
+		if (is_404()) {
+			status_header(200);
 		}
 	}
 
@@ -768,7 +768,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_base() {
-		?><base href="<?php echo home_url( '/' ); ?>" /><?php
+		?><base href="<?php echo home_url('/'); ?>" /><?php
 	}
 
 	/**
@@ -821,43 +821,43 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url' => array(
-				'self' => empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+				'self' => empty($_SERVER['REQUEST_URI']) ? home_url('/') : esc_url_raw(wp_unslash($_SERVER['REQUEST_URI'])),
 			),
-			'channel' => wp_unslash( $_POST['customize_messenger_channel'] ),
+			'channel' => wp_unslash($_POST['customize_messenger_channel']),
 			'activePanels' => array(),
 			'activeSections' => array(),
 			'activeControls' => array(),
 			'nonce' => $this->get_nonces(),
 			'l10n' => array(
-				'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+				'shiftClickToEdit' => __('Shift-click to edit this element.'),
 			),
-			'_dirty' => array_keys( $this->unsanitized_post_values() ),
+			'_dirty' => array_keys($this->unsanitized_post_values()),
 		);
 
-		foreach ( $this->panels as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['activePanels'][ $panel_id ] = $panel->active();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['activeSections'][ $section_id ] = $section->active();
+		foreach ($this->panels as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['activePanels'][$panel_id] = $panel->active();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['activeSections'][$section_id] = $section->active();
 					}
 				}
 			}
 		}
-		foreach ( $this->sections as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['activeSections'][ $id ] = $section->active();
+		foreach ($this->sections as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['activeSections'][$id] = $section->active();
 			}
 		}
-		foreach ( $this->controls as $id => $control ) {
-			if ( $control->check_capabilities() ) {
-				$settings['activeControls'][ $id ] = $control->active();
+		foreach ($this->controls as $id => $control) {
+			if ($control->check_capabilities()) {
+				$settings['activeControls'][$id] = $control->active();
 			}
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.values = {};
 			(function( v ) {
 				<?php
@@ -866,12 +866,12 @@ 
 				 * serialization in order to avoid a peak memory usage spike.
 				 * @todo We may not even need to export the values at all since the pane syncs them anyway.
 				 */
-				foreach ( $this->settings as $id => $setting ) {
-					if ( $setting->check_capabilities() ) {
+				foreach ($this->settings as $id => $setting) {
+					if ($setting->check_capabilities()) {
 						printf(
 							"v[%s] = %s;\n",
-							wp_json_encode( $id ),
-							wp_json_encode( $setting->js_value() )
+							wp_json_encode($id),
+							wp_json_encode($setting->js_value())
 						);
 					}
 				}
@@ -898,8 +898,8 @@ 
 	 * @param mixed $return Value passed through for wp_die_handler filter.
 	 * @return mixed Value passed through for wp_die_handler filter.
 	 */
-	public function remove_preview_signature( $return = null ) {
-		remove_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
+	public function remove_preview_signature($return = null) {
+		remove_action('shutdown', array($this, 'customize_preview_signature'), 1000);
 
 		return $return;
 	}
@@ -945,7 +945,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
-		return get_raw_theme_root( $this->get_template(), true );
+		return get_raw_theme_root($this->get_template(), true);
 	}
 
 	/**
@@ -956,7 +956,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
-		return get_raw_theme_root( $this->get_stylesheet(), true );
+		return get_raw_theme_root($this->get_stylesheet(), true);
 	}
 
 	/**
@@ -967,7 +967,7 @@ 
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
-	public function current_theme( $current_theme ) {
+	public function current_theme($current_theme) {
 		return $this->theme()->display('Name');
 	}
 
@@ -977,22 +977,22 @@ 
 	 * @since 3.4.0
 	 */
 	public function save() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		$action = 'save-customize_' . $this->get_stylesheet();
-		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
-			wp_send_json_error( 'invalid_nonce' );
+		$action = 'save-customize_'.$this->get_stylesheet();
+		if ( ! check_ajax_referer($action, 'nonce', false)) {
+			wp_send_json_error('invalid_nonce');
 		}
 
 		// Do we have to switch themes?
-		if ( ! $this->is_theme_active() ) {
+		if ( ! $this->is_theme_active()) {
 			// Temporarily stop previewing the theme to allow switch_themes()
 			// to operate properly.
 			$this->stop_previewing_theme();
-			switch_theme( $this->get_stylesheet() );
-			update_option( 'theme_switched_via_customizer', true );
+			switch_theme($this->get_stylesheet());
+			update_option('theme_switched_via_customizer', true);
 			$this->start_previewing_theme();
 		}
 
@@ -1004,9 +1004,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save', $this );
+		do_action('customize_save', $this);
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->save();
 		}
 
@@ -1017,7 +1017,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_after', $this );
+		do_action('customize_save_after', $this);
 
 		/**
 		 * Filter response data for a successful customize_save AJAX request.
@@ -1030,8 +1030,8 @@ 
 		 *                                   event on `wp.customize`.
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		$response = apply_filters( 'customize_save_response', array(), $this );
-		wp_send_json_success( $response );
+		$response = apply_filters('customize_save_response', array(), $this);
+		wp_send_json_success($response);
 	}
 
 	/**
@@ -1040,11 +1040,11 @@ 
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		wp_send_json_success( $this->get_nonces() );
+		wp_send_json_success($this->get_nonces());
 	}
 
 	/**
@@ -1059,22 +1059,22 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Setting             The instance of the setting that was added.
 	 */
-	public function add_setting( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Setting ) {
+	public function add_setting($id, $args = array()) {
+		if ($id instanceof WP_Customize_Setting) {
 			$setting = $id;
 		} else {
 			$class = 'WP_Customize_Setting';
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$args = apply_filters( 'customize_dynamic_setting_args', $args, $id );
+			$args = apply_filters('customize_dynamic_setting_args', $args, $id);
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$class = apply_filters( 'customize_dynamic_setting_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_setting_class', $class, $id, $args);
 
-			$setting = new $class( $this, $id, $args );
+			$setting = new $class($this, $id, $args);
 		}
 
-		$this->settings[ $setting->id ] = $setting;
+		$this->settings[$setting->id] = $setting;
 		return $setting;
 	}
 
@@ -1093,11 +1093,11 @@ 
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return array The WP_Customize_Setting objects added.
 	 */
-	public function add_dynamic_settings( $setting_ids ) {
+	public function add_dynamic_settings($setting_ids) {
 		$new_settings = array();
-		foreach ( $setting_ids as $setting_id ) {
+		foreach ($setting_ids as $setting_id) {
 			// Skip settings already created
-			if ( $this->get_setting( $setting_id ) ) {
+			if ($this->get_setting($setting_id)) {
 				continue;
 			}
 
@@ -1116,8 +1116,8 @@ 
 			 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 			 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 */
-			$setting_args = apply_filters( 'customize_dynamic_setting_args', $setting_args, $setting_id );
-			if ( false === $setting_args ) {
+			$setting_args = apply_filters('customize_dynamic_setting_args', $setting_args, $setting_id);
+			if (false === $setting_args) {
 				continue;
 			}
 
@@ -1130,11 +1130,11 @@ 
 			 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 			 */
-			$setting_class = apply_filters( 'customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args );
+			$setting_class = apply_filters('customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args);
 
-			$setting = new $setting_class( $this, $setting_id, $setting_args );
+			$setting = new $setting_class($this, $setting_id, $setting_args);
 
-			$this->add_setting( $setting );
+			$this->add_setting($setting);
 			$new_settings[] = $setting;
 		}
 		return $new_settings;
@@ -1148,9 +1148,9 @@ 
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 	 */
-	public function get_setting( $id ) {
-		if ( isset( $this->settings[ $id ] ) ) {
-			return $this->settings[ $id ];
+	public function get_setting($id) {
+		if (isset($this->settings[$id])) {
+			return $this->settings[$id];
 		}
 	}
 
@@ -1161,8 +1161,8 @@ 
 	 *
 	 * @param string $id Customize Setting ID.
 	 */
-	public function remove_setting( $id ) {
-		unset( $this->settings[ $id ] );
+	public function remove_setting($id) {
+		unset($this->settings[$id]);
 	}
 
 	/**
@@ -1177,14 +1177,14 @@ 
 	 *
 	 * @return WP_Customize_Panel             The instance of the panel that was added.
 	 */
-	public function add_panel( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Panel ) {
+	public function add_panel($id, $args = array()) {
+		if ($id instanceof WP_Customize_Panel) {
 			$panel = $id;
 		} else {
-			$panel = new WP_Customize_Panel( $this, $id, $args );
+			$panel = new WP_Customize_Panel($this, $id, $args);
 		}
 
-		$this->panels[ $panel->id ] = $panel;
+		$this->panels[$panel->id] = $panel;
 		return $panel;
 	}
 
@@ -1197,9 +1197,9 @@ 
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 	 */
-	public function get_panel( $id ) {
-		if ( isset( $this->panels[ $id ] ) ) {
-			return $this->panels[ $id ];
+	public function get_panel($id) {
+		if (isset($this->panels[$id])) {
+			return $this->panels[$id];
 		}
 	}
 
@@ -1211,18 +1211,18 @@ 
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
-	public function remove_panel( $id ) {
+	public function remove_panel($id) {
 		// Removing core components this way is _doing_it_wrong().
-		if ( in_array( $id, $this->components, true ) ) {
+		if (in_array($id, $this->components, true)) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(__('Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.'),
 				$id,
-				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
+				'<a href="'.esc_url('https://developer.wordpress.org/reference/hooks/customize_loaded_components/').'"><code>customize_loaded_components</code></a>'
 			);
 
-			_doing_it_wrong( __METHOD__, $message, '4.5' );
+			_doing_it_wrong(__METHOD__, $message, '4.5');
 		}
-		unset( $this->panels[ $id ] );
+		unset($this->panels[$id]);
 	}
 
 	/**
@@ -1237,7 +1237,7 @@ 
 	 *
 	 * @param string $panel Name of a custom panel which is a subclass of WP_Customize_Panel.
 	 */
-	public function register_panel_type( $panel ) {
+	public function register_panel_type($panel) {
 		$this->registered_panel_types[] = $panel;
 	}
 
@@ -1248,8 +1248,8 @@ 
 	 * @access public
 	 */
 	public function render_panel_templates() {
-		foreach ( $this->registered_panel_types as $panel_type ) {
-			$panel = new $panel_type( $this, 'temp', array() );
+		foreach ($this->registered_panel_types as $panel_type) {
+			$panel = new $panel_type($this, 'temp', array());
 			$panel->print_template();
 		}
 	}
@@ -1266,14 +1266,14 @@ 
 	 *
 	 * @return WP_Customize_Section             The instance of the section that was added.
 	 */
-	public function add_section( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Section ) {
+	public function add_section($id, $args = array()) {
+		if ($id instanceof WP_Customize_Section) {
 			$section = $id;
 		} else {
-			$section = new WP_Customize_Section( $this, $id, $args );
+			$section = new WP_Customize_Section($this, $id, $args);
 		}
 
-		$this->sections[ $section->id ] = $section;
+		$this->sections[$section->id] = $section;
 		return $section;
 	}
 
@@ -1285,9 +1285,9 @@ 
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
-	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+	public function get_section($id) {
+		if (isset($this->sections[$id]))
+			return $this->sections[$id];
 	}
 
 	/**
@@ -1297,8 +1297,8 @@ 
 	 *
 	 * @param string $id Section ID.
 	 */
-	public function remove_section( $id ) {
-		unset( $this->sections[ $id ] );
+	public function remove_section($id) {
+		unset($this->sections[$id]);
 	}
 
 	/**
@@ -1313,7 +1313,7 @@ 
 	 *
 	 * @param string $section Name of a custom section which is a subclass of WP_Customize_Section.
 	 */
-	public function register_section_type( $section ) {
+	public function register_section_type($section) {
 		$this->registered_section_types[] = $section;
 	}
 
@@ -1324,8 +1324,8 @@ 
 	 * @access public
 	 */
 	public function render_section_templates() {
-		foreach ( $this->registered_section_types as $section_type ) {
-			$section = new $section_type( $this, 'temp', array() );
+		foreach ($this->registered_section_types as $section_type) {
+			$section = new $section_type($this, 'temp', array());
 			$section->print_template();
 		}
 	}
@@ -1342,14 +1342,14 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Control             The instance of the control that was added.
 	 */
-	public function add_control( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Control ) {
+	public function add_control($id, $args = array()) {
+		if ($id instanceof WP_Customize_Control) {
 			$control = $id;
 		} else {
-			$control = new WP_Customize_Control( $this, $id, $args );
+			$control = new WP_Customize_Control($this, $id, $args);
 		}
 
-		$this->controls[ $control->id ] = $control;
+		$this->controls[$control->id] = $control;
 		return $control;
 	}
 
@@ -1361,9 +1361,9 @@ 
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
-	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+	public function get_control($id) {
+		if (isset($this->controls[$id]))
+			return $this->controls[$id];
 	}
 
 	/**
@@ -1373,8 +1373,8 @@ 
 	 *
 	 * @param string $id ID of the control.
 	 */
-	public function remove_control( $id ) {
-		unset( $this->controls[ $id ] );
+	public function remove_control($id) {
+		unset($this->controls[$id]);
 	}
 
 	/**
@@ -1388,7 +1388,7 @@ 
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        {@see WP_Customize_Control}.
 	 */
-	public function register_control_type( $control ) {
+	public function register_control_type($control) {
 		$this->registered_control_types[] = $control;
 	}
 
@@ -1399,10 +1399,10 @@ 
 	 * @access public
 	 */
 	public function render_control_templates() {
-		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
+		foreach ($this->registered_control_types as $control_type) {
+			$control = new $control_type($this, 'temp', array(
 				'settings' => array(),
-			) );
+			));
 			$control->print_template();
 		}
 	}
@@ -1416,8 +1416,8 @@ 
 	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
-	protected function _cmp_priority( $a, $b ) {
-		if ( $a->priority === $b->priority ) {
+	protected function _cmp_priority($a, $b) {
+		if ($a->priority === $b->priority) {
 			return $a->instance_number - $b->instance_number;
 		} else {
 			return $a->priority - $b->priority;
@@ -1436,58 +1436,58 @@ 
 	public function prepare_controls() {
 
 		$controls = array();
-		uasort( $this->controls, array( $this, '_cmp_priority' ) );
+		uasort($this->controls, array($this, '_cmp_priority'));
 
-		foreach ( $this->controls as $id => $control ) {
-			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
+		foreach ($this->controls as $id => $control) {
+			if ( ! isset($this->sections[$control->section]) || ! $control->check_capabilities()) {
 				continue;
 			}
 
-			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$this->sections[$control->section]->controls[] = $control;
+			$controls[$id] = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		uasort( $this->sections, array( $this, '_cmp_priority' ) );
+		uasort($this->sections, array($this, '_cmp_priority'));
 		$sections = array();
 
-		foreach ( $this->sections as $section ) {
-			if ( ! $section->check_capabilities() ) {
+		foreach ($this->sections as $section) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
-			usort( $section->controls, array( $this, '_cmp_priority' ) );
+			usort($section->controls, array($this, '_cmp_priority'));
 
-			if ( ! $section->panel ) {
+			if ( ! $section->panel) {
 				// Top-level section.
-				$sections[ $section->id ] = $section;
+				$sections[$section->id] = $section;
 			} else {
 				// This section belongs to a panel.
-				if ( isset( $this->panels [ $section->panel ] ) ) {
-					$this->panels[ $section->panel ]->sections[ $section->id ] = $section;
+				if (isset($this->panels [$section->panel])) {
+					$this->panels[$section->panel]->sections[$section->id] = $section;
 				}
 			}
 		}
 		$this->sections = $sections;
 
 		// Prepare panels.
-		uasort( $this->panels, array( $this, '_cmp_priority' ) );
+		uasort($this->panels, array($this, '_cmp_priority'));
 		$panels = array();
 
-		foreach ( $this->panels as $panel ) {
-			if ( ! $panel->check_capabilities() ) {
+		foreach ($this->panels as $panel) {
+			if ( ! $panel->check_capabilities()) {
 				continue;
 			}
 
-			uasort( $panel->sections, array( $this, '_cmp_priority' ) );
-			$panels[ $panel->id ] = $panel;
+			uasort($panel->sections, array($this, '_cmp_priority'));
+			$panels[$panel->id] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		uasort( $this->containers, array( $this, '_cmp_priority' ) );
+		$this->containers = array_merge($this->panels, $this->sections);
+		uasort($this->containers, array($this, '_cmp_priority'));
 	}
 
 	/**
@@ -1496,7 +1496,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
-		foreach ( $this->controls as $control ) {
+		foreach ($this->controls as $control) {
 			$control->enqueue();
 		}
 	}
@@ -1510,7 +1510,7 @@ 
 	 * @return bool Whether the user agent is iOS.
 	 */
 	public function is_ios() {
-		return wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
+		return wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']);
 	}
 
 	/**
@@ -1522,14 +1522,14 @@ 
 	 * @return string The template string for the document title.
 	 */
 	public function get_document_title_template() {
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Customize: %s' );
+			$document_title_tmpl = __('Customize: %s');
 		} else {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Live Preview: %s' );
+			$document_title_tmpl = __('Live Preview: %s');
 		}
-		$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // Because exported to JS and assigned to document.title.
+		$document_title_tmpl = html_entity_decode($document_title_tmpl, ENT_QUOTES, 'UTF-8'); // Because exported to JS and assigned to document.title.
 		return $document_title_tmpl;
 	}
 
@@ -1543,8 +1543,8 @@ 
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
-	public function set_preview_url( $preview_url ) {
-		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
+	public function set_preview_url($preview_url) {
+		$this->preview_url = wp_validate_redirect($preview_url, home_url('/'));
 	}
 
 	/**
@@ -1556,8 +1556,8 @@ 
 	 * @return string URL being previewed.
 	 */
 	public function get_preview_url() {
-		if ( empty( $this->preview_url ) ) {
-			$preview_url = home_url( '/' );
+		if (empty($this->preview_url)) {
+			$preview_url = home_url('/');
 		} else {
 			$preview_url = $this->preview_url;
 		}
@@ -1574,9 +1574,9 @@ 
 	 *
 	 * @param string $return_url URL for return link.
 	 */
-	public function set_return_url( $return_url ) {
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+	public function set_return_url($return_url) {
+		$return_url = remove_query_arg(wp_removable_query_args(), $return_url);
+		$return_url = wp_validate_redirect($return_url);
 		$this->return_url = $return_url;
 	}
 
@@ -1590,16 +1590,16 @@ 
 	 */
 	public function get_return_url() {
 		$referer = wp_get_referer();
-		$excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+		$excluded_referer_basenames = array('customize.php', 'wp-login.php');
 
-		if ( $this->return_url ) {
+		if ($this->return_url) {
 			$return_url = $this->return_url;
-		} else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} else if ($referer && ! in_array(basename(parse_url($referer, PHP_URL_PATH)), $excluded_referer_basenames, true)) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} else if ($this->preview_url) {
 			$return_url = $this->preview_url;
 		} else {
-			$return_url = home_url( '/' );
+			$return_url = home_url('/');
 		}
 		return $return_url;
 	}
@@ -1618,8 +1618,8 @@ 
 	 *     @type string [$panel]    ID for panel to be autofocused.
 	 * }
 	 */
-	public function set_autofocus( $autofocus ) {
-		$this->autofocus = array_filter( wp_array_slice_assoc( $autofocus, array( 'panel', 'section', 'control' ) ), 'is_string' );
+	public function set_autofocus($autofocus) {
+		$this->autofocus = array_filter(wp_array_slice_assoc($autofocus, array('panel', 'section', 'control')), 'is_string');
 	}
 
 	/**
@@ -1648,8 +1648,8 @@ 
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'save' => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet()),
 		);
 
 		/**
@@ -1661,7 +1661,7 @@ 
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
-		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
+		$nonces = apply_filters('customize_refresh_nonces', $nonces, $this);
 
 		return $nonces;
 	}
@@ -1681,13 +1681,13 @@ 
 		 * using the customize_allowed_urls filter.
 		 */
 
-		$allowed_urls = array( home_url( '/' ) );
-		$admin_origin = parse_url( admin_url() );
-		$home_origin  = parse_url( home_url() );
-		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
+		$allowed_urls = array(home_url('/'));
+		$admin_origin = parse_url(admin_url());
+		$home_origin  = parse_url(home_url());
+		$cross_domain = (strtolower($admin_origin['host']) !== strtolower($home_origin['host']));
 
-		if ( is_ssl() && ! $cross_domain ) {
-			$allowed_urls[] = home_url( '/', 'https' );
+		if (is_ssl() && ! $cross_domain) {
+			$allowed_urls[] = home_url('/', 'https');
 		}
 
 		/**
@@ -1697,12 +1697,12 @@ 
 		 *
 		 * @param array $allowed_urls An array of allowed URLs.
 		 */
-		$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+		$allowed_urls = array_unique(apply_filters('customize_allowed_urls', $allowed_urls));
 
-		$login_url = add_query_arg( array(
+		$login_url = add_query_arg(array(
 			'interim-login' => 1,
 			'customize-login' => 1,
-		), wp_login_url() );
+		), wp_login_url());
 
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
@@ -1711,14 +1711,14 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url'      => array(
-				'preview'       => esc_url_raw( $this->get_preview_url() ),
-				'parent'        => esc_url_raw( admin_url() ),
-				'activated'     => esc_url_raw( home_url( '/' ) ),
-				'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
-				'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
+				'preview'       => esc_url_raw($this->get_preview_url()),
+				'parent'        => esc_url_raw(admin_url()),
+				'activated'     => esc_url_raw(home_url('/')),
+				'ajax'          => esc_url_raw(admin_url('admin-ajax.php', 'relative')),
+				'allowed'       => array_map('esc_url_raw', $allowed_urls),
 				'isCrossDomain' => $cross_domain,
-				'home'          => esc_url_raw( home_url( '/' ) ),
-				'login'         => esc_url_raw( $login_url ),
+				'home'          => esc_url_raw(home_url('/')),
+				'login'         => esc_url_raw($login_url),
 			),
 			'browser'  => array(
 				'mobile' => wp_is_mobile(),
@@ -1730,23 +1730,23 @@ 
 			'autofocus' => $this->get_autofocus(),
 			'documentTitleTmpl' => $this->get_document_title_template(),
 			'previewableDevices' => $this->get_previewable_devices(),
-			'selectiveRefreshEnabled' => isset( $this->selective_refresh ),
+			'selectiveRefreshEnabled' => isset($this->selective_refresh),
 		);
 
 		// Prepare Customize Section objects to pass to JavaScript.
-		foreach ( $this->sections() as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['sections'][ $id ] = $section->json();
+		foreach ($this->sections() as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['sections'][$id] = $section->json();
 			}
 		}
 
 		// Prepare Customize Panel objects to pass to JavaScript.
-		foreach ( $this->panels() as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['panels'][ $panel_id ] = $panel->json();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['sections'][ $section_id ] = $section->json();
+		foreach ($this->panels() as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['panels'][$panel_id] = $panel->json();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['sections'][$section_id] = $section->json();
 					}
 				}
 			}
@@ -1754,23 +1754,23 @@ 
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.controls = {};
 			_wpCustomizeSettings.settings = {};
 			<?php
 
 			// Serialize settings one by one to improve memory usage.
 			echo "(function ( s ){\n";
-			foreach ( $this->settings() as $setting ) {
-				if ( $setting->check_capabilities() ) {
+			foreach ($this->settings() as $setting) {
+				if ($setting->check_capabilities()) {
 					printf(
 						"s[%s] = %s;\n",
-						wp_json_encode( $setting->id ),
-						wp_json_encode( array(
+						wp_json_encode($setting->id),
+						wp_json_encode(array(
 							'value'     => $setting->js_value(),
 							'transport' => $setting->transport,
 							'dirty'     => $setting->dirty,
-						) )
+						))
 					);
 				}
 			}
@@ -1778,12 +1778,12 @@ 
 
 			// Serialize controls one by one to improve memory usage.
 			echo "(function ( c ){\n";
-			foreach ( $this->controls() as $control ) {
-				if ( $control->check_capabilities() ) {
+			foreach ($this->controls() as $control) {
+				if ($control->check_capabilities()) {
 					printf(
 						"c[%s] = %s;\n",
-						wp_json_encode( $control->id ),
-						wp_json_encode( $control->json() )
+						wp_json_encode($control->id),
+						wp_json_encode($control->json())
 					);
 				}
 			}
@@ -1804,14 +1804,14 @@ 
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label' => __('Enter desktop preview mode'),
 				'default' => true,
 			),
 			'tablet' => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __('Enter tablet preview mode'),
 			),
 			'mobile' => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __('Enter mobile preview mode'),
 			),
 		);
 
@@ -1824,7 +1824,7 @@ 
 		 *
 		 * @param array $devices List of devices with labels and default setting.
 		 */
-		$devices = apply_filters( 'customize_previewable_devices', $devices );
+		$devices = apply_filters('customize_previewable_devices', $devices);
 
 		return $devices;
 	}
@@ -1837,248 +1837,248 @@ 
 	public function register_controls() {
 
 		/* Panel, Section, and Control Types */
-		$this->register_panel_type( 'WP_Customize_Panel' );
-		$this->register_section_type( 'WP_Customize_Section' );
-		$this->register_section_type( 'WP_Customize_Sidebar_Section' );
-		$this->register_control_type( 'WP_Customize_Color_Control' );
-		$this->register_control_type( 'WP_Customize_Media_Control' );
-		$this->register_control_type( 'WP_Customize_Upload_Control' );
-		$this->register_control_type( 'WP_Customize_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-		$this->register_control_type( 'WP_Customize_Theme_Control' );
+		$this->register_panel_type('WP_Customize_Panel');
+		$this->register_section_type('WP_Customize_Section');
+		$this->register_section_type('WP_Customize_Sidebar_Section');
+		$this->register_control_type('WP_Customize_Color_Control');
+		$this->register_control_type('WP_Customize_Media_Control');
+		$this->register_control_type('WP_Customize_Upload_Control');
+		$this->register_control_type('WP_Customize_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Image_Control');
+		$this->register_control_type('WP_Customize_Cropped_Image_Control');
+		$this->register_control_type('WP_Customize_Site_Icon_Control');
+		$this->register_control_type('WP_Customize_Theme_Control');
 
 		/* Themes */
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'themes', array(
-			'title'      => $this->theme()->display( 'Name' ),
+		$this->add_section(new WP_Customize_Themes_Section($this, 'themes', array(
+			'title'      => $this->theme()->display('Name'),
 			'capability' => 'switch_themes',
 			'priority'   => 0,
-		) ) );
+		)));
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'active_theme', array(
 			'capability' => 'switch_themes',
-		) ) );
+		)));
 
-		require_once( ABSPATH . 'wp-admin/includes/theme.php' );
+		require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 		// Theme Controls.
 
 		// Add a control for the active/original theme.
-		if ( ! $this->is_theme_active() ) {
-			$themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
-			$active_theme = current( $themes );
+		if ( ! $this->is_theme_active()) {
+			$themes = wp_prepare_themes_for_js(array(wp_get_theme($this->original_stylesheet)));
+			$active_theme = current($themes);
 			$active_theme['isActiveTheme'] = true;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $active_theme['id'], array(
 				'theme'    => $active_theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		$themes = wp_prepare_themes_for_js();
-		foreach ( $themes as $theme ) {
-			if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
+		foreach ($themes as $theme) {
+			if ($theme['active'] || $theme['id'] === $this->original_stylesheet) {
 				continue;
 			}
 
-			$theme_id = 'theme_' . $theme['id'];
+			$theme_id = 'theme_'.$theme['id'];
 			$theme['isActiveTheme'] = false;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $theme_id, array(
 				'theme'    => $theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
+		$this->add_section('title_tagline', array(
+			'title'    => __('Site Identity'),
 			'priority' => 20,
-		) );
+		));
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
+		$this->add_setting('blogname', array(
+			'default'    => get_option('blogname'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
+		$this->add_control('blogname', array(
+			'label'      => __('Site Title'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_setting('blogdescription', array(
+			'default'    => get_option('blogdescription'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
+		$this->add_control('blogdescription', array(
+			'label'      => __('Tagline'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
 		// Add a setting to hide header text if the theme doesn't support custom headers.
-		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->add_setting( 'header_text', array(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
+		if ( ! current_theme_supports('custom-header', 'header-text')) {
+			$this->add_setting('header_text', array(
+				'theme_supports'    => array('custom-logo', 'header-text'),
 				'default'           => 1,
 				'sanitize_callback' => 'absint',
-			) );
+			));
 
-			$this->add_control( 'header_text', array(
-				'label'    => __( 'Display Site Title and Tagline' ),
+			$this->add_control('header_text', array(
+				'label'    => __('Display Site Title and Tagline'),
 				'section'  => 'title_tagline',
 				'settings' => 'header_text',
 				'type'     => 'checkbox',
-			) );
+			));
 		}
 
-		$this->add_setting( 'site_icon', array(
+		$this->add_setting('site_icon', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
 			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
-			'label'       => __( 'Site Icon' ),
+		$this->add_control(new WP_Customize_Site_Icon_Control($this, 'site_icon', array(
+			'label'       => __('Site Icon'),
 			'description' => sprintf(
 				/* translators: %s: site icon size in pixels */
-				__( 'The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.' ),
+				__('The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.'),
 				'<strong>512</strong>'
 			),
 			'section'     => 'title_tagline',
 			'priority'    => 60,
 			'height'      => 512,
 			'width'       => 512,
-		) ) );
+		)));
 
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
+		$this->add_setting('custom_logo', array(
+			'theme_supports' => array('custom-logo'),
 			'transport'      => 'postMessage',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Media_Control( $this, 'custom_logo', array(
-			'label'    => __( 'Logo' ),
+		$this->add_control(new WP_Customize_Media_Control($this, 'custom_logo', array(
+			'label'    => __('Logo'),
 			'section'  => 'title_tagline',
 			'priority' => 8,
 			'mime_type' => 'image',
 			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
+				'select'       => __('Select logo'),
+				'change'       => __('Change logo'),
+				'remove'       => __('Remove'),
+				'default'      => __('Default'),
+				'placeholder'  => __('No logo selected'),
+				'frame_title'  => __('Select logo'),
+				'frame_button' => __('Choose logo'),
 			),
-		) ) );
+		)));
 
-		if ( isset( $this->selective_refresh ) ) {
-			$this->selective_refresh->add_partial( 'custom_logo', array(
-				'settings'            => array( 'custom_logo' ),
+		if (isset($this->selective_refresh)) {
+			$this->selective_refresh->add_partial('custom_logo', array(
+				'settings'            => array('custom_logo'),
 				'selector'            => '.custom-logo-link',
-				'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+				'render_callback'     => array($this, '_render_custom_logo_partial'),
 				'container_inclusive' => true,
-			) );
+			));
 		}
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
+		$this->add_section('colors', array(
+			'title'          => __('Colors'),
 			'priority'       => 40,
-		) );
+		));
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting('header_textcolor', array(
+			'theme_supports' => array('custom-header', 'header-text'),
+			'default'        => get_theme_support('custom-header', 'default-text-color'),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+			'sanitize_callback'    => array($this, '_sanitize_header_textcolor'),
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
+		$this->add_control('display_header_text', array(
 			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
+			'label'    => __('Display Site Title and Tagline'),
 			'section'  => 'title_tagline',
 			'type'     => 'checkbox',
 			'priority' => 40,
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'header_textcolor', array(
+			'label'   => __('Header Text Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+		$this->add_setting('background_color', array(
+			'default'        => get_theme_support('custom-background', 'default-color'),
 			'theme_supports' => 'custom-background',
 
 			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'background_color', array(
+			'label'   => __('Background Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 
 		/* Custom Header */
 
-		$this->add_section( 'header_image', array(
-			'title'          => __( 'Header Image' ),
+		$this->add_section('header_image', array(
+			'title'          => __('Header Image'),
 			'theme_supports' => 'custom-header',
 			'priority'       => 60,
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-			'default'        => get_theme_support( 'custom-header', 'default-image' ),
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'header_image', array(
+			'default'        => get_theme_support('custom-header', 'default-image'),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+		$this->add_setting(new WP_Customize_Header_Image_Setting($this, 'header_image_data', array(
 			// 'default'        => get_theme_support( 'custom-header', 'default-image' ),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Header_Image_Control($this));
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
+		$this->add_section('background_image', array(
+			'title'          => __('Background Image'),
 			'theme_supports' => 'custom-background',
 			'priority'       => 80,
-		) );
+		));
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		$this->add_setting('background_image', array(
+			'default'        => get_theme_support('custom-background', 'default-image'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+		$this->add_setting(new WP_Customize_Background_Image_Setting($this, 'background_image_thumb', array(
 			'theme_supports' => 'custom-background',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Background_Image_Control($this));
 
-		$this->add_setting( 'background_repeat', array(
-			'default'        => get_theme_support( 'custom-background', 'default-repeat' ),
+		$this->add_setting('background_repeat', array(
+			'default'        => get_theme_support('custom-background', 'default-repeat'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_repeat', array(
-			'label'      => __( 'Background Repeat' ),
+		$this->add_control('background_repeat', array(
+			'label'      => __('Background Repeat'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2087,15 +2087,15 @@ 
 				'repeat-x'   => __('Tile Horizontally'),
 				'repeat-y'   => __('Tile Vertically'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+		$this->add_setting('background_position_x', array(
+			'default'        => get_theme_support('custom-background', 'default-position-x'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_position_x', array(
-			'label'      => __( 'Background Position' ),
+		$this->add_control('background_position_x', array(
+			'label'      => __('Background Position'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2103,28 +2103,28 @@ 
 				'center'     => __('Center'),
 				'right'      => __('Right'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_attachment', array(
-			'default'        => get_theme_support( 'custom-background', 'default-attachment' ),
+		$this->add_setting('background_attachment', array(
+			'default'        => get_theme_support('custom-background', 'default-attachment'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_attachment', array(
-			'label'      => __( 'Background Attachment' ),
+		$this->add_control('background_attachment', array(
+			'label'      => __('Background Attachment'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
 				'scroll'     => __('Scroll'),
 				'fixed'      => __('Fixed'),
 			),
-		) );
+		));
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
-		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
-			foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
-				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+		if (get_theme_support('custom-background', 'wp-head-callback') === '_custom_background_cb') {
+			foreach (array('color', 'image', 'position_x', 'repeat', 'attachment') as $prop) {
+				$this->get_setting('background_'.$prop)->transport = 'postMessage';
 			}
 		}
 
@@ -2132,54 +2132,54 @@ 
 		// #WP19627
 
 		// Replicate behavior from options-reading.php and hide front page options if there are no pages
-		if ( get_pages() ) {
-			$this->add_section( 'static_front_page', array(
-				'title'          => __( 'Static Front Page' ),
+		if (get_pages()) {
+			$this->add_section('static_front_page', array(
+				'title'          => __('Static Front Page'),
 			//	'theme_supports' => 'static-front-page',
 				'priority'       => 120,
-				'description'    => __( 'Your theme supports a static front page.' ),
-			) );
+				'description'    => __('Your theme supports a static front page.'),
+			));
 
-			$this->add_setting( 'show_on_front', array(
-				'default'        => get_option( 'show_on_front' ),
+			$this->add_setting('show_on_front', array(
+				'default'        => get_option('show_on_front'),
 				'capability'     => 'manage_options',
 				'type'           => 'option',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'show_on_front', array(
-				'label'   => __( 'Front page displays' ),
+			$this->add_control('show_on_front', array(
+				'label'   => __('Front page displays'),
 				'section' => 'static_front_page',
 				'type'    => 'radio',
 				'choices' => array(
-					'posts' => __( 'Your latest posts' ),
-					'page'  => __( 'A static page' ),
+					'posts' => __('Your latest posts'),
+					'page'  => __('A static page'),
 				),
-			) );
+			));
 
-			$this->add_setting( 'page_on_front', array(
+			$this->add_setting('page_on_front', array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_on_front', array(
-				'label'      => __( 'Front page' ),
+			$this->add_control('page_on_front', array(
+				'label'      => __('Front page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 
-			$this->add_setting( 'page_for_posts', array(
+			$this->add_setting('page_for_posts', array(
 				'type'           => 'option',
 				'capability'     => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_for_posts', array(
-				'label'      => __( 'Posts page' ),
+			$this->add_control('page_for_posts', array(
+				'label'      => __('Posts page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 		}
 	}
 
@@ -2192,7 +2192,7 @@ 
 	 * @see add_dynamic_settings()
 	 */
 	public function register_dynamic_settings() {
-		$this->add_dynamic_settings( array_keys( $this->unsanitized_post_values() ) );
+		$this->add_dynamic_settings(array_keys($this->unsanitized_post_values()));
 	}
 
 	/**
@@ -2206,13 +2206,13 @@ 
 	 * @param string $color
 	 * @return mixed
 	 */
-	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+	public function _sanitize_header_textcolor($color) {
+		if ('blank' === $color)
 			return 'blank';
 
-		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		$color = sanitize_hex_color_no_hash($color);
+		if (empty($color))
+			$color = get_theme_support('custom-header', 'default-text-color');
 
 		return $color;
 	}
@@ -2249,12 +2249,12 @@ 
  * @param string $color
  * @return string|void
  */
-function sanitize_hex_color( $color ) {
-	if ( '' === $color )
+function sanitize_hex_color($color) {
+	if ('' === $color)
 		return '';
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) )
+	if (preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color))
 		return $color;
 }
 
@@ -2272,13 +2272,13 @@ 
  * @param string $color
  * @return string|null
  */
-function sanitize_hex_color_no_hash( $color ) {
-	$color = ltrim( $color, '#' );
+function sanitize_hex_color_no_hash($color) {
+	$color = ltrim($color, '#');
 
-	if ( '' === $color )
+	if ('' === $color)
 		return '';
 
-	return sanitize_hex_color( '#' . $color ) ? $color : null;
+	return sanitize_hex_color('#'.$color) ? $color : null;
 }
 
 /**
@@ -2292,9 +2292,9 @@ 
  * @param string $color
  * @return string
  */
-function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) )
-		return '#' . $unhashed;
+function maybe_hash_hex_color($color) {
+	if ($unhashed = sanitize_hex_color_no_hash($color))
+		return '#'.$unhashed;
 
 	return $color;
 }

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

Braces +75 added lines, -52 removed lines

@@ -105,31 +105,36 @@ 
 
 		self::$this_quicktags = (bool) $set['quicktags'];
 
-		if ( self::$this_tinymce )
-			self::$has_tinymce = true;
+		if ( self::$this_tinymce ) {
+					self::$has_tinymce = true;
+		}
 
-		if ( self::$this_quicktags )
-			self::$has_quicktags = true;
+		if ( self::$this_quicktags ) {
+					self::$has_quicktags = true;
+		}
 
 		if ( $set['dfw'] ) {
 			self::$old_dfw_compat = true;
 		}
 
-		if ( empty( $set['editor_height'] ) )
-			return $set;
+		if ( empty( $set['editor_height'] ) ) {
+					return $set;
+		}
 
 		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
 			// A cookie (set when a user resizes the editor) overrides the height.
 			$cookie = (int) get_user_setting( 'ed_size' );
 
-			if ( $cookie )
-				$set['editor_height'] = $cookie;
+			if ( $cookie ) {
+							$set['editor_height'] = $cookie;
+			}
 		}
 
-		if ( $set['editor_height'] < 50 )
-			$set['editor_height'] = 50;
-		elseif ( $set['editor_height'] > 5000 )
-			$set['editor_height'] = 5000;
+		if ( $set['editor_height'] < 50 ) {
+					$set['editor_height'] = 50;
+		} elseif ( $set['editor_height'] > 5000 ) {
+					$set['editor_height'] = 5000;
+		}
 
 		return $set;
 	}
@@ -207,8 +212,9 @@ 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
 
-				if ( ! function_exists( 'media_buttons' ) )
-					include( ABSPATH . 'wp-admin/includes/media.php' );
+				if ( ! function_exists( 'media_buttons' ) ) {
+									include( ABSPATH . 'wp-admin/includes/media.php' );
+				}
 
 				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
 
@@ -316,11 +322,13 @@ 
 				'buttons' => ''
 			);
 
-			if ( is_array($set['quicktags']) )
-				$qtInit = array_merge($qtInit, $set['quicktags']);
+			if ( is_array($set['quicktags']) ) {
+							$qtInit = array_merge($qtInit, $set['quicktags']);
+			}
 
-			if ( empty($qtInit['buttons']) )
-				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			if ( empty($qtInit['buttons']) ) {
+							$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			}
 
 			if ( $set['_content_editor_dfw'] ) {
 				$qtInit['buttons'] .= ',dfw';
@@ -475,14 +483,17 @@ 
 								$path = str_replace( content_url(), '', $plugurl );
 								$path = WP_CONTENT_DIR . $path . '/langs/';
 
-								if ( function_exists('realpath') )
-									$path = trailingslashit( realpath($path) );
+								if ( function_exists('realpath') ) {
+																	$path = trailingslashit( realpath($path) );
+								}
 
-								if ( @is_file( $path . $mce_locale . '.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								if ( @is_file( $path . $mce_locale . '.js' ) ) {
+																	$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								}
 
-								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								if ( @is_file( $path . $mce_locale . '_dlg.js' ) ) {
+																	$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								}
 
 								if ( 'en' != $mce_locale && empty( $strings ) ) {
 									if ( @is_file( $path . 'en.js' ) ) {
@@ -496,8 +507,9 @@ 
 									}
 								}
 
-								if ( ! empty( $strings ) )
-									$ext_plugins .= "\n" . $strings . "\n";
+								if ( ! empty( $strings ) ) {
+																	$ext_plugins .= "\n" . $strings . "\n";
+								}
 							}
 
 							$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
@@ -577,8 +589,9 @@ 
 				 */
 				$mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
 
-				if ( ! empty($mce_css) )
-					self::$first_init['content_css'] = $mce_css;
+				if ( ! empty($mce_css) ) {
+									self::$first_init['content_css'] = $mce_css;
+				}
 			}
 
 			if ( $set['teeny'] ) {
@@ -657,10 +670,11 @@ 
 				$body_class .= ' post-type-' . sanitize_html_class( $post->post_type ) . ' post-status-' . sanitize_html_class( $post->post_status );
 				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 					$post_format = get_post_format( $post );
-					if ( $post_format && ! is_wp_error( $post_format ) )
-						$body_class .= ' post-format-' . sanitize_html_class( $post_format );
-					else
-						$body_class .= ' post-format-standard';
+					if ( $post_format && ! is_wp_error( $post_format ) ) {
+											$body_class .= ' post-format-' . sanitize_html_class( $post_format );
+					} else {
+											$body_class .= ' post-format-standard';
+					}
 				}
 			}
 
@@ -688,8 +702,9 @@ 
 			// Merge with the first part of the init array
 			$mceInit = array_merge( self::$first_init, $mceInit );
 
-			if ( is_array( $set['tinymce'] ) )
-				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			if ( is_array( $set['tinymce'] ) ) {
+							$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			}
 
 			/*
 			 * For people who really REALLY know what they're doing with TinyMCE
@@ -761,8 +776,9 @@ 
 	 * @static
 	 */
 	public static function enqueue_scripts() {
-		if ( self::$has_tinymce )
-			wp_enqueue_script('editor');
+		if ( self::$has_tinymce ) {
+					wp_enqueue_script('editor');
+		}
 
 		if ( self::$has_quicktags ) {
 			wp_enqueue_script( 'quicktags' );
@@ -1131,8 +1147,9 @@ 
 		$version = 'ver=' . $tinymce_version;
 		$tmce_on = !empty(self::$mce_settings);
 
-		if ( ! isset($concatenate_scripts) )
-			script_concat_settings();
+		if ( ! isset($concatenate_scripts) ) {
+					script_concat_settings();
+		}
 
 		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
 			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -1229,11 +1246,13 @@ 
 		<script type="text/javascript">
 		<?php
 
-		if ( self::$ext_plugins )
-			echo self::$ext_plugins . "\n";
+		if ( self::$ext_plugins ) {
+					echo self::$ext_plugins . "\n";
+		}
 
-		if ( ! is_admin() )
-			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		if ( ! is_admin() ) {
+					echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		}
 
 		?>
 
@@ -1268,8 +1287,9 @@ 
 		</script>
 		<?php
 
-		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) )
-			self::wp_link_dialog();
+		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) ) {
+					self::wp_link_dialog();
+		}
 
 		/**
 		 * Fires after any core TinyMCE editor instances are created.
@@ -1314,8 +1334,9 @@ 
 
 		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
 
-		if ( isset( $args['s'] ) )
-			$query['s'] = $args['s'];
+		if ( isset( $args['s'] ) ) {
+					$query['s'] = $args['s'];
+		}
 
 		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
 
@@ -1336,16 +1357,18 @@ 
 		$get_posts = new WP_Query;
 		$posts = $get_posts->query( $query );
 		// Check if any posts were found.
-		if ( ! $get_posts->post_count )
-			return false;
+		if ( ! $get_posts->post_count ) {
+					return false;
+		}
 
 		// Build results.
 		$results = array();
 		foreach ( $posts as $post ) {
-			if ( 'post' == $post->post_type )
-				$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
-			else
-				$info = $pts[ $post->post_type ]->labels->singular_name;
+			if ( 'post' == $post->post_type ) {
+							$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+			} else {
+							$info = $pts[ $post->post_type ]->labels->singular_name;
+			}
 
 			$results[] = array(
 				'ID' => $post->ID,

Spacing +490 added lines, -490 removed lines

@@ -62,7 +62,7 @@ 
 	 * }
 	 * @return array Parsed arguments array.
 	 */
-	public static function parse_settings( $editor_id, $settings ) {
+	public static function parse_settings($editor_id, $settings) {
 
 		/**
 		 * Filter the wp_editor() settings.
@@ -74,9 +74,9 @@ 
 		 * @param array  $settings  Array of editor arguments.
 		 * @param string $editor_id ID for the current editor instance.
 		 */
-		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
+		$settings = apply_filters('wp_editor_settings', $settings, $editor_id);
 
-		$set = wp_parse_args( $settings, array(
+		$set = wp_parse_args($settings, array(
 			'wpautop'             => true,
 			'media_buttons'       => true,
 			'default_editor'      => '',
@@ -92,43 +92,43 @@ 
 			'_content_editor_dfw' => false,
 			'tinymce'             => true,
 			'quicktags'           => true
-		) );
+		));
 
-		self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
+		self::$this_tinymce = ($set['tinymce'] && user_can_richedit());
 
-		if ( self::$this_tinymce ) {
-			if ( false !== strpos( $editor_id, '[' ) ) {
+		if (self::$this_tinymce) {
+			if (false !== strpos($editor_id, '[')) {
 				self::$this_tinymce = false;
-				_deprecated_argument( 'wp_editor()', '3.9', 'TinyMCE editor IDs cannot have brackets.' );
+				_deprecated_argument('wp_editor()', '3.9', 'TinyMCE editor IDs cannot have brackets.');
 			}
 		}
 
 		self::$this_quicktags = (bool) $set['quicktags'];
 
-		if ( self::$this_tinymce )
+		if (self::$this_tinymce)
 			self::$has_tinymce = true;
 
-		if ( self::$this_quicktags )
+		if (self::$this_quicktags)
 			self::$has_quicktags = true;
 
-		if ( $set['dfw'] ) {
+		if ($set['dfw']) {
 			self::$old_dfw_compat = true;
 		}
 
-		if ( empty( $set['editor_height'] ) )
+		if (empty($set['editor_height']))
 			return $set;
 
-		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
+		if ('content' === $editor_id && empty($set['tinymce']['wp_autoresize_on'])) {
 			// A cookie (set when a user resizes the editor) overrides the height.
-			$cookie = (int) get_user_setting( 'ed_size' );
+			$cookie = (int) get_user_setting('ed_size');
 
-			if ( $cookie )
+			if ($cookie)
 				$set['editor_height'] = $cookie;
 		}
 
-		if ( $set['editor_height'] < 50 )
+		if ($set['editor_height'] < 50)
 			$set['editor_height'] = 50;
-		elseif ( $set['editor_height'] > 5000 )
+		elseif ($set['editor_height'] > 5000)
 			$set['editor_height'] = 5000;
 
 		return $set;
@@ -142,75 +142,75 @@ 
 	 * @param string $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
 	 * @param array $settings See the _parse_settings() method for description.
 	 */
-	public static function editor( $content, $editor_id, $settings = array() ) {
-		$set = self::parse_settings( $editor_id, $settings );
-		$editor_class = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
-		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
+	public static function editor($content, $editor_id, $settings = array()) {
+		$set = self::parse_settings($editor_id, $settings);
+		$editor_class = ' class="'.trim(esc_attr($set['editor_class']).' wp-editor-area').'"';
+		$tabindex = $set['tabindex'] ? ' tabindex="'.(int) $set['tabindex'].'"' : '';
 		$default_editor = 'html';
 		$buttons = $autocomplete = '';
-		$editor_id_attr = esc_attr( $editor_id );
+		$editor_id_attr = esc_attr($editor_id);
 
-		if ( $set['drag_drop_upload'] ) {
+		if ($set['drag_drop_upload']) {
 			self::$drag_drop_upload = true;
 		}
 
-		if ( ! empty( $set['editor_height'] ) ) {
-			$height = ' style="height: ' . (int) $set['editor_height'] . 'px"';
+		if ( ! empty($set['editor_height'])) {
+			$height = ' style="height: '.(int) $set['editor_height'].'px"';
 		} else {
-			$height = ' rows="' . (int) $set['textarea_rows'] . '"';
+			$height = ' rows="'.(int) $set['textarea_rows'].'"';
 		}
 
-		if ( ! current_user_can( 'upload_files' ) ) {
+		if ( ! current_user_can('upload_files')) {
 			$set['media_buttons'] = false;
 		}
 
-		if ( self::$this_tinymce ) {
+		if (self::$this_tinymce) {
 			$autocomplete = ' autocomplete="off"';
 
-			if ( self::$this_quicktags ) {
+			if (self::$this_quicktags) {
 				$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
 				// 'html' is used for the "Text" editor tab.
-				if ( 'html' !== $default_editor ) {
+				if ('html' !== $default_editor) {
 					$default_editor = 'tinymce';
 				}
 
-				$buttons .= '<button type="button" id="' . $editor_id_attr . '-tmce" class="wp-switch-editor switch-tmce"' .
-					' data-wp-editor-id="' . $editor_id_attr . '">' . __('Visual') . "</button>\n";
-				$buttons .= '<button type="button" id="' . $editor_id_attr . '-html" class="wp-switch-editor switch-html"' .
-					' data-wp-editor-id="' . $editor_id_attr . '">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
+				$buttons .= '<button type="button" id="'.$editor_id_attr.'-tmce" class="wp-switch-editor switch-tmce"'.
+					' data-wp-editor-id="'.$editor_id_attr.'">'.__('Visual')."</button>\n";
+				$buttons .= '<button type="button" id="'.$editor_id_attr.'-html" class="wp-switch-editor switch-html"'.
+					' data-wp-editor-id="'.$editor_id_attr.'">'._x('Text', 'Name for the Text editor tab (formerly HTML)')."</button>\n";
 			} else {
 				$default_editor = 'tinymce';
 			}
 		}
 
 		$switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active';
-		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
+		$wrap_class = 'wp-core-ui wp-editor-wrap '.$switch_class;
 
-		if ( $set['_content_editor_dfw'] ) {
+		if ($set['_content_editor_dfw']) {
 			$wrap_class .= ' has-dfw';
 		}
 
-		echo '<div id="wp-' . $editor_id_attr . '-wrap" class="' . $wrap_class . '">';
+		echo '<div id="wp-'.$editor_id_attr.'-wrap" class="'.$wrap_class.'">';
 
-		if ( self::$editor_buttons_css ) {
-			wp_print_styles( 'editor-buttons' );
+		if (self::$editor_buttons_css) {
+			wp_print_styles('editor-buttons');
 			self::$editor_buttons_css = false;
 		}
 
-		if ( ! empty( $set['editor_css'] ) ) {
-			echo $set['editor_css'] . "\n";
+		if ( ! empty($set['editor_css'])) {
+			echo $set['editor_css']."\n";
 		}
 
-		if ( ! empty( $buttons ) || $set['media_buttons'] ) {
-			echo '<div id="wp-' . $editor_id_attr . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
+		if ( ! empty($buttons) || $set['media_buttons']) {
+			echo '<div id="wp-'.$editor_id_attr.'-editor-tools" class="wp-editor-tools hide-if-no-js">';
 
-			if ( $set['media_buttons'] ) {
+			if ($set['media_buttons']) {
 				self::$has_medialib = true;
 
-				if ( ! function_exists( 'media_buttons' ) )
-					include( ABSPATH . 'wp-admin/includes/media.php' );
+				if ( ! function_exists('media_buttons'))
+					include(ABSPATH.'wp-admin/includes/media.php');
 
-				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
+				echo '<div id="wp-'.$editor_id_attr.'-media-buttons" class="wp-media-buttons">';
 
 				/**
 				 * Fires after the default media button(s) are displayed.
@@ -219,24 +219,24 @@ 
 				 *
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				do_action( 'media_buttons', $editor_id );
+				do_action('media_buttons', $editor_id);
 				echo "</div>\n";
 			}
 
-			echo '<div class="wp-editor-tabs">' . $buttons . "</div>\n";
+			echo '<div class="wp-editor-tabs">'.$buttons."</div>\n";
 			echo "</div>\n";
 		}
 
 		$quicktags_toolbar = '';
 
-		if ( self::$this_quicktags ) {
-			if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
+		if (self::$this_quicktags) {
+			if ('content' === $editor_id && ! empty($GLOBALS['current_screen']) && $GLOBALS['current_screen']->base === 'post') {
 				$toolbar_id = 'ed_toolbar';
 			} else {
-				$toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
+				$toolbar_id = 'qt_'.$editor_id_attr.'_toolbar';
 			}
 
-			$quicktags_toolbar = '<div id="' . $toolbar_id . '" class="quicktags-toolbar"></div>';
+			$quicktags_toolbar = '<div id="'.$toolbar_id.'" class="quicktags-toolbar"></div>';
 		}
 
 		/**
@@ -246,14 +246,14 @@ 
 		 *
 		 * @param string $output Editor's HTML markup.
 		 */
-		$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
-			$quicktags_toolbar .
-			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
-			'id="' . $editor_id_attr . '">%s</textarea></div>' );
+		$the_editor = apply_filters('the_editor', '<div id="wp-'.$editor_id_attr.'-editor-container" class="wp-editor-container">'.
+			$quicktags_toolbar.
+			'<textarea'.$editor_class.$height.$tabindex.$autocomplete.' cols="40" name="'.esc_attr($set['textarea_name']).'" '.
+			'id="'.$editor_id_attr.'">%s</textarea></div>');
 
 		// Prepare the content for the Visual or Text editor, only when TinyMCE is used (back-compat).
-		if ( self::$this_tinymce ) {
-			add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+		if (self::$this_tinymce) {
+			add_filter('the_editor_content', 'format_for_editor', 10, 2);
 		}
 
 		/**
@@ -265,31 +265,31 @@ 
 		 * @param string $default_editor The default editor for the current user.
 		 *                               Either 'html' or 'tinymce'.
 		 */
-		$content = apply_filters( 'the_editor_content', $content, $default_editor );
+		$content = apply_filters('the_editor_content', $content, $default_editor);
 
 		// Remove the filter as the next editor on the same page may not need it.
-		if ( self::$this_tinymce ) {
-			remove_filter( 'the_editor_content', 'format_for_editor' );
+		if (self::$this_tinymce) {
+			remove_filter('the_editor_content', 'format_for_editor');
 		}
 
 		// Back-compat for the `htmledit_pre` and `richedit_pre` filters
-		if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
+		if ('html' === $default_editor && has_filter('htmledit_pre')) {
 			// TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
-			_deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-			$content = apply_filters( 'htmledit_pre', $content );
-		} elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
-			_deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-			$content = apply_filters( 'richedit_pre', $content );
+			_deprecated_function('add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )');
+			$content = apply_filters('htmledit_pre', $content);
+		} elseif ('tinymce' === $default_editor && has_filter('richedit_pre')) {
+			_deprecated_function('add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )');
+			$content = apply_filters('richedit_pre', $content);
 		}
 
-		if ( false !== stripos( $content, 'textarea' ) ) {
-			$content = preg_replace( '%</textarea%i', '&lt;/textarea', $content );
+		if (false !== stripos($content, 'textarea')) {
+			$content = preg_replace('%</textarea%i', '&lt;/textarea', $content);
 		}
 
-		printf( $the_editor, $content );
+		printf($the_editor, $content);
 		echo "\n</div>\n\n";
 
-		self::editor_settings( $editor_id, $set );
+		self::editor_settings($editor_id, $set);
 	}
 
 	/**
@@ -304,30 +304,30 @@ 
 	public static function editor_settings($editor_id, $set) {
 		global $wp_version, $tinymce_version;
 
-		if ( empty(self::$first_init) ) {
-			if ( is_admin() ) {
-				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
-				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
+		if (empty(self::$first_init)) {
+			if (is_admin()) {
+				add_action('admin_print_footer_scripts', array(__CLASS__, 'editor_js'), 50);
+				add_action('admin_print_footer_scripts', array(__CLASS__, 'enqueue_scripts'), 1);
 			} else {
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'editor_js'), 50);
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'enqueue_scripts'), 1);
 			}
 		}
 
-		if ( self::$this_quicktags ) {
+		if (self::$this_quicktags) {
 
 			$qtInit = array(
 				'id' => $editor_id,
 				'buttons' => ''
 			);
 
-			if ( is_array($set['quicktags']) )
+			if (is_array($set['quicktags']))
 				$qtInit = array_merge($qtInit, $set['quicktags']);
 
-			if ( empty($qtInit['buttons']) )
+			if (empty($qtInit['buttons']))
 				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
-			if ( $set['_content_editor_dfw'] ) {
+			if ($set['_content_editor_dfw']) {
 				$qtInit['buttons'] .= ',dfw';
 			}
 
@@ -339,26 +339,26 @@ 
 			 * @param array  $qtInit    Quicktags settings.
 			 * @param string $editor_id The unique editor ID, e.g. 'content'.
 			 */
-			$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
+			$qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
 
 			self::$qt_settings[$editor_id] = $qtInit;
 
-			self::$qt_buttons = array_merge( self::$qt_buttons, explode(',', $qtInit['buttons']) );
+			self::$qt_buttons = array_merge(self::$qt_buttons, explode(',', $qtInit['buttons']));
 		}
 
-		if ( self::$this_tinymce ) {
+		if (self::$this_tinymce) {
 
-			if ( empty( self::$first_init ) ) {
-				self::$baseurl = includes_url( 'js/tinymce' );
+			if (empty(self::$first_init)) {
+				self::$baseurl = includes_url('js/tinymce');
 
 				$mce_locale = get_locale();
-				self::$mce_locale = $mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
+				self::$mce_locale = $mce_locale = empty($mce_locale) ? 'en' : strtolower(substr($mce_locale, 0, 2)); // ISO 639-1
 
 				/** This filter is documented in wp-admin/includes/media.php */
-				$no_captions = (bool) apply_filters( 'disable_captions', '' );
+				$no_captions = (bool) apply_filters('disable_captions', '');
 				$ext_plugins = '';
 
-				if ( $set['teeny'] ) {
+				if ($set['teeny']) {
 
 					/**
 					 * Filter the list of teenyMCE plugins.
@@ -368,7 +368,7 @@ 
 					 * @param array  $plugins   An array of teenyMCE plugins.
 					 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 					 */
-					self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array( 'colorpicker', 'lists', 'fullscreen', 'image', 'wordpress', 'wpeditimage', 'wplink' ), $editor_id );
+					self::$plugins = $plugins = apply_filters('teeny_mce_plugins', array('colorpicker', 'lists', 'fullscreen', 'image', 'wordpress', 'wpeditimage', 'wplink'), $editor_id);
 				} else {
 
 					/**
@@ -388,7 +388,7 @@ 
 					 *
 					 * @param array $external_plugins An array of external TinyMCE plugins.
 					 */
-					$mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
+					$mce_external_plugins = apply_filters('mce_external_plugins', array());
 
 					$plugins = array(
 						'charmap',
@@ -412,7 +412,7 @@ 
 						'wpembed',
 					);
 
-					if ( ! self::$has_medialib ) {
+					if ( ! self::$has_medialib) {
 						$plugins[] = 'image';
 					}
 
@@ -426,15 +426,15 @@ 
 					 *
 					 * @param array $plugins An array of default TinyMCE plugins.
 					 */
-					$plugins = array_unique( apply_filters( 'tiny_mce_plugins', $plugins ) );
+					$plugins = array_unique(apply_filters('tiny_mce_plugins', $plugins));
 
-					if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
+					if (($key = array_search('spellchecker', $plugins)) !== false) {
 						// Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
 						// It can be added with 'mce_external_plugins'.
-						unset( $plugins[$key] );
+						unset($plugins[$key]);
 					}
 
-					if ( ! empty( $mce_external_plugins ) ) {
+					if ( ! empty($mce_external_plugins)) {
 
 						/**
 						 * Filter the translations loaded for external TinyMCE 3.x plugins.
@@ -449,64 +449,64 @@ 
 						 *
 						 * @param array $translations Translations for external TinyMCE plugins.
 						 */
-						$mce_external_languages = apply_filters( 'mce_external_languages', array() );
+						$mce_external_languages = apply_filters('mce_external_languages', array());
 
 						$loaded_langs = array();
 						$strings = '';
 
-						if ( ! empty( $mce_external_languages ) ) {
-							foreach ( $mce_external_languages as $name => $path ) {
-								if ( @is_file( $path ) && @is_readable( $path ) ) {
-									include_once( $path );
-									$ext_plugins .= $strings . "\n";
+						if ( ! empty($mce_external_languages)) {
+							foreach ($mce_external_languages as $name => $path) {
+								if (@is_file($path) && @is_readable($path)) {
+									include_once($path);
+									$ext_plugins .= $strings."\n";
 									$loaded_langs[] = $name;
 								}
 							}
 						}
 
-						foreach ( $mce_external_plugins as $name => $url ) {
-							if ( in_array( $name, $plugins, true ) ) {
-								unset( $mce_external_plugins[ $name ] );
+						foreach ($mce_external_plugins as $name => $url) {
+							if (in_array($name, $plugins, true)) {
+								unset($mce_external_plugins[$name]);
 								continue;
 							}
 
-							$url = set_url_scheme( $url );
-							$mce_external_plugins[ $name ] = $url;
-							$plugurl = dirname( $url );
+							$url = set_url_scheme($url);
+							$mce_external_plugins[$name] = $url;
+							$plugurl = dirname($url);
 							$strings = '';
 
 							// Try to load langs/[locale].js and langs/[locale]_dlg.js
-							if ( ! in_array( $name, $loaded_langs, true ) ) {
-								$path = str_replace( content_url(), '', $plugurl );
-								$path = WP_CONTENT_DIR . $path . '/langs/';
+							if ( ! in_array($name, $loaded_langs, true)) {
+								$path = str_replace(content_url(), '', $plugurl);
+								$path = WP_CONTENT_DIR.$path.'/langs/';
 
-								if ( function_exists('realpath') )
-									$path = trailingslashit( realpath($path) );
+								if (function_exists('realpath'))
+									$path = trailingslashit(realpath($path));
 
-								if ( @is_file( $path . $mce_locale . '.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								if (@is_file($path.$mce_locale.'.js'))
+									$strings .= @file_get_contents($path.$mce_locale.'.js')."\n";
 
-								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								if (@is_file($path.$mce_locale.'_dlg.js'))
+									$strings .= @file_get_contents($path.$mce_locale.'_dlg.js')."\n";
 
-								if ( 'en' != $mce_locale && empty( $strings ) ) {
-									if ( @is_file( $path . 'en.js' ) ) {
-										$str1 = @file_get_contents( $path . 'en.js' );
-										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
+								if ('en' != $mce_locale && empty($strings)) {
+									if (@is_file($path.'en.js')) {
+										$str1 = @file_get_contents($path.'en.js');
+										$strings .= preg_replace('/([\'"])en\./', '$1'.$mce_locale.'.', $str1, 1)."\n";
 									}
 
-									if ( @is_file( $path . 'en_dlg.js' ) ) {
-										$str2 = @file_get_contents( $path . 'en_dlg.js' );
-										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
+									if (@is_file($path.'en_dlg.js')) {
+										$str2 = @file_get_contents($path.'en_dlg.js');
+										$strings .= preg_replace('/([\'"])en\./', '$1'.$mce_locale.'.', $str2, 1)."\n";
 									}
 								}
 
-								if ( ! empty( $strings ) )
-									$ext_plugins .= "\n" . $strings . "\n";
+								if ( ! empty($strings))
+									$ext_plugins .= "\n".$strings."\n";
 							}
 
-							$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
-							$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
+							$ext_plugins .= 'tinyMCEPreInit.load_ext("'.$plugurl.'", "'.$mce_locale.'");'."\n";
+							$ext_plugins .= 'tinymce.PluginManager.load("'.$name.'", "'.$url.'");'."\n";
 						}
 					}
 				}
@@ -518,20 +518,20 @@ 
 					'theme' => 'modern',
 					'skin' => 'lightgray',
 					'language' => self::$mce_locale,
-					'formats' => '{' .
-						'alignleft: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
-						'],' .
-						'aligncenter: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
-						'],' .
-						'alignright: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
-						'],' .
-						'strikethrough: {inline: "del"}' .
+					'formats' => '{'.
+						'alignleft: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}'.
+						'],'.
+						'aligncenter: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}'.
+						'],'.
+						'alignright: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "alignright"}'.
+						'],'.
+						'strikethrough: {inline: "del"}'.
 					'}',
 					'relative_urls' => false,
 					'remove_script_host' => false,
@@ -541,35 +541,35 @@ 
 					'entities' => '38,amp,60,lt,62,gt',
 					'entity_encoding' => 'raw',
 					'keep_styles' => false,
-					'cache_suffix' => 'wp-mce-' . $tinymce_version,
+					'cache_suffix' => 'wp-mce-'.$tinymce_version,
 
 					// Limit the preview styles in the menu/toolbar
 					'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
 
 					'end_container_on_empty_block' => true,
 					'wpeditimage_disable_captions' => $no_captions,
-					'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
-					'plugins' => implode( ',', $plugins ),
-					'wp_lang_attr' => get_bloginfo( 'language' )
+					'wpeditimage_html5_captions' => current_theme_supports('html5', 'caption'),
+					'plugins' => implode(',', $plugins),
+					'wp_lang_attr' => get_bloginfo('language')
 				);
 
-				if ( ! empty( $mce_external_plugins ) ) {
-					self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
+				if ( ! empty($mce_external_plugins)) {
+					self::$first_init['external_plugins'] = wp_json_encode($mce_external_plugins);
 				}
 
 				$suffix = SCRIPT_DEBUG ? '' : '.min';
-				$version = 'ver=' . $wp_version;
-				$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
+				$version = 'ver='.$wp_version;
+				$dashicons = includes_url("css/dashicons$suffix.css?$version");
 
 				// WordPress default stylesheet and dashicons
 				$mce_css = array(
 					$dashicons,
-					self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
+					self::$baseurl.'/skins/wordpress/wp-content.css?'.$version
 				);
 
 				$editor_styles = get_editor_stylesheets();
-				if ( ! empty( $editor_styles ) ) {
-					foreach ( $editor_styles as $style ) {
+				if ( ! empty($editor_styles)) {
+					foreach ($editor_styles as $style) {
 						$mce_css[] = $style;
 					}
 				}
@@ -581,13 +581,13 @@ 
 				 *
 				 * @param string $stylesheets Comma-delimited list of stylesheets.
 				 */
-				$mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
+				$mce_css = trim(apply_filters('mce_css', implode(',', $mce_css)), ' ,');
 
-				if ( ! empty($mce_css) )
+				if ( ! empty($mce_css))
 					self::$first_init['content_css'] = $mce_css;
 			}
 
-			if ( $set['teeny'] ) {
+			if ($set['teeny']) {
 
 				/**
 				 * Filter the list of teenyMCE buttons (Text tab).
@@ -597,13 +597,13 @@ 
 				 * @param array  $buttons   An array of teenyMCE buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
+				$mce_buttons = apply_filters('teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id);
 				$mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
 			} else {
-				$mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+				$mce_buttons = array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker');
 
-				if ( ! wp_is_mobile() ) {
-					if ( $set['_content_editor_dfw'] ) {
+				if ( ! wp_is_mobile()) {
+					if ($set['_content_editor_dfw']) {
 						$mce_buttons[] = 'dfw';
 					} else {
 						$mce_buttons[] = 'fullscreen';
@@ -620,11 +620,11 @@ 
 				 * @param array  $buttons   First-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id );
+				$mce_buttons = apply_filters('mce_buttons', $mce_buttons, $editor_id);
 
-				$mce_buttons_2 = array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+				$mce_buttons_2 = array('formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo');
 
-				if ( ! wp_is_mobile() ) {
+				if ( ! wp_is_mobile()) {
 					$mce_buttons_2[] = 'wp_help';
 				}
 
@@ -636,7 +636,7 @@ 
 				 * @param array  $buttons   Second-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_2 = apply_filters( 'mce_buttons_2', $mce_buttons_2, $editor_id );
+				$mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2, $editor_id);
 
 				/**
 				 * Filter the third-row list of TinyMCE buttons (Visual tab).
@@ -646,7 +646,7 @@ 
 				 * @param array  $buttons   Third-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_3 = apply_filters( 'mce_buttons_3', array(), $editor_id );
+				$mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
 
 				/**
 				 * Filter the fourth-row list of TinyMCE buttons (Visual tab).
@@ -656,30 +656,30 @@ 
 				 * @param array  $buttons   Fourth-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_4 = apply_filters( 'mce_buttons_4', array(), $editor_id );
+				$mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
 			}
 
 			$body_class = $editor_id;
 
-			if ( $post = get_post() ) {
-				$body_class .= ' post-type-' . sanitize_html_class( $post->post_type ) . ' post-status-' . sanitize_html_class( $post->post_status );
-				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-					$post_format = get_post_format( $post );
-					if ( $post_format && ! is_wp_error( $post_format ) )
-						$body_class .= ' post-format-' . sanitize_html_class( $post_format );
+			if ($post = get_post()) {
+				$body_class .= ' post-type-'.sanitize_html_class($post->post_type).' post-status-'.sanitize_html_class($post->post_status);
+				if (post_type_supports($post->post_type, 'post-formats')) {
+					$post_format = get_post_format($post);
+					if ($post_format && ! is_wp_error($post_format))
+						$body_class .= ' post-format-'.sanitize_html_class($post_format);
 					else
 						$body_class .= ' post-format-standard';
 				}
 			}
 
-			$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+			$body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
-			if ( !empty($set['tinymce']['body_class']) ) {
-				$body_class .= ' ' . $set['tinymce']['body_class'];
+			if ( ! empty($set['tinymce']['body_class'])) {
+				$body_class .= ' '.$set['tinymce']['body_class'];
 				unset($set['tinymce']['body_class']);
 			}
 
-			$mceInit = array (
+			$mceInit = array(
 				'selector' => "#$editor_id",
 				'resize' => 'vertical',
 				'menubar' => false,
@@ -694,10 +694,10 @@ 
 			);
 
 			// Merge with the first part of the init array
-			$mceInit = array_merge( self::$first_init, $mceInit );
+			$mceInit = array_merge(self::$first_init, $mceInit);
 
-			if ( is_array( $set['tinymce'] ) )
-				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			if (is_array($set['tinymce']))
+				$mceInit = array_merge($mceInit, $set['tinymce']);
 
 			/*
 			 * For people who really REALLY know what they're doing with TinyMCE
@@ -707,7 +707,7 @@ 
 			 * is to use the default cleanup by not specifying valid_elements,
 			 * as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
 			 */
-			if ( $set['teeny'] ) {
+			if ($set['teeny']) {
 
 				/**
 				 * Filter the teenyMCE config before init.
@@ -717,7 +717,7 @@ 
 				 * @param array  $mceInit   An array with teenyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
+				$mceInit = apply_filters('teeny_mce_before_init', $mceInit, $editor_id);
 			} else {
 
 				/**
@@ -728,10 +728,10 @@ 
 				 * @param array  $mceInit   An array with TinyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
+				$mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
 			}
 
-			if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
+			if (empty($mceInit['toolbar3']) && ! empty($mceInit['toolbar4'])) {
 				$mceInit['toolbar3'] = $mceInit['toolbar4'];
 				$mceInit['toolbar4'] = '';
 			}
@@ -749,19 +749,19 @@ 
 	private static function _parse_init($init) {
 		$options = '';
 
-		foreach ( $init as $k => $v ) {
-			if ( is_bool($v) ) {
+		foreach ($init as $k => $v) {
+			if (is_bool($v)) {
 				$val = $v ? 'true' : 'false';
-				$options .= $k . ':' . $val . ',';
+				$options .= $k.':'.$val.',';
 				continue;
-			} elseif ( !empty($v) && is_string($v) && ( ('{' == $v{0} && '}' == $v{strlen($v) - 1}) || ('[' == $v{0} && ']' == $v{strlen($v) - 1}) || preg_match('/^\(?function ?\(/', $v) ) ) {
-				$options .= $k . ':' . $v . ',';
+			} elseif ( ! empty($v) && is_string($v) && (('{' == $v{0} && '}' == $v{strlen($v) - 1}) || ('[' == $v{0} && ']' == $v{strlen($v) - 1}) || preg_match('/^\(?function ?\(/', $v))) {
+				$options .= $k.':'.$v.',';
 				continue;
 			}
-			$options .= $k . ':"' . $v . '",';
+			$options .= $k.':"'.$v.'",';
 		}
 
-		return '{' . trim( $options, ' ,' ) . '}';
+		return '{'.trim($options, ' ,').'}';
 	}
 
 	/**
@@ -769,24 +769,24 @@ 
 	 * @static
 	 */
 	public static function enqueue_scripts() {
-		if ( self::$has_tinymce )
+		if (self::$has_tinymce)
 			wp_enqueue_script('editor');
 
-		if ( self::$has_quicktags ) {
-			wp_enqueue_script( 'quicktags' );
-			wp_enqueue_style( 'buttons' );
+		if (self::$has_quicktags) {
+			wp_enqueue_script('quicktags');
+			wp_enqueue_style('buttons');
 		}
 
-		if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
+		if (in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true)) {
 			wp_enqueue_script('wplink');
-			wp_enqueue_script( 'jquery-ui-autocomplete' );
+			wp_enqueue_script('jquery-ui-autocomplete');
 		}
 
-		if ( self::$old_dfw_compat ) {
+		if (self::$old_dfw_compat) {
 			wp_enqueue_script('wp-fullscreen-stub');
 		}
 
-		if ( self::$has_medialib ) {
+		if (self::$has_medialib) {
 			add_thickbox();
 			wp_enqueue_script('media-upload');
 		}
@@ -799,10 +799,10 @@ 
 		 * @param array $to_load An array containing boolean values whether TinyMCE
 		 *                       and Quicktags are being loaded.
 		 */
-		do_action( 'wp_enqueue_editor', array(
+		do_action('wp_enqueue_editor', array(
 			'tinymce'   => self::$has_tinymce,
 			'quicktags' => self::$has_quicktags,
-		) );
+		));
 	}
 
 	/**
@@ -814,261 +814,261 @@ 
 	 * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
 	 * @return string Translation object, JSON encoded.
 	 */
-	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
+	public static function wp_mce_translation($mce_locale = '', $json_only = false) {
 
 		$mce_translation = array(
 			// Default TinyMCE strings
-			'New document' => __( 'New document' ),
-			'Formats' => _x( 'Formats', 'TinyMCE' ),
+			'New document' => __('New document'),
+			'Formats' => _x('Formats', 'TinyMCE'),
 
-			'Headings' => _x( 'Headings', 'TinyMCE' ),
-			'Heading 1' => __( 'Heading 1' ),
-			'Heading 2' => __( 'Heading 2' ),
-			'Heading 3' => __( 'Heading 3' ),
-			'Heading 4' => __( 'Heading 4' ),
-			'Heading 5' => __( 'Heading 5' ),
-			'Heading 6' => __( 'Heading 6' ),
+			'Headings' => _x('Headings', 'TinyMCE'),
+			'Heading 1' => __('Heading 1'),
+			'Heading 2' => __('Heading 2'),
+			'Heading 3' => __('Heading 3'),
+			'Heading 4' => __('Heading 4'),
+			'Heading 5' => __('Heading 5'),
+			'Heading 6' => __('Heading 6'),
 
 			/* translators: block tags */
-			'Blocks' => _x( 'Blocks', 'TinyMCE' ),
-			'Paragraph' => __( 'Paragraph' ),
-			'Blockquote' => __( 'Blockquote' ),
-			'Div' => _x( 'Div', 'HTML tag' ),
-			'Pre' => _x( 'Pre', 'HTML tag' ),
-			'Preformatted' => _x( 'Preformatted', 'HTML tag' ),
-			'Address' => _x( 'Address', 'HTML tag' ),
-
-			'Inline' => _x( 'Inline', 'HTML elements' ),
-			'Underline' => __( 'Underline' ),
-			'Strikethrough' => __( 'Strikethrough' ),
-			'Subscript' => __( 'Subscript' ),
-			'Superscript' => __( 'Superscript' ),
-			'Clear formatting' => __( 'Clear formatting' ),
-			'Bold' => __( 'Bold' ),
-			'Italic' => __( 'Italic' ),
-			'Code' => _x( 'Code', 'editor button' ),
-			'Source code' => __( 'Source code' ),
-			'Font Family' => __( 'Font Family' ),
-			'Font Sizes' => __( 'Font Sizes' ),
-
-			'Align center' => __( 'Align center' ),
-			'Align right' => __( 'Align right' ),
-			'Align left' => __( 'Align left' ),
-			'Justify' => __( 'Justify' ),
-			'Increase indent' => __( 'Increase indent' ),
-			'Decrease indent' => __( 'Decrease indent' ),
-
-			'Cut' => __( 'Cut' ),
-			'Copy' => __( 'Copy' ),
-			'Paste' => __( 'Paste' ),
-			'Select all' => __( 'Select all' ),
-			'Undo' => __( 'Undo' ),
-			'Redo' => __( 'Redo' ),
-
-			'Ok' => __( 'OK' ),
-			'Cancel' => __( 'Cancel' ),
-			'Close' => __( 'Close' ),
-			'Visual aids' => __( 'Visual aids' ),
-
-			'Bullet list' => __( 'Bulleted list' ),
-			'Numbered list' => __( 'Numbered list' ),
-			'Square' => _x( 'Square', 'list style' ),
-			'Default' => _x( 'Default', 'list style' ),
-			'Circle' => _x( 'Circle', 'list style' ),
-			'Disc' => _x('Disc', 'list style' ),
-			'Lower Greek' => _x( 'Lower Greek', 'list style' ),
-			'Lower Alpha' => _x( 'Lower Alpha', 'list style' ),
-			'Upper Alpha' => _x( 'Upper Alpha', 'list style' ),
-			'Upper Roman' => _x( 'Upper Roman', 'list style' ),
-			'Lower Roman' => _x( 'Lower Roman', 'list style' ),
+			'Blocks' => _x('Blocks', 'TinyMCE'),
+			'Paragraph' => __('Paragraph'),
+			'Blockquote' => __('Blockquote'),
+			'Div' => _x('Div', 'HTML tag'),
+			'Pre' => _x('Pre', 'HTML tag'),
+			'Preformatted' => _x('Preformatted', 'HTML tag'),
+			'Address' => _x('Address', 'HTML tag'),
+
+			'Inline' => _x('Inline', 'HTML elements'),
+			'Underline' => __('Underline'),
+			'Strikethrough' => __('Strikethrough'),
+			'Subscript' => __('Subscript'),
+			'Superscript' => __('Superscript'),
+			'Clear formatting' => __('Clear formatting'),
+			'Bold' => __('Bold'),
+			'Italic' => __('Italic'),
+			'Code' => _x('Code', 'editor button'),
+			'Source code' => __('Source code'),
+			'Font Family' => __('Font Family'),
+			'Font Sizes' => __('Font Sizes'),
+
+			'Align center' => __('Align center'),
+			'Align right' => __('Align right'),
+			'Align left' => __('Align left'),
+			'Justify' => __('Justify'),
+			'Increase indent' => __('Increase indent'),
+			'Decrease indent' => __('Decrease indent'),
+
+			'Cut' => __('Cut'),
+			'Copy' => __('Copy'),
+			'Paste' => __('Paste'),
+			'Select all' => __('Select all'),
+			'Undo' => __('Undo'),
+			'Redo' => __('Redo'),
+
+			'Ok' => __('OK'),
+			'Cancel' => __('Cancel'),
+			'Close' => __('Close'),
+			'Visual aids' => __('Visual aids'),
+
+			'Bullet list' => __('Bulleted list'),
+			'Numbered list' => __('Numbered list'),
+			'Square' => _x('Square', 'list style'),
+			'Default' => _x('Default', 'list style'),
+			'Circle' => _x('Circle', 'list style'),
+			'Disc' => _x('Disc', 'list style'),
+			'Lower Greek' => _x('Lower Greek', 'list style'),
+			'Lower Alpha' => _x('Lower Alpha', 'list style'),
+			'Upper Alpha' => _x('Upper Alpha', 'list style'),
+			'Upper Roman' => _x('Upper Roman', 'list style'),
+			'Lower Roman' => _x('Lower Roman', 'list style'),
 
 			// Anchor plugin
-			'Name' => _x( 'Name', 'Name of link anchor (TinyMCE)' ),
-			'Anchor' => _x( 'Anchor', 'Link anchor (TinyMCE)' ),
-			'Anchors' => _x( 'Anchors', 'Link anchors (TinyMCE)' ),
+			'Name' => _x('Name', 'Name of link anchor (TinyMCE)'),
+			'Anchor' => _x('Anchor', 'Link anchor (TinyMCE)'),
+			'Anchors' => _x('Anchors', 'Link anchors (TinyMCE)'),
 
 			// Fullpage plugin
-			'Document properties' => __( 'Document properties' ),
-			'Robots' => __( 'Robots' ),
-			'Title' => __( 'Title' ),
-			'Keywords' => __( 'Keywords' ),
-			'Encoding' => __( 'Encoding' ),
-			'Description' => __( 'Description' ),
-			'Author' => __( 'Author' ),
+			'Document properties' => __('Document properties'),
+			'Robots' => __('Robots'),
+			'Title' => __('Title'),
+			'Keywords' => __('Keywords'),
+			'Encoding' => __('Encoding'),
+			'Description' => __('Description'),
+			'Author' => __('Author'),
 
 			// Media, image plugins
-			'Insert/edit image' => __( 'Insert/edit image' ),
-			'General' => __( 'General' ),
-			'Advanced' => __( 'Advanced' ),
-			'Source' => __( 'Source' ),
-			'Border' => __( 'Border' ),
-			'Constrain proportions' => __( 'Constrain proportions' ),
-			'Vertical space' => __( 'Vertical space' ),
-			'Image description' => __( 'Image description' ),
-			'Style' => __( 'Style' ),
-			'Dimensions' => __( 'Dimensions' ),
-			'Insert image' => __( 'Insert image' ),
-			'Insert date/time' => __( 'Insert date/time' ),
-			'Insert/edit video' => __( 'Insert/edit video' ),
-			'Poster' => __( 'Poster' ),
-			'Alternative source' => __( 'Alternative source' ),
-			'Paste your embed code below:' => __( 'Paste your embed code below:' ),
-			'Insert video' => __( 'Insert video' ),
-			'Embed' => __( 'Embed' ),
+			'Insert/edit image' => __('Insert/edit image'),
+			'General' => __('General'),
+			'Advanced' => __('Advanced'),
+			'Source' => __('Source'),
+			'Border' => __('Border'),
+			'Constrain proportions' => __('Constrain proportions'),
+			'Vertical space' => __('Vertical space'),
+			'Image description' => __('Image description'),
+			'Style' => __('Style'),
+			'Dimensions' => __('Dimensions'),
+			'Insert image' => __('Insert image'),
+			'Insert date/time' => __('Insert date/time'),
+			'Insert/edit video' => __('Insert/edit video'),
+			'Poster' => __('Poster'),
+			'Alternative source' => __('Alternative source'),
+			'Paste your embed code below:' => __('Paste your embed code below:'),
+			'Insert video' => __('Insert video'),
+			'Embed' => __('Embed'),
 
 			// Each of these have a corresponding plugin
-			'Special character' => __( 'Special character' ),
-			'Right to left' => _x( 'Right to left', 'editor button' ),
-			'Left to right' => _x( 'Left to right', 'editor button' ),
-			'Emoticons' => __( 'Emoticons' ),
-			'Nonbreaking space' => __( 'Nonbreaking space' ),
-			'Page break' => __( 'Page break' ),
-			'Paste as text' => __( 'Paste as text' ),
-			'Preview' => __( 'Preview' ),
-			'Print' => __( 'Print' ),
-			'Save' => __( 'Save' ),
-			'Fullscreen' => __( 'Fullscreen' ),
-			'Horizontal line' => __( 'Horizontal line' ),
-			'Horizontal space' => __( 'Horizontal space' ),
-			'Restore last draft' => __( 'Restore last draft' ),
-			'Insert/edit link' => __( 'Insert/edit link' ),
-			'Remove link' => __( 'Remove link' ),
-
-			'Color' => __( 'Color' ),
-			'Custom color' => __( 'Custom color' ),
-			'Custom...' => _x( 'Custom...', 'label for custom color' ), // no ellipsis
-			'No color' => __( 'No color' ),
+			'Special character' => __('Special character'),
+			'Right to left' => _x('Right to left', 'editor button'),
+			'Left to right' => _x('Left to right', 'editor button'),
+			'Emoticons' => __('Emoticons'),
+			'Nonbreaking space' => __('Nonbreaking space'),
+			'Page break' => __('Page break'),
+			'Paste as text' => __('Paste as text'),
+			'Preview' => __('Preview'),
+			'Print' => __('Print'),
+			'Save' => __('Save'),
+			'Fullscreen' => __('Fullscreen'),
+			'Horizontal line' => __('Horizontal line'),
+			'Horizontal space' => __('Horizontal space'),
+			'Restore last draft' => __('Restore last draft'),
+			'Insert/edit link' => __('Insert/edit link'),
+			'Remove link' => __('Remove link'),
+
+			'Color' => __('Color'),
+			'Custom color' => __('Custom color'),
+			'Custom...' => _x('Custom...', 'label for custom color'), // no ellipsis
+			'No color' => __('No color'),
 
 			// Spelling, search/replace plugins
-			'Could not find the specified string.' => __( 'Could not find the specified string.' ),
-			'Replace' => _x( 'Replace', 'find/replace' ),
-			'Next' => _x( 'Next', 'find/replace' ),
+			'Could not find the specified string.' => __('Could not find the specified string.'),
+			'Replace' => _x('Replace', 'find/replace'),
+			'Next' => _x('Next', 'find/replace'),
 			/* translators: previous */
-			'Prev' => _x( 'Prev', 'find/replace' ),
-			'Whole words' => _x( 'Whole words', 'find/replace' ),
-			'Find and replace' => __( 'Find and replace' ),
-			'Replace with' => _x('Replace with', 'find/replace' ),
-			'Find' => _x( 'Find', 'find/replace' ),
-			'Replace all' => _x( 'Replace all', 'find/replace' ),
-			'Match case' => __( 'Match case' ),
-			'Spellcheck' => __( 'Check Spelling' ),
-			'Finish' => _x( 'Finish', 'spellcheck' ),
-			'Ignore all' => _x( 'Ignore all', 'spellcheck' ),
-			'Ignore' => _x( 'Ignore', 'spellcheck' ),
-			'Add to Dictionary' => __( 'Add to Dictionary' ),
+			'Prev' => _x('Prev', 'find/replace'),
+			'Whole words' => _x('Whole words', 'find/replace'),
+			'Find and replace' => __('Find and replace'),
+			'Replace with' => _x('Replace with', 'find/replace'),
+			'Find' => _x('Find', 'find/replace'),
+			'Replace all' => _x('Replace all', 'find/replace'),
+			'Match case' => __('Match case'),
+			'Spellcheck' => __('Check Spelling'),
+			'Finish' => _x('Finish', 'spellcheck'),
+			'Ignore all' => _x('Ignore all', 'spellcheck'),
+			'Ignore' => _x('Ignore', 'spellcheck'),
+			'Add to Dictionary' => __('Add to Dictionary'),
 
 			// TinyMCE tables
-			'Insert table' => __( 'Insert table' ),
-			'Delete table' => __( 'Delete table' ),
-			'Table properties' => __( 'Table properties' ),
-			'Row properties' => __( 'Table row properties' ),
-			'Cell properties' => __( 'Table cell properties' ),
-			'Border color' => __( 'Border color' ),
-
-			'Row' => __( 'Row' ),
-			'Rows' => __( 'Rows' ),
-			'Column' => _x( 'Column', 'table column' ),
-			'Cols' => _x( 'Cols', 'table columns' ),
-			'Cell' => _x( 'Cell', 'table cell' ),
-			'Header cell' => __( 'Header cell' ),
-			'Header' => _x( 'Header', 'table header' ),
-			'Body' => _x( 'Body', 'table body' ),
-			'Footer' => _x( 'Footer', 'table footer' ),
-
-			'Insert row before' => __( 'Insert row before' ),
-			'Insert row after' => __( 'Insert row after' ),
-			'Insert column before' => __( 'Insert column before' ),
-			'Insert column after' => __( 'Insert column after' ),
-			'Paste row before' => __( 'Paste table row before' ),
-			'Paste row after' => __( 'Paste table row after' ),
-			'Delete row' => __( 'Delete row' ),
-			'Delete column' => __( 'Delete column' ),
-			'Cut row' => __( 'Cut table row' ),
-			'Copy row' => __( 'Copy table row' ),
-			'Merge cells' => __( 'Merge table cells' ),
-			'Split cell' => __( 'Split table cell' ),
-
-			'Height' => __( 'Height' ),
-			'Width' => __( 'Width' ),
-			'Caption' => __( 'Caption' ),
-			'Alignment' => __( 'Alignment' ),
-			'H Align' => _x( 'H Align', 'horizontal table cell alignment' ),
-			'Left' => __( 'Left' ),
-			'Center' => __( 'Center' ),
-			'Right' => __( 'Right' ),
-			'None' => _x( 'None', 'table cell alignment attribute' ),
-			'V Align' => _x( 'V Align', 'vertical table cell alignment' ),
-			'Top' => __( 'Top' ),
-			'Middle' => __( 'Middle' ),
-			'Bottom' => __( 'Bottom' ),
-
-			'Row group' => __( 'Row group' ),
-			'Column group' => __( 'Column group' ),
-			'Row type' => __( 'Row type' ),
-			'Cell type' => __( 'Cell type' ),
-			'Cell padding' => __( 'Cell padding' ),
-			'Cell spacing' => __( 'Cell spacing' ),
-			'Scope' => _x( 'Scope', 'table cell scope attribute' ),
-
-			'Insert template' => _x( 'Insert template', 'TinyMCE' ),
-			'Templates' => _x( 'Templates', 'TinyMCE' ),
-
-			'Background color' => __( 'Background color' ),
-			'Text color' => __( 'Text color' ),
-			'Show blocks' => _x( 'Show blocks', 'editor button' ),
-			'Show invisible characters' => __( 'Show invisible characters' ),
+			'Insert table' => __('Insert table'),
+			'Delete table' => __('Delete table'),
+			'Table properties' => __('Table properties'),
+			'Row properties' => __('Table row properties'),
+			'Cell properties' => __('Table cell properties'),
+			'Border color' => __('Border color'),
+
+			'Row' => __('Row'),
+			'Rows' => __('Rows'),
+			'Column' => _x('Column', 'table column'),
+			'Cols' => _x('Cols', 'table columns'),
+			'Cell' => _x('Cell', 'table cell'),
+			'Header cell' => __('Header cell'),
+			'Header' => _x('Header', 'table header'),
+			'Body' => _x('Body', 'table body'),
+			'Footer' => _x('Footer', 'table footer'),
+
+			'Insert row before' => __('Insert row before'),
+			'Insert row after' => __('Insert row after'),
+			'Insert column before' => __('Insert column before'),
+			'Insert column after' => __('Insert column after'),
+			'Paste row before' => __('Paste table row before'),
+			'Paste row after' => __('Paste table row after'),
+			'Delete row' => __('Delete row'),
+			'Delete column' => __('Delete column'),
+			'Cut row' => __('Cut table row'),
+			'Copy row' => __('Copy table row'),
+			'Merge cells' => __('Merge table cells'),
+			'Split cell' => __('Split table cell'),
+
+			'Height' => __('Height'),
+			'Width' => __('Width'),
+			'Caption' => __('Caption'),
+			'Alignment' => __('Alignment'),
+			'H Align' => _x('H Align', 'horizontal table cell alignment'),
+			'Left' => __('Left'),
+			'Center' => __('Center'),
+			'Right' => __('Right'),
+			'None' => _x('None', 'table cell alignment attribute'),
+			'V Align' => _x('V Align', 'vertical table cell alignment'),
+			'Top' => __('Top'),
+			'Middle' => __('Middle'),
+			'Bottom' => __('Bottom'),
+
+			'Row group' => __('Row group'),
+			'Column group' => __('Column group'),
+			'Row type' => __('Row type'),
+			'Cell type' => __('Cell type'),
+			'Cell padding' => __('Cell padding'),
+			'Cell spacing' => __('Cell spacing'),
+			'Scope' => _x('Scope', 'table cell scope attribute'),
+
+			'Insert template' => _x('Insert template', 'TinyMCE'),
+			'Templates' => _x('Templates', 'TinyMCE'),
+
+			'Background color' => __('Background color'),
+			'Text color' => __('Text color'),
+			'Show blocks' => _x('Show blocks', 'editor button'),
+			'Show invisible characters' => __('Show invisible characters'),
 
 			/* translators: word count */
-			'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
-			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" . __( 'If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ),
-			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press Alt-Shift-H for help' ),
-			'You have unsaved changes are you sure you want to navigate away?' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),
+			'Words: {0}' => sprintf(__('Words: %s'), '{0}'),
+			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __('Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.')."\n\n".__('If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.'),
+			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __('Rich Text Area. Press Alt-Shift-H for help'),
+			'You have unsaved changes are you sure you want to navigate away?' => __('The changes you made will be lost if you navigate away from this page.'),
+			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __('Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.'),
 
 			// TinyMCE menus
-			'Insert' => _x( 'Insert', 'TinyMCE menu' ),
-			'File' => _x( 'File', 'TinyMCE menu' ),
-			'Edit' => _x( 'Edit', 'TinyMCE menu' ),
-			'Tools' => _x( 'Tools', 'TinyMCE menu' ),
-			'View' => _x( 'View', 'TinyMCE menu' ),
-			'Table' => _x( 'Table', 'TinyMCE menu' ),
-			'Format' => _x( 'Format', 'TinyMCE menu' ),
+			'Insert' => _x('Insert', 'TinyMCE menu'),
+			'File' => _x('File', 'TinyMCE menu'),
+			'Edit' => _x('Edit', 'TinyMCE menu'),
+			'Tools' => _x('Tools', 'TinyMCE menu'),
+			'View' => _x('View', 'TinyMCE menu'),
+			'Table' => _x('Table', 'TinyMCE menu'),
+			'Format' => _x('Format', 'TinyMCE menu'),
 
 			// WordPress strings
-			'Toolbar Toggle' => __( 'Toolbar Toggle' ),
-			'Insert Read More tag' => __( 'Insert Read More tag' ),
-			'Insert Page Break tag' => __( 'Insert Page Break tag' ),
-			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)
-			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
-			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
-			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
-			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
-			'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
-			'Link options'  => __( 'Link options' ),
+			'Toolbar Toggle' => __('Toolbar Toggle'),
+			'Insert Read More tag' => __('Insert Read More tag'),
+			'Insert Page Break tag' => __('Insert Page Break tag'),
+			'Read more...' => __('Read more...'), // Title on the placeholder inside the editor (no ellipsis)
+			'Distraction-free writing mode' => __('Distraction-free writing mode'),
+			'No alignment' => __('No alignment'), // Tooltip for the 'alignnone' button in the image toolbar
+			'Remove' => __('Remove'), // Tooltip for the 'remove' button in the image toolbar
+			'Edit ' => __('Edit'), // Tooltip for the 'edit' button in the image toolbar
+			'Paste URL or type to search' => __('Paste URL or type to search'), // Placeholder for the inline link dialog
+			'Link options'  => __('Link options'),
 
 			// Shortcuts help modal
-			'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
-			'Default shortcuts,' => __( 'Default shortcuts,' ),
-			'Additional shortcuts,' => __( 'Additional shortcuts,' ),
-			'Focus shortcuts:' => __( 'Focus shortcuts:' ),
-			'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
-			'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
-			'Editor toolbar' => __( 'Editor toolbar' ),
-			'Elements path' => __( 'Elements path' ),
-			'Ctrl + Alt + letter:' => __( 'Ctrl + Alt + letter:' ),
-			'Shift + Alt + letter:' => __( 'Shift + Alt + letter:' ),
-			'Cmd + letter:' => __( 'Cmd + letter:' ),
-			'Ctrl + letter:' => __( 'Ctrl + letter:' ),
-			'Letter' => __( 'Letter' ),
-			'Action' => __( 'Action' ),
+			'Keyboard Shortcuts' => __('Keyboard Shortcuts'),
+			'Default shortcuts,' => __('Default shortcuts,'),
+			'Additional shortcuts,' => __('Additional shortcuts,'),
+			'Focus shortcuts:' => __('Focus shortcuts:'),
+			'Inline toolbar (when an image, link or preview is selected)' => __('Inline toolbar (when an image, link or preview is selected)'),
+			'Editor menu (when enabled)' => __('Editor menu (when enabled)'),
+			'Editor toolbar' => __('Editor toolbar'),
+			'Elements path' => __('Elements path'),
+			'Ctrl + Alt + letter:' => __('Ctrl + Alt + letter:'),
+			'Shift + Alt + letter:' => __('Shift + Alt + letter:'),
+			'Cmd + letter:' => __('Cmd + letter:'),
+			'Ctrl + letter:' => __('Ctrl + letter:'),
+			'Letter' => __('Letter'),
+			'Action' => __('Action'),
 			'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
-				__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+				__('To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.'),
 			'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
-				__( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+				__('When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.'),
 			'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
-				__( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
+				__('The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.'),
 			'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
-				__( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
+				__('The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.'),
 		);
 
 		/**
@@ -1082,7 +1082,7 @@ 
 		 *	Url
 		 */
 
-		if ( ! $mce_locale ) {
+		if ( ! $mce_locale) {
 			$mce_locale = self::$mce_locale;
 		}
 
@@ -1094,32 +1094,32 @@ 
 		 * @param array  $mce_translation Key/value pairs of strings.
 		 * @param string $mce_locale      Locale.
 		 */
-		$mce_translation = apply_filters( 'wp_mce_translation', $mce_translation, $mce_locale );
+		$mce_translation = apply_filters('wp_mce_translation', $mce_translation, $mce_locale);
 
-		foreach ( $mce_translation as $key => $value ) {
+		foreach ($mce_translation as $key => $value) {
 			// Remove strings that are not translated.
-			if ( $key === $value ) {
-				unset( $mce_translation[$key] );
+			if ($key === $value) {
+				unset($mce_translation[$key]);
 				continue;
 			}
 
-			if ( false !== strpos( $value, '&' ) ) {
-				$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+			if (false !== strpos($value, '&')) {
+				$mce_translation[$key] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
 		// Set direction
-		if ( is_rtl() ) {
+		if (is_rtl()) {
 			$mce_translation['_dir'] = 'rtl';
 		}
 
-		if ( $json_only ) {
-			return wp_json_encode( $mce_translation );
+		if ($json_only) {
+			return wp_json_encode($mce_translation);
 		}
 
-		$baseurl = self::$baseurl ? self::$baseurl : includes_url( 'js/tinymce' );
+		$baseurl = self::$baseurl ? self::$baseurl : includes_url('js/tinymce');
 
-		return "tinymce.addI18n( '$mce_locale', " . wp_json_encode( $mce_translation ) . ");\n" .
+		return "tinymce.addI18n( '$mce_locale', ".wp_json_encode($mce_translation).");\n".
 			"tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
 	}
 
@@ -1141,38 +1141,38 @@ 
 		 * These plugins can be refreshed by appending query string to the URL passed to "mce_external_plugins" filter.
 		 * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
 		 */
-		$version = 'ver=' . $tinymce_version;
-		$tmce_on = !empty(self::$mce_settings);
+		$version = 'ver='.$tinymce_version;
+		$tmce_on = ! empty(self::$mce_settings);
 
-		if ( ! isset($concatenate_scripts) )
+		if ( ! isset($concatenate_scripts))
 			script_concat_settings();
 
 		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
 			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
 
 		$mceInit = $qtInit = '';
-		if ( $tmce_on ) {
-			foreach ( self::$mce_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
+		if ($tmce_on) {
+			foreach (self::$mce_settings as $editor_id => $init) {
+				$options = self::_parse_init($init);
 				$mceInit .= "'$editor_id':{$options},";
 			}
-			$mceInit = '{' . trim($mceInit, ',') . '}';
+			$mceInit = '{'.trim($mceInit, ',').'}';
 		} else {
 			$mceInit = '{}';
 		}
 
-		if ( !empty(self::$qt_settings) ) {
-			foreach ( self::$qt_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
+		if ( ! empty(self::$qt_settings)) {
+			foreach (self::$qt_settings as $editor_id => $init) {
+				$options = self::_parse_init($init);
 				$qtInit .= "'$editor_id':{$options},";
 			}
-			$qtInit = '{' . trim($qtInit, ',') . '}';
+			$qtInit = '{'.trim($qtInit, ',').'}';
 		} else {
 			$qtInit = '{}';
 		}
 
 		$ref = array(
-			'plugins' => implode( ',', self::$plugins ),
+			'plugins' => implode(',', self::$plugins),
 			'theme' => 'modern',
 			'language' => self::$mce_locale
 		);
@@ -1186,7 +1186,7 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'before_wp_tiny_mce', self::$mce_settings );
+		do_action('before_wp_tiny_mce', self::$mce_settings);
 		?>
 
 		<script type="text/javascript">
@@ -1195,14 +1195,14 @@ 
 			suffix: "<?php echo $suffix; ?>",
 			<?php
 
-			if ( self::$drag_drop_upload ) {
+			if (self::$drag_drop_upload) {
 				echo 'dragDropUpload: true,';
 			}
 
 			?>
 			mceInit: <?php echo $mceInit; ?>,
 			qtInit: <?php echo $qtInit; ?>,
-			ref: <?php echo self::_parse_init( $ref ); ?>,
+			ref: <?php echo self::_parse_init($ref); ?>,
 			load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
 		};
 		</script>
@@ -1210,19 +1210,19 @@ 
 
 		$baseurl = self::$baseurl;
 		// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
-		$mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
+		$mce_suffix = false !== strpos($wp_version, '-src') ? '' : '.min';
 
-		if ( $tmce_on ) {
-			if ( $compressed ) {
+		if ($tmce_on) {
+			if ($compressed) {
 				echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
 			} else {
 				echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
 				echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
 			}
 
-			echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
+			echo "<script type='text/javascript'>\n".self::wp_mce_translation()."</script>\n";
 
-			if ( self::$ext_plugins ) {
+			if (self::$ext_plugins) {
 				// Load the old-format English strings to prevent unsightly labels in old style popups
 				echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\n";
 			}
@@ -1236,17 +1236,17 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'wp_tiny_mce_init', self::$mce_settings );
+		do_action('wp_tiny_mce_init', self::$mce_settings);
 
 		?>
 		<script type="text/javascript">
 		<?php
 
-		if ( self::$ext_plugins )
-			echo self::$ext_plugins . "\n";
+		if (self::$ext_plugins)
+			echo self::$ext_plugins."\n";
 
-		if ( ! is_admin() )
-			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		if ( ! is_admin())
+			echo 'var ajaxurl = "'.admin_url('admin-ajax.php', 'relative').'";';
 
 		?>
 
@@ -1281,7 +1281,7 @@ 
 		</script>
 		<?php
 
-		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) )
+		if (in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true))
 			self::wp_link_dialog();
 
 		/**
@@ -1291,7 +1291,7 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'after_wp_tiny_mce', self::$mce_settings );
+		do_action('after_wp_tiny_mce', self::$mce_settings);
 	}
 
 	/**
@@ -1300,7 +1300,7 @@ 
 	 * @global int $content_width
 	 */
 	public static function wp_fullscreen_html() {
-		_deprecated_function( __FUNCTION__, '4.3' );
+		_deprecated_function(__FUNCTION__, '4.3');
 	}
 
 	/**
@@ -1312,9 +1312,9 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return false|array Results.
 	 */
-	public static function wp_link_query( $args = array() ) {
-		$pts = get_post_types( array( 'public' => true ), 'objects' );
-		$pt_names = array_keys( $pts );
+	public static function wp_link_query($args = array()) {
+		$pts = get_post_types(array('public' => true), 'objects');
+		$pt_names = array_keys($pts);
 
 		$query = array(
 			'post_type' => $pt_names,
@@ -1325,12 +1325,12 @@ 
 			'posts_per_page' => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
 
-		if ( isset( $args['s'] ) )
+		if (isset($args['s']))
 			$query['s'] = $args['s'];
 
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
 		/**
 		 * Filter the link query arguments.
@@ -1343,27 +1343,27 @@ 
 		 *
 		 * @param array $query An array of WP_Query arguments.
 		 */
-		$query = apply_filters( 'wp_link_query_args', $query );
+		$query = apply_filters('wp_link_query_args', $query);
 
 		// Do main query.
 		$get_posts = new WP_Query;
-		$posts = $get_posts->query( $query );
+		$posts = $get_posts->query($query);
 		// Check if any posts were found.
-		if ( ! $get_posts->post_count )
+		if ( ! $get_posts->post_count)
 			return false;
 
 		// Build results.
 		$results = array();
-		foreach ( $posts as $post ) {
-			if ( 'post' == $post->post_type )
-				$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+		foreach ($posts as $post) {
+			if ('post' == $post->post_type)
+				$info = mysql2date(__('Y/m/d'), $post->post_date);
 			else
-				$info = $pts[ $post->post_type ]->labels->singular_name;
+				$info = $pts[$post->post_type]->labels->singular_name;
 
 			$results[] = array(
 				'ID' => $post->ID,
-				'title' => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
-				'permalink' => get_permalink( $post->ID ),
+				'title' => trim(esc_html(strip_tags(get_the_title($post)))),
+				'permalink' => get_permalink($post->ID),
 				'info' => $info,
 			);
 		}
@@ -1390,7 +1390,7 @@ 
 		 * }
 		 * @param array $query  An array of WP_Query arguments.
 		 */
-		return apply_filters( 'wp_link_query', $results, $query );
+		return apply_filters('wp_link_query', $results, $query);
 	}
 
 	/**
@@ -1406,31 +1406,31 @@ 
 		<div id="wp-link-backdrop" style="display: none"></div>
 		<div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">
 		<form id="wp-link" tabindex="-1">
-		<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
-		<h1 id="link-modal-title"><?php _e( 'Insert/edit link' ) ?></h1>
-		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+		<?php wp_nonce_field('internal-linking', '_ajax_linking_nonce', false); ?>
+		<h1 id="link-modal-title"><?php _e('Insert/edit link') ?></h1>
+		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e('Close'); ?></span></button>
 		<div id="link-selector">
 			<div id="link-options">
 				<div>
-					<label><span><?php _e( 'URL' ); ?></span>
-					<input id="wp-link-url" type="text" role="combobox" aria-autocomplete="list" aria-expanded="false" placeholder="<?php _e( 'Paste URL or type to search' ); ?>" /></label>
+					<label><span><?php _e('URL'); ?></span>
+					<input id="wp-link-url" type="text" role="combobox" aria-autocomplete="list" aria-expanded="false" placeholder="<?php _e('Paste URL or type to search'); ?>" /></label>
 				</div>
 				<div class="wp-link-text-field">
-					<label><span><?php _e( 'Link Text' ); ?></span>
+					<label><span><?php _e('Link Text'); ?></span>
 					<input id="wp-link-text" type="text" /></label>
 				</div>
 				<div class="link-target">
 					<label><span></span>
-					<input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
+					<input type="checkbox" id="wp-link-target" /> <?php _e('Open link in a new tab'); ?></label>
 				</div>
 			</div>
 		</div>
 		<div class="submitbox">
 			<div id="wp-link-cancel">
-				<button type="button" class="button"><?php _e( 'Cancel' ); ?></button>
+				<button type="button" class="button"><?php _e('Cancel'); ?></button>
 			</div>
 			<div id="wp-link-update">
-				<input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
+				<input type="submit" value="<?php esc_attr_e('Add Link'); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
 			</div>
 		</div>
 		</form>