Index: src/wp-includes/pluggable.php
===================================================================
--- src/wp-includes/pluggable.php	(revision 30572)
+++ src/wp-includes/pluggable.php	(working copy)
@@ -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.
  *
@@ -23,7 +23,7 @@
  * @param string $name User's username
  * @return WP_User Current user User object
  */
-function wp_set_current_user($id, $name = '') {
+function wp_set_current_user( $id, $name = '' ) {
 	global $current_user;
 
 	if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) )
@@ -44,7 +44,7 @@
 }
 endif;
 
-if ( !function_exists('wp_get_current_user') ) :
+if ( !function_exists( 'wp_get_current_user' ) ) :
 /**
  * Retrieve the current user object.
  *
@@ -61,7 +61,7 @@
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
+if ( !function_exists( 'get_currentuserinfo' ) ) :
 /**
  * Populate global variables with information about the currently logged in user.
  *
@@ -124,7 +124,7 @@
 }
 endif;
 
-if ( !function_exists('get_userdata') ) :
+if ( !function_exists( 'get_userdata' ) ) :
 /**
  * Retrieve user info by user ID.
  *
@@ -138,7 +138,7 @@
 }
 endif;
 
-if ( !function_exists('get_user_by') ) :
+if ( !function_exists( 'get_user_by' ) ) :
 /**
  * Retrieve user info by a given field
  *
@@ -161,7 +161,7 @@
 }
 endif;
 
-if ( !function_exists('cache_users') ) :
+if ( !function_exists( 'cache_users' ) ) :
 /**
  * Retrieve info for user lists to prevent multiple queries by get_userdata()
  *
@@ -302,7 +302,7 @@
 				switch ( strtolower( $name ) ) {
 					// Mainly for legacy -- process a From: header if it's there
 					case 'from':
-						if ( strpos($content, '<' ) !== false ) {
+						if ( strpos( $content, '<' ) !== false ) {
 							// So... making my life hard again?
 							$from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
 							$from_name = str_replace( '"', '', $from_name );
@@ -434,7 +434,7 @@
 	}
 
 	if ( !empty( $bcc ) ) {
-		foreach ( (array) $bcc as $recipient) {
+		foreach ( (array) $bcc as $recipient ) {
 			try {
 				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 				$recipient_name = '';
@@ -495,14 +495,14 @@
 			$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($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 ) {
 			try {
-				$phpmailer->AddAttachment($attachment);
+				$phpmailer->AddAttachment( $attachment );
 			} catch ( phpmailerException $e ) {
 				continue;
 			}
@@ -527,7 +527,7 @@
 }
 endif;
 
-if ( !function_exists('wp_authenticate') ) :
+if ( !function_exists( 'wp_authenticate' ) ) :
 /**
  * Checks a user's login information and logs them in if it checks out.
  *
@@ -537,9 +537,9 @@
  * @param string $password User's password
  * @return WP_User|WP_Error WP_User object if login successful, otherwise WP_Error object.
  */
-function wp_authenticate($username, $password) {
-	$username = sanitize_user($username);
-	$password = trim($password);
+function wp_authenticate( $username, $password ) {
+	$username = sanitize_user( $username );
+	$password = trim( $password );
 
 	/**
 	 * Filter the user to authenticate.
@@ -558,12 +558,12 @@
 	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 or incorrect password.'));
+		$user = new WP_Error('authentication_failed', __( '<strong>ERROR</strong>: Invalid username or incorrect password.' ) );
 	}
 
-	$ignore_codes = array('empty_username', 'empty_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.
 		 *
@@ -578,7 +578,7 @@
 }
 endif;
 
-if ( !function_exists('wp_logout') ) :
+if ( !function_exists( 'wp_logout' ) ) :
 /**
  * Log the current user out.
  *
@@ -597,7 +597,7 @@
 }
 endif;
 
-if ( !function_exists('wp_validate_auth_cookie') ) :
+if ( !function_exists( 'wp_validate_auth_cookie' ) ) :
 /**
  * Validates authentication cookie.
  *
@@ -613,8 +613,8 @@
  * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
  * @return bool|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) ) {
+function wp_validate_auth_cookie( $cookie = '', $scheme = '' ) {
+	if ( ! $cookie_elements = wp_parse_auth_cookie( $cookie, $scheme ) ) {
 		/**
 		 * Fires if an authentication cookie is malformed.
 		 *
@@ -652,7 +652,7 @@
 		return false;
 	}
 
-	$user = get_user_by('login', $username);
+	$user = get_user_by( 'login', $username );
 	if ( ! $user ) {
 		/**
 		 * Fires if a bad username is entered in the user authentication process.
@@ -665,7 +665,7 @@
 		return false;
 	}
 
-	$pass_frag = substr($user->user_pass, 8, 4);
+	$pass_frag = substr( $user->user_pass, 8, 4 );
 
 	$key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
 
@@ -710,7 +710,7 @@
 }
 endif;
 
-if ( !function_exists('wp_generate_auth_cookie') ) :
+if ( !function_exists( 'wp_generate_auth_cookie' ) ) :
 /**
  * Generate authentication cookie contents.
  *
@@ -723,7 +723,7 @@
  * @return string Authentication cookie contents. Empty string if user does not exist.
  */
 function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) {
-	$user = get_userdata($user_id);
+	$user = get_userdata( $user_id );
 	if ( ! $user ) {
 		return '';
 	}
@@ -733,7 +733,7 @@
 		$token = $manager->create( $expiration );
 	}
 
-	$pass_frag = substr($user->user_pass, 8, 4);
+	$pass_frag = substr( $user->user_pass, 8, 4 );
 
 	$key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
 
@@ -758,7 +758,7 @@
 }
 endif;
 
-if ( !function_exists('wp_parse_auth_cookie') ) :
+if ( !function_exists( 'wp_parse_auth_cookie' ) ) :
 /**
  * Parse a cookie into its components
  *
@@ -768,9 +768,9 @@
  * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
  * @return array Authentication cookie components
  */
-function wp_parse_auth_cookie($cookie = '', $scheme = '') {
-	if ( empty($cookie) ) {
-		switch ($scheme){
+function wp_parse_auth_cookie( $cookie = '', $scheme = '' ) {
+	if ( empty( $cookie ) ) {
+		switch ( $scheme ){
 			case 'auth':
 				$cookie_name = AUTH_COOKIE;
 				break;
@@ -790,7 +790,7 @@
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
+		if ( empty( $_COOKIE[$cookie_name] ) )
 			return false;
 		$cookie = $_COOKIE[$cookie_name];
 	}
@@ -806,7 +806,7 @@
 }
 endif;
 
-if ( !function_exists('wp_set_auth_cookie') ) :
+if ( !function_exists( 'wp_set_auth_cookie' ) ) :
 /**
  * Sets the authentication cookies based on user ID.
  *
@@ -821,7 +821,7 @@
  * @param mixed $secure  Whether the admin cookies should only be sent over HTTPS.
  *                       Default is_ssl().
  */
-function wp_set_auth_cookie($user_id, $remember = false, $secure = '') {
+function wp_set_auth_cookie( $user_id, $remember = false, $secure = '' ) {
 	if ( $remember ) {
 		/**
 		 * Filter the duration of the authentication cookie expiration period.
@@ -915,15 +915,15 @@
 	 */
 	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);
+	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);
+		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.
  *
@@ -958,7 +958,7 @@
 }
 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.
  *
@@ -976,7 +976,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.
  *
@@ -997,7 +997,7 @@
 	$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 ( $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();
@@ -1031,7 +1031,7 @@
 		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 ( !$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();
@@ -1051,12 +1051,12 @@
 
 	$login_url = wp_login_url($redirect, true);
 
-	wp_redirect($login_url);
+	wp_redirect( $login_url );
 	exit();
 }
 endif;
 
-if ( !function_exists('check_admin_referer') ) :
+if ( !function_exists( 'check_admin_referer' ) ) :
 /**
  * Makes sure that a user was referred from another admin page.
  *
@@ -1067,15 +1067,15 @@
  * @param string $action Action nonce
  * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5)
  */
-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' );
 
-	$adminurl = strtolower(admin_url());
-	$referer = strtolower(wp_get_referer());
-	$result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false;
-	if ( !$result && !(-1 == $action && strpos($referer, $adminurl) === 0) ) {
-		wp_nonce_ays($action);
+	$adminurl = strtolower( admin_url() );
+	$referer = strtolower( wp_get_referer() );
+	$result = isset( $_REQUEST[$query_arg] ) ? wp_verify_nonce( $_REQUEST[$query_arg], $action ) : false;
+	if ( !$result && !( -1 == $action && strpos($referer, $adminurl) === 0 ) ) {
+		wp_nonce_ays( $action );
 		die();
 	}
 
@@ -1092,7 +1092,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.
  *
@@ -1134,7 +1134,7 @@
 }
 endif;
 
-if ( !function_exists('wp_redirect') ) :
+if ( !function_exists( 'wp_redirect' ) ) :
 /**
  * Redirects to another page.
  *
@@ -1170,18 +1170,18 @@
 	if ( ! $location )
 		return false;
 
-	$location = wp_sanitize_redirect($location);
+	$location = wp_sanitize_redirect( $location );
 
 	if ( !$is_IIS && php_sapi_name() != 'cgi-fcgi' )
-		status_header($status); // This causes problems on IIS and some FastCGI setups
+		status_header( $status ); // This causes problems on IIS and some FastCGI setups
 
-	header("Location: $location", true, $status);
+	header( "Location: $location", true, $status );
 
 	return true;
 }
 endif;
 
-if ( !function_exists('wp_sanitize_redirect') ) :
+if ( !function_exists( 'wp_sanitize_redirect' ) ) :
 /**
  * Sanitizes a URL for use in a redirect.
  *
@@ -1189,18 +1189,18 @@
  *
  * @return string redirect-sanitized URL
  **/
-function wp_sanitize_redirect($location) {
-	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*]|i', '', $location);
-	$location = wp_kses_no_null($location);
+function wp_sanitize_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');
-	$location = _deep_replace($strip, $location);
+	$strip = array( '%0d', '%0a', '%0D', '%0A' );
+	$location = _deep_replace( $strip, $location );
 	return $location;
 }
 endif;
 
-if ( !function_exists('wp_safe_redirect') ) :
+if ( !function_exists( 'wp_safe_redirect' ) ) :
 /**
  * Performs a safe (local) redirect, using wp_redirect().
  *
@@ -1216,18 +1216,18 @@
  *
  * @return void Does not return anything
  **/
-function wp_safe_redirect($location, $status = 302) {
+function wp_safe_redirect( $location, $status = 302 ) {
 
 	// Need to look at the URL the way it will end up in wp_redirect()
-	$location = wp_sanitize_redirect($location);
+	$location = wp_sanitize_redirect( $location );
 
-	$location = wp_validate_redirect($location, admin_url());
+	$location = wp_validate_redirect( $location, admin_url() );
 
-	wp_redirect($location, $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.
  *
@@ -1243,30 +1243,30 @@
  * @param string $default The value to return if $location is not allowed
  * @return string redirect-sanitized URL
  **/
-function wp_validate_redirect($location, $default = '') {
+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) == '//' )
+	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;
 
-	$lp  = parse_url($test);
+	$lp  = parse_url( $test );
 
 	// Give up if malformed URL
 	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 scheme is 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['scheme'])  && !isset($lp['host']) )
+	if ( isset( $lp['scheme'] )  && !isset( $lp['host'] ) )
 		return $default;
 
-	$wpp = parse_url(home_url());
+	$wpp = parse_url( home_url() );
 
 	/**
 	 * Filter the whitelist of hosts to redirect to.
@@ -1276,16 +1276,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.
  *
@@ -1371,32 +1371,32 @@
 		$emails = array_flip( $emails );
 	}
 
-	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
+	$comment_author_domain = @gethostbyaddr( $comment->comment_author_IP );
 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
-	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+	$blogname = wp_specialchars_decode( get_option('blogname'), ENT_QUOTES );
 
 	switch ( $comment->comment_type ) {
 		case 'trackback':
 			$notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
 			/* translators: 1: website name, 2: author IP, 3: author domain */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s , %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
 			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
 			$notify_message .= sprintf( __( 'Comment: %s' ), $comment->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";
 			/* translators: 1: comment author, 2: author IP, 3: author domain */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s , %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
 			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
 			$notify_message .= sprintf( __( 'Comment: %s' ), $comment->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";
@@ -1408,21 +1408,21 @@
 			$notify_message .= sprintf( __('Comment: %s' ), $comment->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_id ) ) . "\r\n";
+	$notify_message .= get_permalink( $comment->comment_post_I D) . "#comments\r\n\r\n";
+	$notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment_id ) ) . "\r\n";
 
 	if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
 		if ( EMPTY_TRASH_DAYS )
-			$notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c=$comment_id" ) ) . "\r\n";
 		else
-			$notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-		$notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c=$comment_id" ) ) . "\r\n";
+		$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c=$comment_id" ) ) . "\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 ) {
 		$from = "From: \"$blogname\" <$wp_email>";
@@ -1437,7 +1437,7 @@
 	$message_headers = "$from\n"
 		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
-	if ( isset($reply_to) )
+	if ( isset( $reply_to ) )
 		$message_headers .= $reply_to . "\n";
 
 	/**
@@ -1478,7 +1478,7 @@
 }
 endif;
 
-if ( !function_exists('wp_notify_moderator') ) :
+if ( !function_exists( 'wp_notify_moderator' ) ) :
 /**
  * Notifies the moderator of the blog about a new comment that is awaiting approval.
  *
@@ -1489,14 +1489,14 @@
  * @param int $comment_id Comment ID
  * @return bool Always returns true
  */
-function wp_notify_moderator($comment_id) {
+function wp_notify_moderator( $comment_id ) {
 	global $wpdb;
 
 	if ( 0 == get_option( 'moderation_notify' ) )
 		return true;
 
-	$comment = get_comment($comment_id);
-	$post = get_post($comment->comment_post_ID);
+	$comment = get_comment( $comment_id );
+	$post = get_post( $comment->comment_post_ID );
 	$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' ) );
@@ -1505,51 +1505,51 @@
 			$emails[] = $user->user_email;
 	}
 
-	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-	$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
+	$comment_author_domain = @gethostbyaddr( $comment->comment_author_IP );
+	$comments_waiting = $wpdb->get_var( "SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'" );
 
 	// 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);
+	$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
 	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( __('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->comment_content . "\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";
+			$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->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( __('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->comment_content . "\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";
+			$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->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( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
-			$notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __('Whois  : http://whois.arin.net/rest/ip/%s'), $comment->comment_author_IP ) . "\r\n";
-			$notify_message .= __('Comment: ') . "\r\n" . $comment->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( __( 'E-mail : %s' ), $comment->comment_author_email ) . "\r\n";
+			$notify_message .= sprintf( __( 'URL    : %s' ), $comment->comment_author_url ) . "\r\n";
+			$notify_message .= sprintf( __( 'Whois  : http://whois.arin.net/rest/ip/%s' ), $comment->comment_author_IP ) . "\r\n";
+			$notify_message .= __( 'Comment: ' ) . "\r\n" . $comment->comment_content . "\r\n\r\n";
 			break;
 	}
 
-	$notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
+	$notify_message .= sprintf( __( 'Approve it: %s' ),  admin_url( "comment.php?action=approve&c=$comment_id" ) ) . "\r\n";
 	if ( EMPTY_TRASH_DAYS )
-		$notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c=$comment_id" ) ) . "\r\n";
 	else
-		$notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-	$notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c=$comment_id" ) ) . "\r\n";
+	$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c=$comment_id" ) ) . "\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") . "\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" ) . "\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 = '';
 
 	/**
@@ -1600,7 +1600,7 @@
 }
 endif;
 
-if ( !function_exists('wp_password_change_notification') ) :
+if ( !function_exists( 'wp_password_change_notification' ) ) :
 /**
  * Notify the blog admin of a user changing password, normally via email.
  *
@@ -1612,16 +1612,16 @@
 	// 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";
+		$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);
-		wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
+		$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] Password Lost/Changed' ), $blogname ), $message );
 	}
 }
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
+if ( !function_exists( 'wp_new_user_notification' ) ) :
 /**
  * Email login credentials to a newly-registered user.
  *
@@ -1632,32 +1632,32 @@
  * @param int    $user_id        User ID.
  * @param string $plaintext_pass Optional. The user's plaintext password. Default empty.
  */
-function wp_new_user_notification($user_id, $plaintext_pass = '') {
+function wp_new_user_notification( $user_id, $plaintext_pass = '' ) {
 	$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);
+	$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(__('E-mail: %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( __( 'E-mail: %s' ), $user->user_email ) . "\r\n";
 
-	@wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+	@wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
 
-	if ( empty($plaintext_pass) )
+	if ( empty( $plaintext_pass ) )
 		return;
 
-	$message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
-	$message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
+	$message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n";
+	$message .= sprintf( __( 'Password: %s' ), $plaintext_pass ) . "\r\n";
 	$message .= wp_login_url() . "\r\n";
 
-	wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
+	wp_mail( $user->user_email, sprintf( __( '[%s] Your username and password' ), $blogname ), $message );
 
 }
 endif;
 
-if ( !function_exists('wp_nonce_tick') ) :
+if ( !function_exists( 'wp_nonce_tick' ) ) :
 /**
  * Get the time-dependent variable for nonce creation.
  *
@@ -1682,7 +1682,7 @@
 }
 endif;
 
-if ( !function_exists('wp_verify_nonce') ) :
+if ( !function_exists( 'wp_verify_nonce' ) ) :
 /**
  * Verify that correct nonce was used with time limit.
  *
@@ -1695,7 +1695,7 @@
  * @param string|int $action Should give context to what is taking place and be the same when nonce was created.
  * @return bool Whether the nonce check passed or failed.
  */
-function wp_verify_nonce($nonce, $action = -1) {
+function wp_verify_nonce( $nonce, $action = -1 ) {
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
 	if ( ! $uid ) {
@@ -1718,7 +1718,7 @@
 	$i = wp_nonce_tick();
 
 	// Nonce generated 0-12 hours ago
-	$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
+	$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
 	if ( hash_equals( $expected, $nonce ) ) {
 		return 1;
 	}
@@ -1734,7 +1734,7 @@
 }
 endif;
 
-if ( !function_exists('wp_create_nonce') ) :
+if ( !function_exists( 'wp_create_nonce' ) ) :
 /**
  * Creates a cryptographic token tied to a specific action, user, and window of time.
  *
@@ -1743,7 +1743,7 @@
  * @param string $action Scalar value to add context to the nonce.
  * @return string The token.
  */
-function wp_create_nonce($action = -1) {
+function wp_create_nonce( $action = -1 ) {
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
 	if ( ! $uid ) {
@@ -1758,7 +1758,7 @@
 }
 endif;
 
-if ( !function_exists('wp_salt') ) :
+if ( !function_exists( 'wp_salt' ) ) :
 /**
  * Get salt to add to hashes.
  *
@@ -1862,7 +1862,7 @@
 }
 endif;
 
-if ( !function_exists('wp_hash') ) :
+if ( !function_exists( 'wp_hash' ) ) :
 /**
  * Get hash of given string.
  *
@@ -1871,14 +1871,14 @@
  * @param string $data Plain text to hash
  * @return string Hash of $data
  */
-function wp_hash($data, $scheme = 'auth') {
-	$salt = wp_salt($scheme);
+function wp_hash( $data, $scheme = 'auth' ) {
+	$salt = wp_salt( $scheme );
 
-	return hash_hmac('md5', $data, $salt);
+	return hash_hmac( 'md5', $data, $salt );
 }
 endif;
 
-if ( !function_exists('wp_hash_password') ) :
+if ( !function_exists( 'wp_hash_password' ) ) :
 /**
  * Create a hash (encrypt) of a plain text password.
  *
@@ -1893,20 +1893,20 @@
  * @param string $password Plain text user password to hash
  * @return string The hash string of the password
  */
-function wp_hash_password($password) {
+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);
+		$wp_hasher = new PasswordHash( 8, true );
 	}
 
 	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.
  *
@@ -1928,16 +1928,16 @@
  * @param string $hash Hash of the user's password to check against.
  * @return bool False, if the $password does not match the hashed password
  */
-function wp_check_password($password, $hash, $user_id = '') {
+function wp_check_password( $password, $hash, $user_id = '' ) {
 	global $wp_hasher;
 
 	// If the hash is still md5...
-	if ( strlen($hash) <= 32 ) {
+	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);
+			wp_set_password( $password, $user_id );
+			$hash = wp_hash_password( $password );
 		}
 
 		/**
@@ -1955,20 +1955,20 @@
 
 	// 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);
+		$wp_hasher = new PasswordHash( 8, true );
 	}
 
-	$check = $wp_hasher->CheckPassword($password, $hash);
+	$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 );
 }
 endif;
 
-if ( !function_exists('wp_generate_password') ) :
+if ( !function_exists( 'wp_generate_password' ) ) :
 /**
  * Generates a random password drawn from the defined set of characters.
  *
@@ -1989,7 +1989,7 @@
 
 	$password = '';
 	for ( $i = 0; $i < $length; $i++ ) {
-		$password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
+		$password .= substr( $chars, wp_rand( 0, strlen( $chars ) - 1 ), 1 );
 	}
 
 	/**
@@ -2003,7 +2003,7 @@
 }
 endif;
 
-if ( !function_exists('wp_rand') ) :
+if ( !function_exists( 'wp_rand' ) ) :
 /**
  * Generates a random number
  *
@@ -2018,26 +2018,26 @@
 
 	// 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 ( 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 .= sha1($rnd_value);
-		$rnd_value .= sha1($rnd_value . $seed);
-		$seed = md5($seed . $rnd_value);
+			$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 );
+		$seed = md5( $seed . $rnd_value );
 		if ( ! defined( 'WP_SETUP_CONFIG' ) )
-			set_transient('random_seed', $seed);
+			set_transient( 'random_seed', $seed );
 	}
 
 	// Take the first 8 digits for our value
-	$value = substr($rnd_value, 0, 8);
+	$value = substr( $rnd_value, 0, 8 );
 
 	// Strip the first eight, leaving the remainder for the next call to wp_rand().
-	$rnd_value = substr($rnd_value, 8);
+	$rnd_value = substr( $rnd_value, 8 );
 
-	$value = abs(hexdec($value));
+	$value = abs( hexdec( $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.
 	$max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
@@ -2046,11 +2046,11 @@
 	if ( $max != 0 )
 		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
 
-	return abs(intval($value));
+	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.
  *
@@ -2072,9 +2072,9 @@
 	global $wpdb;
 
 	$hash = wp_hash_password( $password );
-	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );
+	$wpdb->update( $wpdb->users, array( 'user_pass' => $hash, 'user_activation_key' => '' ), array( 'ID' => $user_id ) );
 
-	wp_cache_delete($user_id, 'users');
+	wp_cache_delete( $user_id, 'users' );
 }
 endif;
 
@@ -2091,24 +2091,24 @@
  * @return string `<img>` tag for the user's avatar.
 */
 function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
-	if ( ! get_option('show_avatars') )
+	if ( ! get_option( 'show_avatars' ) )
 		return false;
 
-	if ( false === $alt)
+	if ( false === $alt )
 		$safe_alt = '';
 	else
 		$safe_alt = esc_attr( $alt );
 
-	if ( !is_numeric($size) )
+	if ( !is_numeric( $size ) )
 		$size = '96';
 
 	$email = '';
-	if ( is_numeric($id_or_email) ) {
+	if ( is_numeric( $id_or_email ) ) {
 		$id = (int) $id_or_email;
-		$user = get_userdata($id);
+		$user = get_userdata( $id );
 		if ( $user )
 			$email = $user->user_email;
-	} elseif ( is_object($id_or_email) ) {
+	} elseif ( is_object( $id_or_email ) ) {
 		// No avatar for pingbacks or trackbacks
 
 		/**
@@ -2124,7 +2124,7 @@
 
 		if ( ! empty( $id_or_email->user_id ) ) {
 			$id = (int) $id_or_email->user_id;
-			$user = get_userdata($id);
+			$user = get_userdata( $id );
 			if ( $user )
 				$email = $user->user_email;
 		}
@@ -2136,20 +2136,20 @@
 	}
 
 	if ( empty($default) ) {
-		$avatar_default = get_option('avatar_default');
-		if ( empty($avatar_default) )
+		$avatar_default = get_option( 'avatar_default' );
+		if ( empty( $avatar_default ) )
 			$default = 'mystery';
 		else
 			$default = $avatar_default;
 	}
 
-	if ( !empty($email) )
+	if ( !empty( $email ) )
 		$email_hash = md5( strtolower( trim( $email ) ) );
 
 	if ( is_ssl() ) {
 		$host = 'https://secure.gravatar.com';
 	} else {
-		if ( !empty($email) )
+		if ( !empty( $email ) )
 			$host = sprintf( "http://%d.gravatar.com", ( hexdec( $email_hash[0] ) % 2 ) );
 		else
 			$host = 'http://0.gravatar.com';
@@ -2159,22 +2159,22 @@
 		$default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
 	elseif ( 'blank' == $default )
 		$default = $email ? 'blank' : includes_url( 'images/blank.gif' );
-	elseif ( !empty($email) && 'gravatar_default' == $default )
+	elseif ( !empty( $email ) && 'gravatar_default' == $default )
 		$default = '';
 	elseif ( 'gravatar_default' == $default )
 		$default = "$host/avatar/?s={$size}";
-	elseif ( empty($email) )
+	elseif ( empty( $email ) )
 		$default = "$host/avatar/?d=$default&amp;s={$size}";
-	elseif ( strpos($default, 'http://') === 0 )
+	elseif ( strpos( $default, 'http://' ) === 0 )
 		$default = add_query_arg( 's', $size, $default );
 
-	if ( !empty($email) ) {
+	if ( !empty( $email ) ) {
 		$out = "$host/avatar/";
 		$out .= $email_hash;
 		$out .= '?s='.$size;
 		$out .= '&amp;d=' . urlencode( $default );
 
-		$rating = get_option('avatar_rating');
+		$rating = get_option( 'avatar_rating' );
 		if ( !empty( $rating ) )
 			$out .= "&amp;r={$rating}";
 
@@ -2235,14 +2235,14 @@
 	if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
 		require( ABSPATH . WPINC . '/wp-diff.php' );
 
-	$left_string  = normalize_whitespace($left_string);
-	$right_string = normalize_whitespace($right_string);
+	$left_string  = normalize_whitespace( $left_string );
+	$right_string = normalize_whitespace( $right_string );
 
-	$left_lines  = explode("\n", $left_string);
-	$right_lines = explode("\n", $right_string);
-	$text_diff = new Text_Diff($left_lines, $right_lines);
+	$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 );
-	$diff = $renderer->render($text_diff);
+	$diff = $renderer->render( $text_diff );
 
 	if ( !$diff )
 		return '';