ntwb / wordpress

src/wp-includes/ms-functions.php

Doc Comments +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
  * @global wpdb $wpdb
  *
  * @param int $user_id The unique ID of the user
- * @return object|void The blog object
+ * @return string The blog object
  */
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
@@ -806,7 +806,7 @@ 
  * @param string $user       The user's login name.
  * @param string $user_email The user's email address.
  * @param string $key        The activation key created in wpmu_signup_blog()
- * @param array  $meta       By default, contains the requested privacy setting and lang_id.
+ * @param string  $meta       By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
 function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
@@ -909,7 +909,7 @@ 
  * @param string $user       The user's login name.
  * @param string $user_email The user's email address.
  * @param string $key        The activation key created in wpmu_signup_user()
- * @param array  $meta       By default, an empty array.
+ * @param string  $meta       By default, an empty array.
  * @return bool
  */
 function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
@@ -2161,7 +2161,7 @@ 
  *
  * @staticvar bool $forced_content
  *
- * @param bool $force
+ * @param string|boolean $force
  * @return bool True if forced, false if not forced.
  */
 function force_ssl_content( $force = '' ) {

Indentation +8 added lines, -8 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Multisite WordPress API
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite WordPress API
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 /**
  * Gets the network's site and user counts.
@@ -1552,7 +1552,7 @@ 
 	$current_site = get_current_site();
 
 	/**
- 	 * Filter whether to bypass the welcome email after user activation.
+	 * Filter whether to bypass the welcome email after user activation.
 	 *
 	 * Returning false disables the welcome email.
 	 *
@@ -2063,7 +2063,7 @@ 
  * @return bool
  */
 function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
+	if ( ! ( $user instanceof WP_User ) ) {
 		if ( $user ) {
 			$user = get_user_by( 'login', $user );
 		} else {

Spacing +516 added lines, -516 removed lines

@@ -34,16 +34,16 @@ 
  * @param string $path       Optional. Site path.
  * @return array|false The network admins
  */
-function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
+function get_admin_users_for_domain($sitedomain = '', $path = '') {
 	global $wpdb;
 
-	if ( ! $sitedomain )
+	if ( ! $sitedomain)
 		$site_id = $wpdb->siteid;
 	else
-		$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+		$site_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path));
 
-	if ( $site_id )
-		return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	if ($site_id)
+		return $wpdb->get_results($wpdb->prepare("SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id), ARRAY_A);
 
 	return false;
 }
@@ -64,45 +64,45 @@ 
  * @param int $user_id The unique ID of the user
  * @return object|void The blog object
  */
-function get_active_blog_for_user( $user_id ) {
+function get_active_blog_for_user($user_id) {
 	global $wpdb;
-	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
+	$blogs = get_blogs_of_user($user_id);
+	if (empty($blogs))
 		return;
 
-	if ( !is_multisite() )
+	if ( ! is_multisite())
 		return $blogs[$wpdb->blogid];
 
-	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
+	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
 	$first_blog = current($blogs);
-	if ( false !== $primary_blog ) {
-		if ( ! isset( $blogs[ $primary_blog ] ) ) {
-			update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-			$primary = get_blog_details( $first_blog->userblog_id );
+	if (false !== $primary_blog) {
+		if ( ! isset($blogs[$primary_blog])) {
+			update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
+			$primary = get_blog_details($first_blog->userblog_id);
 		} else {
-			$primary = get_blog_details( $primary_blog );
+			$primary = get_blog_details($primary_blog);
 		}
 	} else {
 		//TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
-		add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
-		update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
+		add_user_to_blog($first_blog->userblog_id, $user_id, 'subscriber');
+		update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
 		$primary = $first_blog;
 	}
 
-	if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
-		$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
+	if (( ! is_object($primary)) || ($primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1)) {
+		$blogs = get_blogs_of_user($user_id, true); // if a user's primary blog is shut down, check their other blogs.
 		$ret = false;
-		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
-			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
+		if (is_array($blogs) && count($blogs) > 0) {
+			foreach ((array) $blogs as $blog_id => $blog) {
+				if ($blog->site_id != $wpdb->siteid)
 					continue;
-				$details = get_blog_details( $blog_id );
-				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
+				$details = get_blog_details($blog_id);
+				if (is_object($details) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if (get_user_meta($user_id, 'primary_blog', true) != $blog_id)
+						update_user_meta($user_id, 'primary_blog', $blog_id);
+					if ( ! get_user_meta($user_id, 'source_domain', true))
+						update_user_meta($user_id, 'source_domain', $blog->domain);
 					break;
 				}
 			}
@@ -125,7 +125,7 @@ 
  * @return int
  */
 function get_user_count() {
-	return get_site_option( 'user_count' );
+	return get_site_option('user_count');
 }
 
 /**
@@ -138,11 +138,11 @@ 
  * @param int $network_id Deprecated, not supported.
  * @return int
  */
-function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+function get_blog_count($network_id = 0) {
+	if (func_num_args())
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	return get_site_option( 'blog_count' );
+	return get_site_option('blog_count');
 }
 
 /**
@@ -154,9 +154,9 @@ 
  * @param int $post_id ID of the post you're looking for.
  * @return WP_Post|null WP_Post on success or null on failure
  */
-function get_blog_post( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$post = get_post( $post_id );
+function get_blog_post($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$post = get_post($post_id);
 	restore_current_blog();
 
 	return $post;
@@ -175,17 +175,17 @@ 
  * @param string $role    The role you want the user to have
  * @return true|WP_Error
  */
-function add_user_to_blog( $blog_id, $user_id, $role ) {
+function add_user_to_blog($blog_id, $user_id, $role) {
 	switch_to_blog($blog_id);
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		restore_current_blog();
-		return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
+		return new WP_Error('user_does_not_exist', __('The requested user does not exist.'));
 	}
 
-	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
+	if ( ! get_user_meta($user_id, 'primary_blog', true)) {
 		update_user_meta($user_id, 'primary_blog', $blog_id);
 		$details = get_blog_details($blog_id);
 		update_user_meta($user_id, 'source_domain', $details->domain);
@@ -202,9 +202,9 @@ 
 	 * @param string $role    User role.
 	 * @param int    $blog_id Blog ID.
 	 */
-	do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
+	do_action('add_user_to_blog', $user_id, $role, $blog_id);
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($blog_id.'_user_count', 'blog-details');
 	restore_current_blog();
 	return true;
 }
@@ -239,17 +239,17 @@ 
 	 * @param int $user_id User ID.
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'remove_user_from_blog', $user_id, $blog_id );
+	do_action('remove_user_from_blog', $user_id, $blog_id);
 
 	// If being removed from the primary blog, set a new primary if the user is assigned
 	// to multiple blogs.
 	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
-	if ( $primary_blog == $blog_id ) {
+	if ($primary_blog == $blog_id) {
 		$new_id = '';
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
-		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
+		foreach ((array) $blogs as $blog) {
+			if ($blog->userblog_id == $blog_id)
 				continue;
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
@@ -261,8 +261,8 @@ 
 	}
 
 	// wp_revoke_user($user_id);
-	$user = get_userdata( $user_id );
-	if ( ! $user ) {
+	$user = get_userdata($user_id);
+	if ( ! $user) {
 		restore_current_blog();
 		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 	}
@@ -270,24 +270,24 @@ 
 	$user->remove_all_caps();
 
 	$blogs = get_blogs_of_user($user_id);
-	if ( count($blogs) == 0 ) {
+	if (count($blogs) == 0) {
 		update_user_meta($user_id, 'primary_blog', '');
 		update_user_meta($user_id, 'source_domain', '');
 	}
 
-	if ( $reassign != '' ) {
+	if ($reassign != '') {
 		$reassign = (int) $reassign;
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id));
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id));
 
-		if ( ! empty( $post_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id ) );
-			array_walk( $post_ids, 'clean_post_cache' );
+		if ( ! empty($post_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id));
+			array_walk($post_ids, 'clean_post_cache');
 		}
 
-		if ( ! empty( $link_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id ) );
-			array_walk( $link_ids, 'clean_bookmark_cache' );
+		if ( ! empty($link_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id));
+			array_walk($link_ids, 'clean_bookmark_cache');
 		}
 	}
 
@@ -307,20 +307,20 @@ 
  * @param int    $site_id      Optional. Defaults to 1.
  * @return string|int The ID of the newly created blog
  */
-function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
-	if ( empty($path) )
+function create_empty_blog($domain, $path, $weblog_title, $site_id = 1) {
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	if (domain_exists($domain, $path, $site_id))
+		return __('<strong>ERROR</strong>: Site URL already taken.');
 
 	// Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
 	// Need to get blog_id from wp_blogs, and create new table names.
 	// Must restore table names at the end of function.
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
+		return __('<strong>ERROR</strong>: problem creating site entry.');
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id);
@@ -338,9 +338,9 @@ 
  * @param int $post_id ID of the desired post.
  * @return string The post's permalink
  */
-function get_blog_permalink( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$link = get_permalink( $post_id );
+function get_blog_permalink($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$link = get_permalink($post_id);
 	restore_current_blog();
 
 	return $link;
@@ -362,26 +362,26 @@ 
  * @param string $path   Optional. Not required for subdomain installations.
  * @return int 0 if no blog found, otherwise the ID of the matching blog
  */
-function get_blog_id_from_url( $domain, $path = '/' ) {
+function get_blog_id_from_url($domain, $path = '/') {
 	global $wpdb;
 
-	$domain = strtolower( $domain );
-	$path = strtolower( $path );
-	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+	$domain = strtolower($domain);
+	$path = strtolower($path);
+	$id = wp_cache_get(md5($domain.$path), 'blog-id-cache');
 
-	if ( $id == -1 ) // blog does not exist
+	if ($id == -1) // blog does not exist
 		return 0;
-	elseif ( $id )
+	elseif ($id)
 		return (int) $id;
 
-	$id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+	$id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path));
 
-	if ( ! $id ) {
-		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
+	if ( ! $id) {
+		wp_cache_set(md5($domain.$path), -1, 'blog-id-cache');
 		return 0;
 	}
 
-	wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
+	wp_cache_set(md5($domain.$path), $id, 'blog-id-cache');
 
 	return $id;
 }
@@ -401,30 +401,30 @@ 
  * @param string $user_email The email provided by the user at registration.
  * @return bool Returns true when the email address is banned.
  */
-function is_email_address_unsafe( $user_email ) {
-	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+function is_email_address_unsafe($user_email) {
+	$banned_names = get_site_option('banned_email_domains');
+	if ($banned_names && ! is_array($banned_names))
+		$banned_names = explode("\n", $banned_names);
 
 	$is_email_address_unsafe = false;
 
-	if ( $banned_names && is_array( $banned_names ) ) {
-		$banned_names = array_map( 'strtolower', $banned_names );
-		$normalized_email = strtolower( $user_email );
+	if ($banned_names && is_array($banned_names)) {
+		$banned_names = array_map('strtolower', $banned_names);
+		$normalized_email = strtolower($user_email);
 
-		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
+		list($email_local_part, $email_domain) = explode('@', $normalized_email);
 
-		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
+		foreach ($banned_names as $banned_domain) {
+			if ( ! $banned_domain)
 				continue;
 
-			if ( $email_domain == $banned_domain ) {
+			if ($email_domain == $banned_domain) {
 				$is_email_address_unsafe = true;
 				break;
 			}
 
 			$dotted_domain = ".$banned_domain";
-			if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+			if ($dotted_domain === substr($normalized_email, -strlen($dotted_domain))) {
 				$is_email_address_unsafe = true;
 				break;
 			}
@@ -439,7 +439,7 @@ 
 	 * @param bool   $is_email_address_unsafe Whether the email address is "unsafe". Default false.
 	 * @param string $user_email              User email address.
 	 */
-	return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
+	return apply_filters('is_email_address_unsafe', $is_email_address_unsafe, $user_email);
 }
 
 /**
@@ -468,81 +468,81 @@ 
 	$errors = new WP_Error();
 
 	$orig_username = $user_name;
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
-		$errors->add( 'user_name', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
+	if ($user_name != $orig_username || preg_match('/[^a-z0-9]/', $user_name)) {
+		$errors->add('user_name', __('Only lowercase letters (a-z) and numbers are allowed.'));
 		$user_name = $orig_username;
 	}
 
-	$user_email = sanitize_email( $user_email );
+	$user_email = sanitize_email($user_email);
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if (empty($user_name))
+	   	$errors->add('user_name', __('Please enter a username.'));
 
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( ! is_array( $illegal_names ) ) {
-		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ( ! is_array($illegal_names)) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
-	if ( in_array( $user_name, $illegal_names ) )
-		$errors->add('user_name',  __( 'That username is not allowed.' ) );
+	if (in_array($user_name, $illegal_names))
+		$errors->add('user_name', __('That username is not allowed.'));
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if (is_email_address_unsafe($user_email))
+		$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if (strlen($user_name) < 4)
+		$errors->add('user_name', __('Username must be at least 4 characters.'));
 
-	if ( strlen( $user_name ) > 60 ) {
-		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
+	if (strlen($user_name) > 60) {
+		$errors->add('user_name', __('Username may not be longer than 60 characters.'));
 	}
 
-	if ( strpos( $user_name, '_' ) !== false )
-		$errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) );
+	if (strpos($user_name, '_') !== false)
+		$errors->add('user_name', __('Sorry, usernames may not contain the character &#8220;_&#8221;!'));
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
+	if (preg_match('/^[0-9]*$/', $user_name))
 		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( ! is_email($user_email))
+		$errors->add('user_email', __('Please enter a valid email address.'));
 
-	$limited_email_domains = get_site_option( 'limited_email_domains' );
-	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
-		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-		if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+	$limited_email_domains = get_site_option('limited_email_domains');
+	if (is_array($limited_email_domains) && ! empty($limited_email_domains)) {
+		$emaildomain = substr($user_email, 1 + strpos($user_email, '@'));
+		if ( ! in_array($emaildomain, $limited_email_domains)) {
 			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
 		}
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if (username_exists($user_name))
+		$errors->add('user_name', __('Sorry, that username already exists!'));
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if (email_exists($user_email))
+		$errors->add('user_email', __('Sorry, that email address is already used!'));
 
 	// Has someone already signed up for this username?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
-	if ( $signup != null ) {
-		$registered_at =  mysql2date('U', $signup->registered);
-		$now = current_time( 'timestamp', true );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name));
+	if ($signup != null) {
+		$registered_at = mysql2date('U', $signup->registered);
+		$now = current_time('timestamp', true);
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_login' => $user_name));
 		else
 			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
 	}
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
-	if ( $signup != null ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email));
+	if ($signup != null) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_email' => $user_email));
 		else
 			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
 	}
@@ -566,7 +566,7 @@ 
 	 *     @type WP_Error $errors        WP_Error object containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_user_signup', $result );
+	return apply_filters('wpmu_validate_user_signup', $result);
 }
 
 /**
@@ -592,27 +592,27 @@ 
  * @param string $blog_title The blog title provided by the user.
  * @return array Contains the new site data and error messages.
  */
-function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
+function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
 	global $wpdb, $domain;
 
 	$current_site = get_current_site();
 	$base = $current_site->path;
 
-	$blog_title = strip_tags( $blog_title );
-	$blog_title = substr( $blog_title, 0, 50 );
+	$blog_title = strip_tags($blog_title);
+	$blog_title = substr($blog_title, 0, 50);
 
 	$errors = new WP_Error();
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( $illegal_names == false ) {
-		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ($illegal_names == false) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
 
 	/*
 	 * On sub dir installs, some names are so illegal, only a filter can
 	 * spring them from jail.
 	 */
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 		$illegal_names = array_merge(
 			$illegal_names,
 			/**
@@ -622,31 +622,31 @@ 
 			 *
 			 * @param array $subdirectory_reserved_names Array of reserved names.
 			 */
-			apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) )
+			apply_filters('subdirectory_reserved_names', array('page', 'comments', 'blog', 'files', 'feed'))
 		);
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if (empty($blogname))
+		$errors->add('blogname', __('Please enter a site name.'));
 
-	if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
-		$errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
+	if (preg_match('/[^a-z0-9]+/', $blogname))
+		$errors->add('blogname', __('Only lowercase letters (a-z) and numbers are allowed.'));
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if (in_array($blogname, $illegal_names))
+		$errors->add('blogname', __('That name is not allowed.'));
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if (strlen($blogname) < 4 && ! is_super_admin())
+		$errors->add('blogname', __('Site name must be at least 4 characters.'));
 
-	if ( strpos( $blogname, '_' ) !== false )
-		$errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
+	if (strpos($blogname, '_') !== false)
+		$errors->add('blogname', __('Sorry, site names may not contain the character &#8220;_&#8221;!'));
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( ! is_subdomain_install() && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM ".$wpdb->get_blog_prefix($current_site->blog_id)."posts WHERE post_type = 'page' AND post_name = %s", $blogname)))
+		$errors->add('blogname', __('Sorry, you may not use that site name.'));
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
+	if (preg_match('/^[0-9]*$/', $blogname))
 		$errors->add('blogname', __('Sorry, site names must have letters too!'));
 
 	/**
@@ -659,36 +659,36 @@ 
 	 *
 	 * @param string $blogname Site name.
 	 */
-	$blogname = apply_filters( 'newblogname', $blogname );
+	$blogname = apply_filters('newblogname', $blogname);
 
-	$blog_title = wp_unslash(  $blog_title );
+	$blog_title = wp_unslash($blog_title);
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if (empty($blog_title))
+		$errors->add('blog_title', __('Please enter a site title.'));
 
 	// Check if the domain/path has been used already.
-	if ( is_subdomain_install() ) {
-		$mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
+	if (is_subdomain_install()) {
+		$mydomain = $blogname.'.'.preg_replace('|^www\.|', '', $domain);
 		$path = $base;
 	} else {
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($mydomain, $path, $current_site->id))
+		$errors->add('blogname', __('Sorry, that site already exists!'));
 
-	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+	if (username_exists($blogname)) {
+		if ( ! is_object($user) || (is_object($user) && ($user->user_login != $blogname)))
+			$errors->add('blogname', __('Sorry, that site is reserved!'));
 	}
 
 	// Has someone already signed up for this domain?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
-	if ( ! empty($signup) ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path)); // TODO: Check email too?
+	if ( ! empty($signup)) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('domain' => $mydomain, 'path' => $path));
 		else
 			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
 	}
@@ -711,7 +711,7 @@ 
 	 *     @type WP_Error $errors     WP_Error containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_blog_signup', $result );
+	return apply_filters('wpmu_validate_blog_signup', $result);
 }
 
 /**
@@ -728,13 +728,13 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
+function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = array()) {
 	global $wpdb;
 
-	$key = substr( md5( time() . rand() . $domain ), 0, 16 );
+	$key = substr(md5(time().rand().$domain), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => $domain,
 		'path' => $path,
 		'title' => $title,
@@ -743,7 +743,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta);
 }
@@ -762,16 +762,16 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, this is an empty array.
  */
-function wpmu_signup_user( $user, $user_email, $meta = array() ) {
+function wpmu_signup_user($user, $user_email, $meta = array()) {
 	global $wpdb;
 
 	// Format data
-	$user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
-	$user_email = sanitize_email( $user_email );
-	$key = substr( md5( time() . rand() . $user_email ), 0, 16 );
+	$user = preg_replace('/\s+/', '', sanitize_user($user, true));
+	$user_email = sanitize_email($user_email);
+	$key = substr(md5(time().rand().$user_email), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => '',
 		'path' => '',
 		'title' => '',
@@ -780,7 +780,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	wpmu_signup_user_notification($user, $user_email, $key, $meta);
 }
@@ -809,7 +809,7 @@ 
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
-function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filter whether to bypass the new site email notification.
 	 *
@@ -823,22 +823,22 @@ 
 	 * @param string      $key        Activation key created in wpmu_signup_blog().
 	 * @param array       $meta       By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta ) ) {
+	if ( ! apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta)) {
 		return false;
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
+	if ( ! is_subdomain_install() || get_current_site()->id != 1)
 		$activate_url = network_site_url("wp-activate.php?key=$key");
 	else
 		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filter the message content of the new blog notification email.
@@ -856,12 +856,12 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_email',
-			__( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ),
+		apply_filters('wpmu_signup_blog_notification_email',
+			__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s"),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$activate_url,
-		esc_url( "http://{$domain}{$path}" ),
+		esc_url("http://{$domain}{$path}"),
 		$key
 	);
 	// TODO: Don't hard code activation link.
@@ -880,14 +880,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_blog_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$from_name,
-		esc_url( 'http://' . $domain . $path )
+		esc_url('http://'.$domain.$path)
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -912,7 +912,7 @@ 
  * @param array  $meta       By default, an empty array.
  * @return bool
  */
-function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_user_notification($user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filter whether to bypass the email notification for new user sign-up.
 	 *
@@ -923,15 +923,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
+	if ( ! apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta))
 		return false;
 
 	// Send email with activation link.
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filter the content of the notification email for new user sign-up.
@@ -946,11 +946,11 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_email',
-			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
+		apply_filters('wpmu_signup_user_notification_email',
+			__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login."),
 			$user, $user_email, $key, $meta
 		),
-		site_url( "wp-activate.php?key=$key" )
+		site_url("wp-activate.php?key=$key")
 	);
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(
@@ -965,14 +965,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_user_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$user, $user_email, $key, $meta
 		),
 		$from_name,
 		$user
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -994,40 +994,40 @@ 
 function wpmu_activate_signup($key) {
 	global $wpdb;
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key));
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if (empty($signup))
+		return new WP_Error('invalid_key', __('Invalid activation key.'));
 
-	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+	if ($signup->active) {
+		if (empty($signup->domain))
+			return new WP_Error('already_active', __('The user is already active.'), $signup);
 		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+			return new WP_Error('already_active', __('The site is already active.'), $signup);
 	}
 
 	$meta = maybe_unserialize($signup->meta);
-	$password = wp_generate_password( 12, false );
+	$password = wp_generate_password(12, false);
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
 	else
 		$user_already_exists = true;
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return new WP_Error('create_user', __('Could not create user'), $signup);
 
 	$now = current_time('mysql', true);
 
-	if ( empty($signup->domain) ) {
-		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	if (empty($signup->domain)) {
+		$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if (isset($user_already_exists))
+			return new WP_Error('user_already_exists', __('That username is already activated.'), $signup);
 
-		wpmu_welcome_user_notification( $user_id, $password, $meta );
+		wpmu_welcome_user_notification($user_id, $password, $meta);
 		/**
 		 * Fires immediately after a new user is activated.
 		 *
@@ -1037,24 +1037,24 @@ 
 		 * @param int   $password User password.
 		 * @param array $meta     Signup meta data.
 		 */
-		do_action( 'wpmu_activate_user', $user_id, $password, $meta );
-		return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
+		do_action('wpmu_activate_user', $user_id, $password, $meta);
+		return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
 	}
 
-	$blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+	$blog_id = wpmu_create_blog($signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid);
 
 	// TODO: What to do if we create a user but cannot create a blog?
-	if ( is_wp_error($blog_id) ) {
+	if (is_wp_error($blog_id)) {
 		// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
 		// setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
-		if ( 'blog_taken' == $blog_id->get_error_code() ) {
-			$blog_id->add_data( $signup );
-			$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
+		if ('blog_taken' == $blog_id->get_error_code()) {
+			$blog_id->add_data($signup);
+			$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 		}
 		return $blog_id;
 	}
 
-	$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 	wpmu_welcome_notification($blog_id, $user_id, $password, $signup->title, $meta);
 	/**
 	 * Fires immediately after a site is activated.
@@ -1067,7 +1067,7 @@ 
 	 * @param string $signup_title  Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
+	do_action('wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta);
 
 	return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
 }
@@ -1087,16 +1087,16 @@ 
  * @param string $email     The new user's email address.
  * @return int|false Returns false on failure, or int $user_id on success
  */
-function wpmu_create_user( $user_name, $password, $email ) {
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+function wpmu_create_user($user_name, $password, $email) {
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
+	$user_id = wp_create_user($user_name, $password, $email);
+	if (is_wp_error($user_id))
 		return false;
 
 	// Newly created users have no roles or caps until they are added to a blog.
-	delete_user_option( $user_id, 'capabilities' );
-	delete_user_option( $user_id, 'user_level' );
+	delete_user_option($user_id, 'capabilities');
+	delete_user_option($user_id, 'user_level');
 
 	/**
 	 * Fires immediately after a new user is created.
@@ -1105,7 +1105,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	do_action( 'wpmu_new_user', $user_id );
+	do_action('wpmu_new_user', $user_id);
 
 	return $user_id;
 }
@@ -1132,29 +1132,29 @@ 
  * @param int    $site_id Optional. Only relevant on multi-network installs.
  * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
-	$defaults = array( 'public' => 0 );
-	$meta = wp_parse_args( $meta, $defaults );
+function wpmu_create_blog($domain, $path, $title, $user_id, $meta = array(), $site_id = 1) {
+	$defaults = array('public' => 0);
+	$meta = wp_parse_args($meta, $defaults);
 
-	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
+	$domain = preg_replace('/\s+/', '', sanitize_user($domain, true));
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if (is_subdomain_install())
+		$domain = str_replace('@', '', $domain);
 
-	$title = strip_tags( $title );
+	$title = strip_tags($title);
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($domain, $path, $site_id))
+		return new WP_Error('blog_taken', __('Sorry, that site already exists!'));
 
-	if ( !defined('WP_INSTALLING') )
-		define( 'WP_INSTALLING', true );
+	if ( ! defined('WP_INSTALLING'))
+		define('WP_INSTALLING', true);
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
 		return new WP_Error('insert_blog', __('Could not create site.'));
 
 	switch_to_blog($blog_id);
@@ -1163,18 +1163,18 @@ 
 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
-	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		if (in_array($key, array('public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
+			update_blog_status($blog_id, $key, $value);
 		else
-			update_option( $key, $value );
+			update_option($key, $value);
 	}
 
-	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
-	update_option( 'blog_public', (int) $meta['public'] );
+	add_option('WPLANG', get_site_option('WPLANG'));
+	update_option('blog_public', (int) $meta['public']);
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin($user_id) && ! get_user_meta($user_id, 'primary_blog', true))
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 
 	restore_current_blog();
 	/**
@@ -1189,7 +1189,7 @@ 
 	 * @param int    $site_id Site ID. Only relevant on multi-network installs.
 	 * @param array  $meta    Meta data. Used to set initial site options.
 	 */
-	do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
+	do_action('wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta);
 
 	return $blog_id;
 }
@@ -1205,26 +1205,26 @@ 
  * @param int $blog_id The new site's ID.
  * @return bool
  */
-function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newblog_notify_siteadmin($blog_id, $deprecated = '') {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
+	$email = get_site_option('admin_email');
+	if (is_email($email) == false)
 		return false;
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
-	switch_to_blog( $blog_id );
-	$blogname = get_option( 'blogname' );
+	switch_to_blog($blog_id);
+	$blogname = get_option('blogname');
 	$siteurl = site_url();
 	restore_current_blog();
 
-	$msg = sprintf( __( 'New Site: %1$s
+	$msg = sprintf(__('New Site: %1$s
 URL: %2$s
 Remote IP: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 	/**
 	 * Filter the message body of the new site activation email sent
 	 * to the network administrator.
@@ -1233,9 +1233,9 @@ 
 	 *
 	 * @param string $msg Email body.
 	 */
-	$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
+	$msg = apply_filters('newblog_notify_siteadmin', $msg);
 
-	wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
+	wp_mail($email, sprintf(__('New Site Registration: %s'), $siteurl), $msg);
 	return true;
 }
 
@@ -1250,22 +1250,22 @@ 
  * @param int $user_id The new user's ID.
  * @return bool
  */
-function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newuser_notify_siteadmin($user_id) {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
+	$email = get_site_option('admin_email');
 
-	if ( is_email($email) == false )
+	if (is_email($email) == false)
 		return false;
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 	$msg = sprintf(__('New User: %1$s
 Remote IP: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 
 	/**
 	 * Filter the message body of the new user activation email sent
@@ -1276,8 +1276,8 @@ 
 	 * @param string  $msg  Email body.
 	 * @param WP_User $user WP_User instance of the new user.
 	 */
-	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
-	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
+	$msg = apply_filters('newuser_notify_siteadmin', $msg, $user);
+	wp_mail($email, sprintf(__('New User Registration: %s'), $user->user_login), $msg);
 	return true;
 }
 
@@ -1298,8 +1298,8 @@ 
  */
 function domain_exists($domain, $path, $site_id = 1) {
 	global $wpdb;
-	$path = trailingslashit( $path );
-	$result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+	$path = trailingslashit($path);
+	$result = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id));
 
 	/**
 	 * Filter whether a blogname is taken.
@@ -1311,7 +1311,7 @@ 
 	 * @param string   $path    Path to be checked.
 	 * @param int      $site_id Site ID. Relevant only on multi-network installs.
 	 */
-	return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+	return apply_filters('domain_exists', $result, $domain, $path, $site_id);
 }
 
 /**
@@ -1335,12 +1335,12 @@ 
 	$path = trailingslashit($path);
 	$site_id = (int) $site_id;
 
-	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
+	$result = $wpdb->insert($wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
+	if ( ! $result)
 		return false;
 
 	$blog_id = $wpdb->insert_id;
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
 	wp_maybe_update_network_site_counts();
 
@@ -1362,46 +1362,46 @@ 
  * @param int    $blog_id    The value returned by insert_blog().
  * @param string $blog_title The title of the new site.
  */
-function install_blog( $blog_id, $blog_title = '' ) {
+function install_blog($blog_id, $blog_title = '') {
 	global $wpdb, $wp_roles;
 
 	// Cast for security
 	$blog_id = (int) $blog_id;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
-	$wpdb->suppress_errors( $suppress );
+	if ($wpdb->get_results("DESCRIBE {$wpdb->posts}"))
+		die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+	$wpdb->suppress_errors($suppress);
 
-	$url = get_blogaddress_by_id( $blog_id );
+	$url = get_blogaddress_by_id($blog_id);
 
 	// Set everything up
-	make_db_current_silent( 'blog' );
+	make_db_current_silent('blog');
 	populate_options();
 	populate_roles();
 
 	// populate_roles() clears previous role definitions so we start over.
 	$wp_roles = new WP_Roles();
 
-	$url = untrailingslashit( $url );
+	$url = untrailingslashit($url);
 
-	update_option( 'siteurl', $url );
-	update_option( 'home', $url );
+	update_option('siteurl', $url);
+	update_option('home', $url);
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	if (get_site_option('ms_files_rewriting'))
+		update_option('upload_path', UPLOADBLOGSDIR."/$blog_id/files");
 	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+		update_option('upload_path', get_blog_option(get_current_site()->blog_id, 'upload_path'));
 
-	update_option( 'blogname', wp_unslash( $blog_title ) );
-	update_option( 'admin_email', '' );
+	update_option('blogname', wp_unslash($blog_title));
+	update_option('admin_email', '');
 
 	// remove all perms
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
-	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
+	delete_metadata('user', 0, $table_prefix.'user_level', null, true); // delete all
+	delete_metadata('user', 0, $table_prefix.'capabilities', null, true); // delete all
 }
 
 /**
@@ -1421,13 +1421,13 @@ 
 function install_blog_defaults($blog_id, $user_id) {
 	global $wpdb;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
 
 	wp_install_defaults($user_id);
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 }
 
 /**
@@ -1447,7 +1447,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
+function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1463,13 +1463,13 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_email' );
-	if ( $welcome_email == false ) {
+	$welcome_email = get_site_option('welcome_email');
+	if ($welcome_email == false) {
 		/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-		$welcome_email = __( 'Howdy USERNAME,
+		$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1486,13 +1486,13 @@ 
 	}
 
 	$url = get_blogaddress_by_id($blog_id);
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('BLOG_TITLE', $title, $welcome_email);
+	$welcome_email = str_replace('BLOG_URL', $url, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
 
 	/**
 	 * Filter the content of the welcome email after site activation.
@@ -1508,17 +1508,17 @@ 
 	 * @param string $title         Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-	$admin_email = get_site_option( 'admin_email' );
+	$welcome_email = apply_filters('update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta);
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1528,8 +1528,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, wp_unslash($title)));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1548,7 +1548,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
+function wpmu_welcome_user_notification($user_id, $password, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1562,12 +1562,12 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_user_email' );
+	$welcome_email = get_site_option('welcome_user_email');
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	/**
 	 * Filter the content of the welcome email after user activation.
@@ -1581,22 +1581,22 @@ 
 	 * @param string $password      User password.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
-	$welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
+	$welcome_email = apply_filters('update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
+	$welcome_email = str_replace('LOGINLINK', wp_login_url(), $welcome_email);
 
-	$admin_email = get_site_option( 'admin_email' );
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1606,8 +1606,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_user_subject', sprintf(__('New %1$s User: %2$s'), $current_site->site_name, $user->user_login));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1643,26 +1643,26 @@ 
  * @param int $user_id
  * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
  */
-function get_most_recent_post_of_user( $user_id ) {
+function get_most_recent_post_of_user($user_id) {
 	global $wpdb;
 
-	$user_blogs = get_blogs_of_user( (int) $user_id );
+	$user_blogs = get_blogs_of_user((int) $user_id);
 	$most_recent_post = array();
 
 	// Walk through each blog and get the most recent post
 	// published by $user_id
-	foreach ( (array) $user_blogs as $blog ) {
-		$prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
-		$recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
+	foreach ((array) $user_blogs as $blog) {
+		$prefix = $wpdb->get_blog_prefix($blog->userblog_id);
+		$recent_post = $wpdb->get_row($wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id), ARRAY_A);
 
 		// Make sure we found a post
-		if ( isset($recent_post['ID']) ) {
+		if (isset($recent_post['ID'])) {
 			$post_gmt_ts = strtotime($recent_post['post_date_gmt']);
 
 			// If this is the first post checked or if this post is
 			// newer than the current recent post, make it the new
 			// most recent post.
-			if ( !isset($most_recent_post['post_gmt_ts']) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
+			if ( ! isset($most_recent_post['post_gmt_ts']) || ($post_gmt_ts > $most_recent_post['post_gmt_ts'])) {
 				$most_recent_post = array(
 					'blog_id'		=> $blog->userblog_id,
 					'post_id'		=> $recent_post['ID'],
@@ -1689,24 +1689,24 @@ 
  * @param string $directory Full path of a directory.
  * @return int Size of the directory in MB.
  */
-function get_dirsize( $directory ) {
-	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+function get_dirsize($directory) {
+	$dirsize = get_transient('dirsize_cache');
+	if (is_array($dirsize) && isset($dirsize[$directory]['size']))
+		return $dirsize[$directory]['size'];
 
-	if ( ! is_array( $dirsize ) )
+	if ( ! is_array($dirsize))
 		$dirsize = array();
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
-	if ( is_main_site() ) {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+	if (is_main_site()) {
+		$dirsize[$directory]['size'] = recurse_dirsize($directory, $directory.'/sites');
 	} else {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+		$dirsize[$directory]['size'] = recurse_dirsize($directory);
 	}
 
-	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-	return $dirsize[ $directory ][ 'size' ];
+	set_transient('dirsize_cache', $dirsize, HOUR_IN_SECONDS);
+	return $dirsize[$directory]['size'];
 }
 
 /**
@@ -1722,23 +1722,23 @@ 
  * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
  * @return int|false Size in MB if a valid directory. False if not.
  */
-function recurse_dirsize( $directory, $exclude = null ) {
+function recurse_dirsize($directory, $exclude = null) {
 	$size = 0;
 
-	$directory = untrailingslashit( $directory );
+	$directory = untrailingslashit($directory);
 
-	if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
+	if ( ! file_exists($directory) || ! is_dir($directory) || ! is_readable($directory) || $directory === $exclude) {
 		return false;
 	}
 
 	if ($handle = opendir($directory)) {
-		while(($file = readdir($handle)) !== false) {
+		while (($file = readdir($handle)) !== false) {
 			$path = $directory.'/'.$file;
 			if ($file != '.' && $file != '..') {
 				if (is_file($path)) {
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
-					$handlesize = recurse_dirsize( $path, $exclude );
+					$handlesize = recurse_dirsize($path, $exclude);
 					if ($handlesize > 0)
 						$size += $handlesize;
 				}
@@ -1763,12 +1763,12 @@ 
  * @param array $mimes
  * @return array
  */
-function check_upload_mimes( $mimes ) {
-	$site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+function check_upload_mimes($mimes) {
+	$site_exts = explode(' ', get_site_option('upload_filetypes', 'jpg jpeg png gif'));
 	$site_mimes = array();
-	foreach ( $site_exts as $ext ) {
-		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
+	foreach ($site_exts as $ext) {
+		foreach ($mimes as $ext_pattern => $mime) {
+			if ($ext != '' && strpos($ext_pattern, $ext) !== false)
 				$site_mimes[$ext_pattern] = $mime;
 		}
 	}
@@ -1787,9 +1787,9 @@ 
  *
  * @global wpdb $wpdb
  */
-function update_posts_count( $deprecated = '' ) {
+function update_posts_count($deprecated = '') {
 	global $wpdb;
-	update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
+	update_option('post_count', (int) $wpdb->get_var("SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'"));
 }
 
 /**
@@ -1802,11 +1802,11 @@ 
  * @param int $blog_id
  * @param int $user_id
  */
-function wpmu_log_new_registrations( $blog_id, $user_id ) {
+function wpmu_log_new_registrations($blog_id, $user_id) {
 	global $wpdb;
-	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	$user = get_userdata((int) $user_id);
+	if ($user)
+		$wpdb->insert($wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace('/[^0-9., ]/', '', wp_unslash($_SERVER['REMOTE_ADDR'])), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')));
 }
 
 /**
@@ -1822,61 +1822,61 @@ 
  * @param int $term_id An ID for a term on the current blog.
  * @return int An ID from the global terms table mapped from $term_id.
  */
-function global_terms( $term_id, $deprecated = '' ) {
+function global_terms($term_id, $deprecated = '') {
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
+	if ( ! global_terms_enabled())
 		return $term_id;
 
 	// prevent a race condition
 	$recurse_start = false;
-	if ( $global_terms_recurse === null ) {
+	if ($global_terms_recurse === null) {
 		$recurse_start = true;
 		$global_terms_recurse = 1;
-	} elseif ( 10 < $global_terms_recurse++ ) {
+	} elseif (10 < $global_terms_recurse++) {
 		return $term_id;
 	}
 
-	$term_id = intval( $term_id );
-	$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
+	$term_id = intval($term_id);
+	$c = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id));
 
-	$global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-	if ( $global_id == null ) {
-		$used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
-		if ( null == $used_global_id ) {
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+	$global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug));
+	if ($global_id == null) {
+		$used_global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id));
+		if (null == $used_global_id) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
+			if (empty($global_id))
 				return $term_id;
 		} else {
-			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
-			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
-			$new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$max_global_id = $wpdb->get_var("SELECT MAX(cat_ID) FROM $wpdb->sitecategories");
+			$max_local_id = $wpdb->get_var("SELECT MAX(term_id) FROM $wpdb->terms");
+			$new_global_id = max($max_global_id, $max_local_id) + mt_rand(100, 400);
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
 		}
-	} elseif ( $global_id != $term_id ) {
-		$local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
-		if ( null != $local_id ) {
-			global_terms( $local_id );
-			if ( 10 < $global_terms_recurse ) {
+	} elseif ($global_id != $term_id) {
+		$local_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id));
+		if (null != $local_id) {
+			global_terms($local_id);
+			if (10 < $global_terms_recurse) {
 				$global_id = $term_id;
 			}
 		}
 	}
 
-	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+	if ($global_id != $term_id) {
+		if (get_option('default_category') == $term_id)
+			update_option('default_category', $global_id);
 
-		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
+		$wpdb->update($wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id));
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
+	if ($recurse_start)
 		$global_terms_recurse = null;
 
 	return $global_id;
@@ -1890,8 +1890,8 @@ 
  *
  * @return array The current site's domain
  */
-function redirect_this_site( $deprecated = '' ) {
-	return array( get_current_site()->domain );
+function redirect_this_site($deprecated = '') {
+	return array(get_current_site()->domain);
 }
 
 /**
@@ -1902,12 +1902,12 @@ 
  * @param array $upload
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
-function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_file_too_big($upload) {
+	if ( ! is_array($upload) || defined('WP_IMPORTING') || get_site_option('upload_space_check_disabled'))
 		return $upload;
 
-	if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+	if (strlen($upload['bits']) > (1024 * get_site_option('fileupload_maxk', 1500)))
+		return sprintf(__('This file is too big. Files must be less than %d KB in size.').'<br />', get_site_option('fileupload_maxk', 1500));
 
 	return $upload;
 }
@@ -1920,7 +1920,7 @@ 
 function signup_nonce_fields() {
 	$id = mt_rand();
 	echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
-	wp_nonce_field('signup_form_' . $id, '_signup_form', false);
+	wp_nonce_field('signup_form_'.$id, '_signup_form', false);
 }
 
 /**
@@ -1931,12 +1931,12 @@ 
  * @param array $result
  * @return array
  */
-function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
+function signup_nonce_check($result) {
+	if ( ! strpos($_SERVER['PHP_SELF'], 'wp-signup.php'))
 		return $result;
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if (wp_create_nonce('signup_form_'.$_POST['signup_form_id']) != $_POST['_signup_form'])
+		wp_die(__('Please try again.'));
 
 	return $result;
 }
@@ -1956,10 +1956,10 @@ 
 	 *
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
-	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
+	if (is_main_site() && is_404() && defined('NOBLOGREDIRECT') && ($destination = apply_filters('blog_redirect_404', NOBLOGREDIRECT))) {
+		if ($destination == '%siteurl%')
 			$destination = network_home_url();
-		wp_redirect( $destination );
+		wp_redirect($destination);
 		exit();
 	}
 }
@@ -1974,23 +1974,23 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+	if (false === strpos($_SERVER['REQUEST_URI'], '/newbloguser/'))
 		return;
 
-	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
-	$key = array_pop( $parts );
+	$parts = explode('/', $_SERVER['REQUEST_URI']);
+	$key = array_pop($parts);
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ($key == '')
+		$key = array_pop($parts);
 
-	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	$details = get_option('new_user_'.$key);
+	if ( ! empty($details))
+		delete_option('new_user_'.$key);
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if (empty($details) || is_wp_error(add_existing_user_to_blog($details)))
+		wp_die(sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url()));
 
-	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+	wp_die(sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url()), __('WordPress &rsaquo; Success'), array('response' => 200));
 }
 
 /**
@@ -2003,11 +2003,11 @@ 
  * @param array $details
  * @return true|WP_Error|void
  */
-function add_existing_user_to_blog( $details = false ) {
+function add_existing_user_to_blog($details = false) {
 	global $blog_id;
 
-	if ( is_array( $details ) ) {
-		$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
+	if (is_array($details)) {
+		$result = add_user_to_blog($blog_id, $details['user_id'], $details['role']);
 		/**
 		 * Fires immediately after an existing user is added to a site.
 		 *
@@ -2016,7 +2016,7 @@ 
 		 * @param int   $user_id User ID.
 		 * @param mixed $result  True on success or a WP_Error object if the user doesn't exist.
 		 */
-		do_action( 'added_existing_user', $details['user_id'], $result );
+		do_action('added_existing_user', $details['user_id'], $result);
 		return $result;
 	}
 }
@@ -2034,13 +2034,13 @@ 
  * @param mixed $password Ignored.
  * @param array $meta
  */
-function add_new_user_to_blog( $user_id, $password, $meta ) {
-	if ( !empty( $meta[ 'add_to_blog' ] ) ) {
-		$blog_id = $meta[ 'add_to_blog' ];
-		$role = $meta[ 'new_role' ];
+function add_new_user_to_blog($user_id, $password, $meta) {
+	if ( ! empty($meta['add_to_blog'])) {
+		$blog_id = $meta['add_to_blog'];
+		$role = $meta['new_role'];
 		remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
-		add_user_to_blog( $blog_id, $user_id, $role );
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+		add_user_to_blog($blog_id, $user_id, $role);
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 	}
 }
 
@@ -2049,7 +2049,7 @@ 
  *
  * @since MU
  */
-function fix_phpmailer_messageid( $phpmailer ) {
+function fix_phpmailer_messageid($phpmailer) {
 	$phpmailer->Hostname = get_current_site()->domain;
 }
 
@@ -2062,16 +2062,16 @@ 
  * 	                           or user login name as a string.
  * @return bool
  */
-function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
-		if ( $user ) {
-			$user = get_user_by( 'login', $user );
+function is_user_spammy($user = null) {
+    if ( ! ($user instanceof WP_User)) {
+		if ($user) {
+			$user = get_user_by('login', $user);
 		} else {
 			$user = wp_get_current_user();
 		}
 	}
 
-	return $user && isset( $user->spam ) && 1 == $user->spam;
+	return $user && isset($user->spam) && 1 == $user->spam;
 }
 
 /**
@@ -2084,8 +2084,8 @@ 
  * @param int $old_value
  * @param int $value     The new public value
  */
-function update_blog_public( $old_value, $value ) {
-	update_blog_status( get_current_blog_id(), 'public', (int) $value );
+function update_blog_public($old_value, $value) {
+	update_blog_status(get_current_blog_id(), 'public', (int) $value);
 }
 
 /**
@@ -2100,16 +2100,16 @@ 
  * @param int    $blog_id Optional. Defaults to current blog.
  * @return bool
  */
-function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
+function is_user_option_local($key, $user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$current_user = wp_get_current_user();
-	if ( $blog_id == 0 ) {
+	if ($blog_id == 0) {
 		$blog_id = $wpdb->blogid;
 	}
-	$local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
+	$local_key = $wpdb->get_blog_prefix($blog_id).$key;
 
-	return isset( $current_user->$local_key );
+	return isset($current_user->$local_key);
 }
 
 /**
@@ -2121,7 +2121,7 @@ 
  */
 function users_can_register_signup_filter() {
 	$registration = get_site_option('registration');
-	return ( $registration == 'all' || $registration == 'user' );
+	return ($registration == 'all' || $registration == 'user');
 }
 
 /**
@@ -2132,12 +2132,12 @@ 
  * @param string $text
  * @return string
  */
-function welcome_user_msg_filter( $text ) {
-	if ( !$text ) {
-		remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+function welcome_user_msg_filter($text) {
+	if ( ! $text) {
+		remove_filter('site_option_welcome_user_email', 'welcome_user_msg_filter');
 
 		/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
-		$text = __( 'Howdy USERNAME,
+		$text = __('Howdy USERNAME,
 
 Your new account is set up.
 
@@ -2149,7 +2149,7 @@ 
 Thanks!
 
 --The Team @ SITE_NAME' );
-		update_site_option( 'welcome_user_email', $text );
+		update_site_option('welcome_user_email', $text);
 	}
 	return $text;
 }
@@ -2164,10 +2164,10 @@ 
  * @param bool $force
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_content( $force = '' ) {
+function force_ssl_content($force = '') {
 	static $forced_content = false;
 
-	if ( '' != $force ) {
+	if ('' != $force) {
 		$old_forced = $forced_content;
 		$forced_content = $force;
 		return $old_forced;
@@ -2186,12 +2186,12 @@ 
  * @param string URL
  * @return string URL with https as the scheme
  */
-function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+function filter_SSL($url) {
+	if ( ! is_string($url))
+		return get_bloginfo('url'); // Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if (force_ssl_content() && is_ssl())
+		$url = set_url_scheme($url, 'https');
 
 	return $url;
 }
@@ -2202,10 +2202,10 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return;
 
-	if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') )
+	if ( ! wp_next_scheduled('update_network_counts') && ! defined('WP_INSTALLING'))
 		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
 }
 
@@ -2228,7 +2228,7 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_site_counts() {
-	$is_small_network = ! wp_is_large_network( 'sites' );
+	$is_small_network = ! wp_is_large_network('sites');
 
 	/**
 	 * Filter whether to update network site or user counts when a new site is created.
@@ -2240,7 +2240,7 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'sites'))
 		return;
 
 	wp_update_network_site_counts();
@@ -2255,10 +2255,10 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_user_counts() {
-	$is_small_network = ! wp_is_large_network( 'users' );
+	$is_small_network = ! wp_is_large_network('users');
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'users'))
 		return;
 
 	wp_update_network_user_counts();
@@ -2274,8 +2274,8 @@ 
 function wp_update_network_site_counts() {
 	global $wpdb;
 
-	$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
-	update_site_option( 'blog_count', $count );
+	$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid));
+	update_site_option('blog_count', $count);
 }
 
 /**
@@ -2288,8 +2288,8 @@ 
 function wp_update_network_user_counts() {
 	global $wpdb;
 
-	$count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-	update_site_option( 'user_count', $count );
+	$count = $wpdb->get_var("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'");
+	update_site_option('user_count', $count);
 }
 
 /**
@@ -2307,10 +2307,10 @@ 
 	 *
 	 * @param int|bool $space_used The amount of used space, in megabytes. Default false.
 	 */
-	$space_used = apply_filters( 'pre_get_space_used', false );
-	if ( false === $space_used ) {
+	$space_used = apply_filters('pre_get_space_used', false);
+	if (false === $space_used) {
 		$upload_dir = wp_upload_dir();
-		$space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
+		$space_used = get_dirsize($upload_dir['basedir']) / 1024 / 1024;
 	}
 
 	return $space_used;
@@ -2324,12 +2324,12 @@ 
  * @return int Quota in megabytes
  */
 function get_space_allowed() {
-	$space_allowed = get_option( 'blog_upload_space' );
+	$space_allowed = get_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric($space_allowed))
+		$space_allowed = get_site_option('blog_upload_space');
 
-	if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
+	if (empty($space_allowed) || ! is_numeric($space_allowed))
 		$space_allowed = 100;
 
 	/**
@@ -2339,7 +2339,7 @@ 
 	 *
 	 * @param int $space_allowed Upload quota in megabytes for the current blog.
 	 */
-	return apply_filters( 'get_space_allowed', $space_allowed );
+	return apply_filters('get_space_allowed', $space_allowed);
 }
 
 /**
@@ -2351,12 +2351,12 @@ 
  */
 function get_upload_space_available() {
 	$space_allowed = get_space_allowed() * 1024 * 1024;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return $space_allowed;
 
 	$space_used = get_space_used() * 1024 * 1024;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
+	if (($space_allowed - $space_used) <= 0)
 		return 0;
 
 	return $space_allowed - $space_used;
@@ -2369,7 +2369,7 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return true;
 
 	return (bool) get_upload_space_available();
@@ -2380,12 +2380,12 @@ 
  *
  * @return int of upload size limit in bytes
  */
-function upload_size_limit_filter( $size ) {
-	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+function upload_size_limit_filter($size) {
+	$fileupload_maxk = 1024 * get_site_option('fileupload_maxk', 1500);
+	if (get_site_option('upload_space_check_disabled'))
+		return min($size, $fileupload_maxk);
 
-	return min( $size, $fileupload_maxk, get_upload_space_available() );
+	return min($size, $fileupload_maxk, get_upload_space_available());
 }
 
 /**
@@ -2398,8 +2398,8 @@ 
  * @param string $using 'sites or 'users'. Default is 'sites'.
  * @return bool True if the network meets the criteria for large. False otherwise.
  */
-function wp_is_large_network( $using = 'sites' ) {
-	if ( 'users' == $using ) {
+function wp_is_large_network($using = 'sites') {
+	if ('users' == $using) {
 		$count = get_user_count();
 		/**
 		 * Filter whether the network is considered large.
@@ -2410,12 +2410,12 @@ 
 		 * @param string $component        The component to count. Accepts 'users', or 'sites'.
 		 * @param int    $count            The count of items for the component.
 		 */
-		return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count );
+		return apply_filters('wp_is_large_network', $count > 10000, 'users', $count);
 	}
 
 	$count = get_blog_count();
 	/** This filter is documented in wp-includes/ms-functions.php */
-	return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count );
+	return apply_filters('wp_is_large_network', $count > 10000, 'sites', $count);
 }
 
 
@@ -2444,10 +2444,10 @@ 
  *               site domain and path, dates registered and modified, and the language ID. Also, boolean
  *               values for whether the site is public, archived, mature, spam, and/or deleted.
  */
-function wp_get_sites( $args = array() ) {
+function wp_get_sites($args = array()) {
 	global $wpdb;
 
-	if ( wp_is_large_network() )
+	if (wp_is_large_network())
 		return array();
 
 	$defaults = array(
@@ -2461,38 +2461,38 @@ 
 		'offset'     => 0,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$query = "SELECT * FROM $wpdb->blogs WHERE 1=1 ";
 
-	if ( isset( $args['network_id'] ) && ( is_array( $args['network_id'] ) || is_numeric( $args['network_id'] ) ) ) {
-		$network_ids = implode( ',', wp_parse_id_list( $args['network_id'] ) );
+	if (isset($args['network_id']) && (is_array($args['network_id']) || is_numeric($args['network_id']))) {
+		$network_ids = implode(',', wp_parse_id_list($args['network_id']));
 		$query .= "AND site_id IN ($network_ids) ";
 	}
 
-	if ( isset( $args['public'] ) )
-		$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	if (isset($args['public']))
+		$query .= $wpdb->prepare("AND public = %d ", $args['public']);
 
-	if ( isset( $args['archived'] ) )
-		$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	if (isset($args['archived']))
+		$query .= $wpdb->prepare("AND archived = %d ", $args['archived']);
 
-	if ( isset( $args['mature'] ) )
-		$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	if (isset($args['mature']))
+		$query .= $wpdb->prepare("AND mature = %d ", $args['mature']);
 
-	if ( isset( $args['spam'] ) )
-		$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	if (isset($args['spam']))
+		$query .= $wpdb->prepare("AND spam = %d ", $args['spam']);
 
-	if ( isset( $args['deleted'] ) )
-		$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	if (isset($args['deleted']))
+		$query .= $wpdb->prepare("AND deleted = %d ", $args['deleted']);
 
-	if ( isset( $args['limit'] ) && $args['limit'] ) {
-		if ( isset( $args['offset'] ) && $args['offset'] )
-			$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
+	if (isset($args['limit']) && $args['limit']) {
+		if (isset($args['offset']) && $args['offset'])
+			$query .= $wpdb->prepare("LIMIT %d , %d ", $args['offset'], $args['limit']);
 		else
-			$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+			$query .= $wpdb->prepare("LIMIT %d ", $args['limit']);
 	}
 
-	$site_results = $wpdb->get_results( $query, ARRAY_A );
+	$site_results = $wpdb->get_results($query, ARRAY_A);
 
 	return $site_results;
 }

Braces +338 added lines, -231 removed lines

@@ -37,13 +37,15 @@ 
 function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
 	global $wpdb;
 
-	if ( ! $sitedomain )
-		$site_id = $wpdb->siteid;
-	else
-		$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+	if ( ! $sitedomain ) {
+			$site_id = $wpdb->siteid;
+	} else {
+			$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+	}
 
-	if ( $site_id )
-		return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	if ( $site_id ) {
+			return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	}
 
 	return false;
 }
@@ -67,11 +69,13 @@ 
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
-		return;
+	if ( empty( $blogs ) ) {
+			return;
+	}
 
-	if ( !is_multisite() )
-		return $blogs[$wpdb->blogid];
+	if ( !is_multisite() ) {
+			return $blogs[$wpdb->blogid];
+	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	$first_blog = current($blogs);
@@ -94,15 +98,18 @@ 
 		$ret = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
-					continue;
+				if ( $blog->site_id != $wpdb->siteid ) {
+									continue;
+				}
 				$details = get_blog_details( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+											update_user_meta( $user_id, 'primary_blog', $blog_id );
+					}
+					if ( !get_user_meta($user_id , 'source_domain', true) ) {
+											update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -139,8 +146,9 @@ 
  * @return int
  */
 function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( func_num_args() ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
 	return get_site_option( 'blog_count' );
 }
@@ -249,8 +257,9 @@ 
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
-				continue;
+			if ( $blog->userblog_id == $blog_id ) {
+							continue;
+			}
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
@@ -308,19 +317,22 @@ 
  * @return string|int The ID of the newly created blog
  */
 function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	}
 
 	// Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
 	// Need to get blog_id from wp_blogs, and create new table names.
 	// Must restore table names at the end of function.
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id);
@@ -369,10 +381,12 @@ 
 	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) {
+		// blog does not exist
 		return 0;
-	elseif ( $id )
-		return (int) $id;
+	} elseif ( $id ) {
+			return (int) $id;
+	}
 
 	$id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
 
@@ -403,8 +417,9 @@ 
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+	if ( $banned_names && ! is_array( $banned_names ) ) {
+			$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
@@ -415,8 +430,9 @@ 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
-				continue;
+			if ( ! $banned_domain ) {
+							continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -477,36 +493,43 @@ 
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
 		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
 		add_site_option( 'illegal_names', $illegal_names );
 	}
-	if ( in_array( $user_name, $illegal_names ) )
-		$errors->add('user_name',  __( 'That username is not allowed.' ) );
+	if ( in_array( $user_name, $illegal_names ) ) {
+			$errors->add('user_name',  __( 'That username is not allowed.' ) );
+	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if ( is_email_address_unsafe( $user_email ) ) {
+			$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+			$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
-	if ( strpos( $user_name, '_' ) !== false )
-		$errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) );
+	if ( strpos( $user_name, '_' ) !== false ) {
+			$errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+			$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	}
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( !is_email( $user_email ) ) {
+			$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
@@ -517,12 +540,14 @@ 
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if ( username_exists($user_name) ) {
+			$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if ( email_exists($user_email) ) {
+			$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -531,20 +556,22 @@ 
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		} else {
+					$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		}
 	}
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		} else {
+					$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		}
 	}
 
 	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
@@ -626,28 +653,35 @@ 
 		);
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+			$errors->add('blogname', __( 'Please enter a site name.' ) );
+	}
 
-	if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
-		$errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
+	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
+			$errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
+	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+			$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	}
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if ( strlen( $blogname ) < 4 && !is_super_admin() ) {
+			$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	}
 
-	if ( strpos( $blogname, '_' ) !== false )
-		$errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
+	if ( strpos( $blogname, '_' ) !== false ) {
+			$errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
+	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+			$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+			$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	}
 
 	/**
 	 * Filter the new site name during registration.
@@ -663,8 +697,9 @@ 
 
 	$blog_title = wp_unslash(  $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+			$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
@@ -674,12 +709,14 @@ 
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($mydomain, $path, $current_site->id) ) {
+			$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) {
+					$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
@@ -687,10 +724,11 @@ 
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		} else {
+					$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		}
 	}
 
 	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
@@ -828,15 +866,18 @@ 
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
-		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	if ( !is_subdomain_install() || get_current_site()->id != 1 ) {
+			$activate_url = network_site_url("wp-activate.php?key=$key");
+	} else {
+			$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+	}
+	// @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -923,13 +964,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) ) {
+			return false;
+	}
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -996,14 +1039,16 @@ 
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if ( empty( $signup ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	}
 
 	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		if ( empty( $signup->domain ) ) {
+					return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+					return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
 	}
 
 	$meta = maybe_unserialize($signup->meta);
@@ -1011,21 +1056,24 @@ 
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
-		$user_already_exists = true;
+	if ( ! $user_id ) {
+			$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
+	} else {
+			$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+			return new WP_Error('create_user', __('Could not create user'), $signup);
+	}
 
 	$now = current_time('mysql', true);
 
 	if ( empty($signup->domain) ) {
 		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+					return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		}
 
 		wpmu_welcome_user_notification( $user_id, $password, $meta );
 		/**
@@ -1091,8 +1139,9 @@ 
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
-		return false;
+	if ( is_wp_error( $user_id ) ) {
+			return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1138,24 +1187,29 @@ 
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if ( is_subdomain_install() ) {
+			$domain = str_replace( '@', '', $domain );
+	}
 
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
-	if ( !defined('WP_INSTALLING') )
-		define( 'WP_INSTALLING', true );
+	if ( !defined('WP_INSTALLING') ) {
+			define( 'WP_INSTALLING', true );
+	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return new WP_Error('insert_blog', __('Could not create site.'));
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id, $title);
@@ -1164,17 +1218,19 @@ 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
-		else
-			update_option( $key, $value );
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
+					update_blog_status( $blog_id, $key, $value );
+		} else {
+					update_option( $key, $value );
+		}
 	}
 
 	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1206,12 +1262,14 @@ 
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
@@ -1251,13 +1309,15 @@ 
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1336,8 +1396,9 @@ 
 	$site_id = (int) $site_id;
 
 	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	refresh_blog_details( $blog_id );
@@ -1371,8 +1432,9 @@ 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
+			die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1390,10 +1452,11 @@ 
 	update_option( 'siteurl', $url );
 	update_option( 'home', $url );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
+			update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	} else {
+			update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
@@ -1463,8 +1526,9 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_email' );
 	if ( $welcome_email == false ) {
@@ -1511,15 +1575,17 @@ 
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filter the subject of the welcome email after site activation.
@@ -1562,8 +1628,9 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1589,15 +1656,17 @@ 
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filter the subject of the welcome email after user activation.
@@ -1691,11 +1760,13 @@ 
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
+			return $dirsize[ $directory ][ 'size' ];
+	}
 
-	if ( ! is_array( $dirsize ) )
-		$dirsize = array();
+	if ( ! is_array( $dirsize ) ) {
+			$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
@@ -1739,8 +1810,9 @@ 
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
-						$size += $handlesize;
+					if ($handlesize > 0) {
+											$size += $handlesize;
+					}
 				}
 			}
 		}
@@ -1768,8 +1840,9 @@ 
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+							$site_mimes[$ext_pattern] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1805,9 +1878,10 @@ 
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
+	if ( $user ) {
+			$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	}
+	}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
@@ -1826,8 +1900,9 @@ 
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
-		return $term_id;
+	if ( !global_terms_enabled() ) {
+			return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
@@ -1847,8 +1922,9 @@ 
 		if ( null == $used_global_id ) {
 			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
-				return $term_id;
+			if ( empty( $global_id ) ) {
+							return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
 			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
@@ -1867,8 +1943,9 @@ 
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+		if ( get_option( 'default_category' ) == $term_id ) {
+					update_option( 'default_category', $global_id );
+		}
 
 		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
 		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
@@ -1876,8 +1953,9 @@ 
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
-		$global_terms_recurse = null;
+	if ( $recurse_start ) {
+			$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -1903,11 +1981,13 @@ 
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return $upload;
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return $upload;
+	}
 
-	if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+	if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+			return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+	}
 
 	return $upload;
 }
@@ -1932,11 +2012,13 @@ 
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
-		return $result;
+	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) ) {
+			return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] ) {
+			wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -1957,8 +2039,9 @@ 
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
-			$destination = network_home_url();
+		if ( $destination == '%siteurl%' ) {
+					$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -1974,21 +2057,25 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
-		return;
+	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+			return;
+	}
 
 	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
 	$key = array_pop( $parts );
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ( $key == '' ) {
+			$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	if ( !empty( $details ) ) {
+			delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+			wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	}
 
 	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
@@ -2187,11 +2274,14 @@ 
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	if ( ! is_string( $url ) ) {
+			return get_bloginfo( 'url' );
+	}
+	// Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if ( force_ssl_content() && is_ssl() ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2202,12 +2292,14 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
-		return;
+	if ( !is_main_site() ) {
+			return;
+	}
 
-	if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
-}
+	if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') ) {
+			wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	}
+	}
 
 /**
  *  Update the network-wide counts for the current network.
@@ -2240,8 +2332,9 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
+			return;
+	}
 
 	wp_update_network_site_counts();
 }
@@ -2258,8 +2351,9 @@ 
 	$is_small_network = ! wp_is_large_network( 'users' );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
+			return;
+	}
 
 	wp_update_network_user_counts();
 }
@@ -2326,11 +2420,13 @@ 
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
-		$space_allowed = 100;
+	if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) ) {
+			$space_allowed = 100;
+	}
 
 	/**
 	 * Filter the upload quota for the current site.
@@ -2351,13 +2447,15 @@ 
  */
 function get_upload_space_available() {
 	$space_allowed = get_space_allowed() * 1024 * 1024;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $space_allowed;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $space_allowed;
+	}
 
 	$space_used = get_space_used() * 1024 * 1024;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
-		return 0;
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
+			return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2369,8 +2467,9 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2382,8 +2481,9 @@ 
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
@@ -2447,8 +2547,9 @@ 
 function wp_get_sites( $args = array() ) {
 	global $wpdb;
 
-	if ( wp_is_large_network() )
-		return array();
+	if ( wp_is_large_network() ) {
+			return array();
+	}
 
 	$defaults = array(
 		'network_id' => $wpdb->siteid,
@@ -2470,26 +2571,32 @@ 
 		$query .= "AND site_id IN ($network_ids) ";
 	}
 
-	if ( isset( $args['public'] ) )
-		$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	if ( isset( $args['public'] ) ) {
+			$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	}
 
-	if ( isset( $args['archived'] ) )
-		$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	if ( isset( $args['archived'] ) ) {
+			$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	}
 
-	if ( isset( $args['mature'] ) )
-		$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	if ( isset( $args['mature'] ) ) {
+			$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	}
 
-	if ( isset( $args['spam'] ) )
-		$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	if ( isset( $args['spam'] ) ) {
+			$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	}
 
-	if ( isset( $args['deleted'] ) )
-		$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	if ( isset( $args['deleted'] ) ) {
+			$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	}
 
 	if ( isset( $args['limit'] ) && $args['limit'] ) {
-		if ( isset( $args['offset'] ) && $args['offset'] )
-			$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
-		else
-			$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+		if ( isset( $args['offset'] ) && $args['offset'] ) {
+					$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
+		} else {
+					$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+		}
 	}
 
 	$site_results = $wpdb->get_results( $query, ARRAY_A );

src/wp-includes/ms-load.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
  *
  * @since 3.0.0
  *
- * @return true|string Returns true on success, or drop-in file to include.
+ * @return boolean|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
 	$blog = get_blog_details();

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * These functions are needed to load Multisite.
- *
- * @since 3.0.0
- *
- * @package WordPress
- * @subpackage Multisite
- */
+	 * These functions are needed to load Multisite.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 */
 
 /**
  * Whether a subdomain configuration is enabled.
@@ -76,7 +76,7 @@ 
 	 * @since 3.0.0
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
-	*/
+	 */
 	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check )
 		return true;

Spacing +119 added lines, -119 removed lines

@@ -16,10 +16,10 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
+	if (defined('SUBDOMAIN_INSTALL'))
 		return SUBDOMAIN_INSTALL;
 
-	return ( defined( 'VHOST' ) && VHOST == 'yes' );
+	return (defined('VHOST') && VHOST == 'yes');
 }
 
 /**
@@ -34,20 +34,20 @@ 
  * @return array Files to include.
  */
 function wp_get_active_network_plugins() {
-	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
+	$active_plugins = (array) get_site_option('active_sitewide_plugins', array());
+	if (empty($active_plugins))
 		return array();
 
 	$plugins = array();
-	$active_plugins = array_keys( $active_plugins );
-	sort( $active_plugins );
+	$active_plugins = array_keys($active_plugins);
+	sort($active_plugins);
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -77,33 +77,33 @@ 
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
-	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
+	$check = apply_filters('ms_site_check', null);
+	if (null !== $check)
 		return true;
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
+	if (is_super_admin())
 		return true;
 
-	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
+	if ('1' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-deleted.php'))
+			return WP_CONTENT_DIR.'/blog-deleted.php';
 		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site is no longer available.'), '', array('response' => 410));
 	}
 
-	if ( '2' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
-			return WP_CONTENT_DIR . '/blog-inactive.php';
+	if ('2' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-inactive.php'))
+			return WP_CONTENT_DIR.'/blog-inactive.php';
 		else
-			wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
+			wp_die(sprintf(__('This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.'), str_replace('@', ' AT ', get_site_option('admin_email', 'support@'.get_current_site()->domain))));
 	}
 
-	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
+	if ($blog->archived == '1' || $blog->spam == '1') {
+		if (file_exists(WP_CONTENT_DIR.'/blog-suspended.php'))
+			return WP_CONTENT_DIR.'/blog-suspended.php';
 		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site has been archived or suspended.'), '', array('response' => 410));
 	}
 
 	return true;
@@ -121,19 +121,19 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return object|false Network object if successful. False when no network is found.
  */
-function get_network_by_path( $domain, $path, $segments = null ) {
+function get_network_by_path($domain, $path, $segments = null) {
 	global $wpdb;
 
-	$domains = array( $domain );
-	$pieces = explode( '.', $domain );
+	$domains = array($domain);
+	$pieces = explode('.', $domain);
 
 	/*
 	 * It's possible one domain to search is 'com', but it might as well
 	 * be 'localhost' or some other locally mapped domain.
 	 */
-	while ( array_shift( $pieces ) ) {
-		if ( $pieces ) {
-			$domains[] = implode( '.', $pieces );
+	while (array_shift($pieces)) {
+		if ($pieces) {
+			$domains[] = implode('.', $pieces);
 		}
 	}
 
@@ -147,17 +147,17 @@ 
 	 * depending on the setup, so this is best done per-install.
 	 */
 	$using_paths = true;
-	if ( wp_using_ext_object_cache() ) {
-		$using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
-		if ( false === $using_paths ) {
-			$using_paths = (bool) $wpdb->get_var( "SELECT id FROM $wpdb->site WHERE path <> '/' LIMIT 1" );
-			wp_cache_add( 'networks_have_paths', (int) $using_paths, 'site-options'  );
+	if (wp_using_ext_object_cache()) {
+		$using_paths = wp_cache_get('networks_have_paths', 'site-options');
+		if (false === $using_paths) {
+			$using_paths = (bool) $wpdb->get_var("SELECT id FROM $wpdb->site WHERE path <> '/' LIMIT 1");
+			wp_cache_add('networks_have_paths', (int) $using_paths, 'site-options');
 		}
 	}
 
 	$paths = array();
-	if ( $using_paths ) {
-		$path_segments = array_filter( explode( '/', trim( $path, "/" ) ) );
+	if ($using_paths) {
+		$path_segments = array_filter(explode('/', trim($path, "/")));
 
 		/**
 		 * Filter the number of path segments to consider when searching for a site.
@@ -170,15 +170,15 @@ 
 		 * @param string   $domain   The requested domain.
 		 * @param string   $path     The requested path, in full.
 		 */
-		$segments = apply_filters( 'network_by_path_segments_count', $segments, $domain, $path );
+		$segments = apply_filters('network_by_path_segments_count', $segments, $domain, $path);
 
-		if ( null !== $segments && count($path_segments ) > $segments ) {
-			$path_segments = array_slice( $path_segments, 0, $segments );
+		if (null !== $segments && count($path_segments) > $segments) {
+			$path_segments = array_slice($path_segments, 0, $segments);
 		}
 
-		while ( count( $path_segments ) ) {
-			$paths[] = '/' . implode( '/', $path_segments ) . '/';
-			array_pop( $path_segments );
+		while (count($path_segments)) {
+			$paths[] = '/'.implode('/', $path_segments).'/';
+			array_pop($path_segments);
 		}
 
 		$paths[] = '/';
@@ -203,29 +203,29 @@ 
 	 *                                   Default null, meaning the entire path was to be consulted.
 	 * @param array            $paths    The paths to search for, based on $path and $segments.
 	 */
-	$pre = apply_filters( 'pre_get_network_by_path', null, $domain, $path, $segments, $paths );
-	if ( null !== $pre ) {
+	$pre = apply_filters('pre_get_network_by_path', null, $domain, $path, $segments, $paths);
+	if (null !== $pre) {
 		return $pre;
 	}
 
 	// @todo Consider additional optimization routes, perhaps as an opt-in for plugins.
 	// We already have paths covered. What about how far domains should be drilled down (including www)?
 
-	$search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+	$search_domains = "'".implode("', '", $wpdb->_escape($domains))."'";
 
-	if ( ! $using_paths ) {
-		$network = $wpdb->get_row( "SELECT id, domain, path FROM $wpdb->site
-			WHERE domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1" );
-		if ( $network ) {
-			return wp_get_network( $network );
+	if ( ! $using_paths) {
+		$network = $wpdb->get_row("SELECT id, domain, path FROM $wpdb->site
+			WHERE domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1");
+		if ($network) {
+			return wp_get_network($network);
 		}
 		return false;
 
 	} else {
-		$search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-		$networks = $wpdb->get_results( "SELECT id, domain, path FROM $wpdb->site
+		$search_paths = "'".implode("', '", $wpdb->_escape($paths))."'";
+		$networks = $wpdb->get_results("SELECT id, domain, path FROM $wpdb->site
 			WHERE domain IN ($search_domains) AND path IN ($search_paths)
-			ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC" );
+			ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC");
 	}
 
 	/*
@@ -234,21 +234,21 @@ 
 	 * a network with the path of / will suffice.
 	 */
 	$found = false;
-	foreach ( $networks as $network ) {
-		if ( $network->domain === $domain || "www.$network->domain" === $domain ) {
-			if ( in_array( $network->path, $paths, true ) ) {
+	foreach ($networks as $network) {
+		if ($network->domain === $domain || "www.$network->domain" === $domain) {
+			if (in_array($network->path, $paths, true)) {
 				$found = true;
 				break;
 			}
 		}
-		if ( $network->path === '/' ) {
+		if ($network->path === '/') {
 			$found = true;
 			break;
 		}
 	}
 
-	if ( $found ) {
-		return wp_get_network( $network );
+	if ($found) {
+		return wp_get_network($network);
 	}
 
 	return false;
@@ -264,12 +264,12 @@ 
  * @param object|int $network The network's database row or ID.
  * @return object|false Object containing network information if found, false if not.
  */
-function wp_get_network( $network ) {
+function wp_get_network($network) {
 	global $wpdb;
 
-	if ( ! is_object( $network ) ) {
-		$network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $network ) );
-		if ( ! $network ) {
+	if ( ! is_object($network)) {
+		$network = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->site WHERE id = %d", $network));
+		if ( ! $network) {
 			return false;
 		}
 	}
@@ -289,10 +289,10 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return object|false Site object if successful. False when no site is found.
  */
-function get_site_by_path( $domain, $path, $segments = null ) {
+function get_site_by_path($domain, $path, $segments = null) {
 	global $wpdb;
 
-	$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+	$path_segments = array_filter(explode('/', trim($path, '/')));
 
 	/**
 	 * Filter the number of path segments to consider when searching for a site.
@@ -305,17 +305,17 @@ 
 	 * @param string   $domain   The requested domain.
 	 * @param string   $path     The requested path, in full.
 	 */
-	$segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path );
+	$segments = apply_filters('site_by_path_segments_count', $segments, $domain, $path);
 
-	if ( null !== $segments && count( $path_segments ) > $segments ) {
-		$path_segments = array_slice( $path_segments, 0, $segments );
+	if (null !== $segments && count($path_segments) > $segments) {
+		$path_segments = array_slice($path_segments, 0, $segments);
 	}
 
 	$paths = array();
 
-	while ( count( $path_segments ) ) {
-		$paths[] = '/' . implode( '/', $path_segments ) . '/';
-		array_pop( $path_segments );
+	while (count($path_segments)) {
+		$paths[] = '/'.implode('/', $path_segments).'/';
+		array_pop($path_segments);
 	}
 
 	$paths[] = '/';
@@ -339,8 +339,8 @@ 
 	 *                                   Default null, meaning the entire path was to be consulted.
 	 * @param array            $paths    The paths to search for, based on $path and $segments.
 	 */
-	$pre = apply_filters( 'pre_get_site_by_path', null, $domain, $path, $segments, $paths );
-	if ( null !== $pre ) {
+	$pre = apply_filters('pre_get_site_by_path', null, $domain, $path, $segments, $paths);
+	if (null !== $pre) {
 		return $pre;
 	}
 
@@ -355,31 +355,31 @@ 
 
 	// Either www or non-www is supported, not both. If a www domain is requested,
 	// query for both to provide the proper redirect.
-	$domains = array( $domain );
-	if ( 'www.' === substr( $domain, 0, 4 ) ) {
-		$domains[] = substr( $domain, 4 );
-		$search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+	$domains = array($domain);
+	if ('www.' === substr($domain, 0, 4)) {
+		$domains[] = substr($domain, 4);
+		$search_domains = "'".implode("', '", $wpdb->_escape($domains))."'";
 	}
 
-	if ( count( $paths ) > 1 ) {
-		$search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
+	if (count($paths) > 1) {
+		$search_paths = "'".implode("', '", $wpdb->_escape($paths))."'";
 	}
 
-	if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
-		$site = $wpdb->get_row( "SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1" );
-	} elseif ( count( $domains ) > 1 ) {
-		$sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0] );
+	if (count($domains) > 1 && count($paths) > 1) {
+		$site = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1");
+	} elseif (count($domains) > 1) {
+		$sql = $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0]);
 		$sql .= " AND domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1";
-		$site = $wpdb->get_row( $sql );
-	} elseif ( count( $paths ) > 1 ) {
-		$sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0] );
+		$site = $wpdb->get_row($sql);
+	} elseif (count($paths) > 1) {
+		$sql = $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0]);
 		$sql .= " AND path IN ($search_paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";
-		$site = $wpdb->get_row( $sql );
+		$site = $wpdb->get_row($sql);
 	} else {
-		$site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0] ) );
+		$site = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0]));
 	}
 
-	if ( $site ) {
+	if ($site) {
 		// @todo get_blog_details()
 		return $site;
 	}
@@ -402,44 +402,44 @@ 
 function ms_not_installed() {
 	global $wpdb, $domain, $path;
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		dead_db();
 	}
 
 	wp_load_translations_early();
 
-	$title = __( 'Error establishing a database connection' );
+	$title = __('Error establishing a database connection');
 
-	$msg  = '<h1>' . $title . '</h1>';
-	$msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
-	$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
-	if ( ! $wpdb->get_var( $query ) ) {
-		$msg .= '<p>' . sprintf(
+	$msg  = '<h1>'.$title.'</h1>';
+	$msg .= '<p>'.__('If your site does not display, please contact the owner of this network.').'';
+	$msg .= ' '.__('If you are the owner of this network please check that MySQL is running properly and all tables are error free.').'</p>';
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->site));
+	if ( ! $wpdb->get_var($query)) {
+		$msg .= '<p>'.sprintf(
 			/* translators: %s: table name */
-			__( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
-			'<code>' . $wpdb->site . '</code>'
-		) . '</p>';
+			__('<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.'),
+			'<code>'.$wpdb->site.'</code>'
+		).'</p>';
 	} else {
-		$msg .= '<p>' . sprintf(
+		$msg .= '<p>'.sprintf(
 			/* translators: 1: site url, 2: table name, 3: database name */
-			__( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
-			'<code>' . rtrim( $domain . $path, '/' ) . '</code>',
-			'<code>' . $wpdb->blogs . '</code>',
-			'<code>' . DB_NAME . '</code>'
-		) . '</p>';
+			__('<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?'),
+			'<code>'.rtrim($domain.$path, '/').'</code>',
+			'<code>'.$wpdb->blogs.'</code>',
+			'<code>'.DB_NAME.'</code>'
+		).'</p>';
 	}
-	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
-	$msg .= __( 'Read the <a target="_blank" href="https://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' );
-	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
-	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
+	$msg .= '<p><strong>'.__('What do I do now?').'</strong> ';
+	$msg .= __('Read the <a target="_blank" href="https://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.');
+	$msg .= ' '.__('If you&#8217;re still stuck with this message, then check that your database contains the following tables:').'</p><ul>';
+	foreach ($wpdb->tables('global') as $t => $table) {
+		if ('sitecategories' == $t)
 			continue;
-		$msg .= '<li>' . $table . '</li>';
+		$msg .= '<li>'.$table.'</li>';
 	}
 	$msg .= '</ul>';
 
-	wp_die( $msg, $title, array( 'response' => 500 ) );
+	wp_die($msg, $title, array('response' => 500));
 }
 
 /**
@@ -455,8 +455,8 @@ 
  * @param object $current_site
  * @return object
  */
-function get_current_site_name( $current_site ) {
-	_deprecated_function( __FUNCTION__, '3.9', 'get_current_site()' );
+function get_current_site_name($current_site) {
+	_deprecated_function(__FUNCTION__, '3.9', 'get_current_site()');
 	return $current_site;
 }
 
@@ -476,6 +476,6 @@ 
  */
 function wpmu_current_site() {
 	global $current_site;
-	_deprecated_function( __FUNCTION__, '3.9' );
+	_deprecated_function(__FUNCTION__, '3.9');
 	return $current_site;
 }

Braces +33 added lines, -24 removed lines

@@ -16,8 +16,9 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
-		return SUBDOMAIN_INSTALL;
+	if ( defined('SUBDOMAIN_INSTALL') ) {
+			return SUBDOMAIN_INSTALL;
+	}
 
 	return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
@@ -35,8 +36,9 @@ 
  */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
-		return array();
+	if ( empty( $active_plugins ) ) {
+			return array();
+	}
 
 	$plugins = array();
 	$active_plugins = array_keys( $active_plugins );
@@ -46,8 +48,9 @@ 
 		if ( ! validate_file( $plugin ) // $plugin must validate as file
 			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -78,32 +81,37 @@ 
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
 	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
-		return true;
+	if ( null !== $check ) {
+			return true;
+	}
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
-		return true;
+	if ( is_super_admin() ) {
+			return true;
+	}
 
 	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
-		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-deleted.php';
+		} else {
+					wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	if ( '2' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
-			return WP_CONTENT_DIR . '/blog-inactive.php';
-		else
-			wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-inactive.php';
+		} else {
+					wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
+		}
 	}
 
 	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
-		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-suspended.php';
+		} else {
+					wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	return true;
@@ -433,8 +441,9 @@ 
 	$msg .= __( 'Read the <a target="_blank" href="https://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' );
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
-			continue;
+		if ( 'sitecategories' == $t ) {
+					continue;
+		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';

src/wp-includes/pluggable.php

Doc Comments +5 added lines, -5 removed lines

@@ -1078,7 +1078,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
@@ -1118,7 +1118,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.
@@ -1546,7 +1546,7 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $comment_id Comment ID
- * @return true Always returns true
+ * @return boolean Always returns true
  */
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
@@ -1772,7 +1772,7 @@ 
  * @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.
+ * @param integer $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
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
@@ -1822,7 +1822,7 @@ 
  *
  * @since 2.0.3
  *
- * @param string|int $action Scalar value to add context to the nonce.
+ * @param integer $action Scalar value to add context to the nonce.
  * @return string The token.
  */
 function wp_create_nonce($action = -1) {

Indentation +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;

Spacing +506 added lines, -506 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.
  *
@@ -26,25 +26,25 @@ 
 function wp_set_current_user($id, $name = '') {
 	global $current_user;
 
-	if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) )
+	if (isset($current_user) && ($current_user instanceof WP_User) && ($id == $current_user->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.
  *
@@ -63,7 +63,7 @@ 
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
+if ( ! function_exists('get_currentuserinfo')) :
 /**
  * Populate global variables with information about the currently logged in user.
  *
@@ -80,26 +80,26 @@ 
 function get_currentuserinfo() {
 	global $current_user;
 
-	if ( ! empty( $current_user ) ) {
-		if ( $current_user instanceof WP_User )
+	if ( ! empty($current_user)) {
+		if ($current_user instanceof WP_User)
 			return;
 
 		// Upgrade stdClass to WP_User
-		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+		if (is_object($current_user) && isset($current_user->ID)) {
 			$cur_id = $current_user->ID;
 			$current_user = null;
-			wp_set_current_user( $cur_id );
+			wp_set_current_user($cur_id);
 			return;
 		}
 
 		// $current_user has a junk value. Force to WP_User with ID 0.
 		$current_user = null;
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 		return false;
 	}
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-		wp_set_current_user( 0 );
+	if (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
+		wp_set_current_user(0);
 		return false;
 	}
 
@@ -116,17 +116,17 @@ 
 	 *
 	 * @param int|bool $user_id User ID if one has been determined, false otherwise.
 	 */
-	$user_id = apply_filters( 'determine_current_user', false );
-	if ( ! $user_id ) {
-		wp_set_current_user( 0 );
+	$user_id = apply_filters('determine_current_user', false);
+	if ( ! $user_id) {
+		wp_set_current_user(0);
 		return false;
 	}
 
-	wp_set_current_user( $user_id );
+	wp_set_current_user($user_id);
 }
 endif;
 
-if ( !function_exists('get_userdata') ) :
+if ( ! function_exists('get_userdata')) :
 /**
  * Retrieve user info by user ID.
  *
@@ -135,12 +135,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
  *
@@ -150,20 +150,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()
  *
@@ -173,28 +173,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
  *
@@ -225,7 +225,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
 
 	/**
@@ -236,48 +236,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;
 		}
@@ -286,69 +286,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;
 				}
 			}
@@ -363,7 +363,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
@@ -373,14 +373,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;
 	}
 
 	/**
@@ -390,7 +390,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.
@@ -399,24 +399,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;
 		}
 	}
@@ -426,37 +426,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;
 			}
 		}
@@ -467,7 +467,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';
 
 	/**
@@ -477,17 +477,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
 
@@ -498,23 +498,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;
 			}
 		}
@@ -527,18 +527,18 @@ 
 	 *
 	 * @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) {
 		return false;
 	}
 }
 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.
  *
@@ -564,9 +564,9 @@ 
 	 * @param string       $username User login.
 	 * @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 or incorrect password.'));
@@ -574,7 +574,7 @@ 
 
 	$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.
 		 *
@@ -582,14 +582,14 @@ 
 		 *
 		 * @param string $username User login.
 		 */
-		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.
  *
@@ -604,11 +604,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.
  *
@@ -627,7 +627,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.
 		 *
@@ -637,7 +637,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;
 	}
 
@@ -648,12 +648,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.
 		 *
@@ -661,12 +661,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.
 		 *
@@ -674,19 +674,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.
 		 *
@@ -694,18 +694,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;
 	}
 
@@ -717,13 +717,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.
  *
@@ -735,26 +735,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.
@@ -767,11 +767,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
  *
@@ -782,8 +782,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;
@@ -794,7 +794,7 @@ 
 				$cookie_name = LOGGED_IN_COOKIE;
 				break;
 			default:
-				if ( is_ssl() ) {
+				if (is_ssl()) {
 					$cookie_name = SECURE_AUTH_COOKIE;
 					$scheme = 'secure_auth';
 				} else {
@@ -803,23 +803,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')) :
 /**
  * Sets the authentication cookies based on user ID.
  *
@@ -836,8 +836,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.
 		 *
@@ -847,25 +847,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();
 	}
 
 	// Frontend 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.
@@ -875,7 +875,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.
@@ -886,9 +886,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 {
@@ -896,13 +896,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.
@@ -916,7 +916,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.
@@ -930,17 +930,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.
  *
@@ -952,30 +952,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.
  *
@@ -990,7 +990,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.
  *
@@ -999,7 +999,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.
@@ -1008,20 +1008,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 {
 		/**
@@ -1031,10 +1031,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.
 		 *
@@ -1042,26 +1042,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);
 
@@ -1070,7 +1070,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.
  *
@@ -1084,9 +1084,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());
@@ -1101,10 +1101,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();
 	}
 
@@ -1112,7 +1112,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.
  *
@@ -1127,23 +1127,23 @@ 
  * @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);
 
-	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');
 	}
 
 	/**
@@ -1155,13 +1155,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);
 
 	return $result;
 }
 endif;
 
-if ( !function_exists('wp_redirect') ) :
+if ( ! function_exists('wp_redirect')) :
 /**
  * Redirects to another page.
  *
@@ -1184,7 +1184,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.
@@ -1194,14 +1194,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);
@@ -1210,7 +1210,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_sanitize_redirect') ) :
+if ( ! function_exists('wp_sanitize_redirect')) :
 /**
  * Sanitizes a URL for use in a redirect.
  *
@@ -1231,13 +1231,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);
 }
 
 /**
@@ -1249,12 +1249,12 @@ 
  *
  * @see wp_sanitize_redirect()
  */
-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().
  *
@@ -1281,13 +1281,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.
  *
@@ -1304,26 +1304,26 @@ 
  * @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;
 
-	$lp  = parse_url($test);
+	$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 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());
@@ -1336,16 +1336,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.
  *
@@ -1355,21 +1355,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 ) )
+	$comment = get_comment($comment_id);
+	if (empty($comment))
 		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;
 	}
 
@@ -1384,16 +1384,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_id );
-	$emails = array_filter( $emails );
+	$emails = apply_filters('comment_notification_recipients', $emails, $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.
@@ -1407,28 +1407,28 @@ 
 	 *                         Default false.
 	 * @param int  $comment_id The comment ID.
 	 */
-	$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id );
+	$notify_author = apply_filters('comment_notification_notify_author', false, $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);
@@ -1437,67 +1437,67 @@ 
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-	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->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->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->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->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( __( 'E-mail: %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->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(__('E-mail: %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->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_ID)."#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";
+	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";
 		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 ) {
+	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.
@@ -1507,7 +1507,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_id );
+	$notify_message = apply_filters('comment_notification_text', $notify_message, $comment_id);
 
 	/**
 	 * Filter the comment notification email subject.
@@ -1517,7 +1517,7 @@ 
 	 * @param string $subject    The comment notification email subject.
 	 * @param int    $comment_id Comment ID.
 	 */
-	$subject = apply_filters( 'comment_notification_subject', $subject, $comment_id );
+	$subject = apply_filters('comment_notification_subject', $subject, $comment_id);
 
 	/**
 	 * Filter the comment notification email headers.
@@ -1527,17 +1527,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_id );
+	$message_headers = apply_filters('comment_notification_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_notify_moderator') ) :
+if ( ! function_exists('wp_notify_moderator')) :
 /**
  * Notifies the moderator of the blog about a new comment that is awaiting approval.
  *
@@ -1551,16 +1551,16 @@ 
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
 
-	if ( 0 == get_option( 'moderation_notify' ) )
+	if (0 == get_option('moderation_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;
 	}
 
@@ -1571,45 +1571,45 @@ 
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-	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->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->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->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->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( __( 'Comment: %s' ), "\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(__('Comment: %s'), "\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";
-	if ( EMPTY_TRASH_DAYS )
-		$notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&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";
 	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 = '';
 
 	/**
@@ -1620,7 +1620,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.
@@ -1630,7 +1630,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.
@@ -1640,7 +1640,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.
@@ -1650,17 +1650,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.
  *
@@ -1671,8 +1671,8 @@ 
 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);
@@ -1681,7 +1681,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
+if ( ! function_exists('wp_new_user_notification')) :
 /**
  * Email login credentials to a newly-registered user.
  *
@@ -1695,49 +1695,49 @@ 
  *                        string (admin only), or 'both' (admin and user). The empty string value was kept
  *                        for backward-compatibility purposes with the renamed parameter. Default empty.
  */
-function wp_new_user_notification( $user_id, $notify = '' ) {
+function wp_new_user_notification($user_id, $notify = '') {
 	global $wpdb;
-	$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(__('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);
 
-	if ( 'admin' === $notify || empty( $notify ) ) {
+	if ('admin' === $notify || 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.
  *
@@ -1756,13 +1756,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.
  *
@@ -1776,11 +1776,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.
 		 *
@@ -1789,10 +1789,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;
 	}
 
@@ -1800,14 +1800,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;
 	}
 
@@ -1816,7 +1816,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.
  *
@@ -1828,19 +1828,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.
  *
@@ -1876,9 +1876,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.
 		 *
@@ -1888,19 +1888,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]);
 			}
 		}
 	}
@@ -1909,45 +1909,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.
  *
@@ -1963,7 +1963,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_hash_password') ) :
+if ( ! function_exists('wp_hash_password')) :
 /**
  * Create a hash (encrypt) of a plain text password.
  *
@@ -1980,17 +1980,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.
  *
@@ -2016,9 +2016,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);
@@ -2034,13 +2034,13 @@ 
 		 * @param string $hash     The hashed password.
 		 * @param int    $user_id  User ID.
 		 */
-		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);
 	}
@@ -2048,11 +2048,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.
  *
@@ -2065,15 +2065,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);
 	}
 
@@ -2084,11 +2084,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
  *
@@ -2101,22 +2101,22 @@ 
  * @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;
 
 	// 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);
 		}
 	}
 
@@ -2132,14 +2132,14 @@ 
 	$max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
 
 	// 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.
  *
@@ -2157,17 +2157,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.
  *
@@ -2202,15 +2202,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,
@@ -2218,7 +2218,7 @@ 
 		'extra_attr'    => '',
 	);
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		$args = array();
 	}
 
@@ -2226,12 +2226,12 @@ 
 	$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'];
 	}
 
@@ -2247,36 +2247,36 @@ 
 	 * @param int|object|string $id_or_email A user ID, email address, or 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'];
 		}
@@ -2284,10 +2284,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']
@@ -2306,11 +2306,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.
  *
@@ -2338,12 +2338,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' ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	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);
@@ -2351,31 +2351,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 +131 added lines, -91 removed lines

@@ -26,8 +26,9 @@ 
 function wp_set_current_user($id, $name = '') {
 	global $current_user;
 
-	if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) )
-		return $current_user;
+	if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) ) {
+			return $current_user;
+	}
 
 	$current_user = new WP_User( $id, $name );
 
@@ -81,8 +82,9 @@ 
 	global $current_user;
 
 	if ( ! empty( $current_user ) ) {
-		if ( $current_user instanceof WP_User )
-			return;
+		if ( $current_user instanceof WP_User ) {
+					return;
+		}
 
 		// Upgrade stdClass to WP_User
 		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
@@ -153,8 +155,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 );
@@ -178,8 +181,9 @@ 
 
 	$clean = _get_non_cached_ids( $user_ids, 'users' );
 
-	if ( empty( $clean ) )
-		return;
+	if ( empty( $clean ) ) {
+			return;
+	}
 
 	$list = implode( ',', $clean );
 
@@ -363,8 +367,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
@@ -402,8 +407,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 {
@@ -467,8 +473,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.
@@ -482,12 +489,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
 
@@ -506,8 +515,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 ) ) {
@@ -803,8 +813,9 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
+		if ( empty($_COOKIE[$cookie_name]) ) {
+					return false;
+		}
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
@@ -935,9 +946,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') ) :
@@ -1085,8 +1097,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());
@@ -1130,20 +1143,22 @@ 
 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 );
 
 	if ( $die && false === $result ) {
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-			wp_die( -1 );
-		else
-			die( '-1' );
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+					wp_die( -1 );
+		} else {
+					die( '-1' );
+		}
 	}
 
 	/**
@@ -1196,13 +1211,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);
 
@@ -1306,8 +1324,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;
@@ -1315,16 +1334,19 @@ 
 	$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 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']) )
-		return $default;
+	if ( isset($lp['scheme'])  && !isset($lp['host']) ) {
+			return $default;
+	}
 
 	$wpp = parse_url(home_url());
 
@@ -1338,8 +1360,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;
 }
@@ -1361,8 +1384,9 @@ 
 	}
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) )
-		return false;
+	if ( empty( $comment ) ) {
+			return false;
+	}
 
 	$post    = get_post( $comment->comment_post_ID );
 	$author  = get_userdata( $post->post_author );
@@ -1474,10 +1498,11 @@ 
 	$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";
-		else
-			$notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&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";
+		} 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";
 	}
 
@@ -1485,19 +1510,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.
@@ -1551,8 +1579,9 @@ 
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
 
-	if ( 0 == get_option( 'moderation_notify' ) )
-		return true;
+	if ( 0 == get_option( 'moderation_notify' ) ) {
+			return true;
+	}
 
 	$comment = get_comment($comment_id);
 	$post = get_post($comment->comment_post_ID);
@@ -1560,8 +1589,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 +1629,11 @@ 
 	}
 
 	$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";
-	else
-		$notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&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";
+	} 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( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
@@ -2067,10 +2098,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++ ) {
@@ -2107,10 +2140,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);
@@ -2132,8 +2166,9 @@ 
 	$max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
 
 	// 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));
 }
@@ -2342,8 +2377,9 @@ 
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	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);
@@ -2354,8 +2390,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";
 
@@ -2365,18 +2402,21 @@ 
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "<thead>";
-	if ( $args['title'] )
-		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "<thead>";
+	}
+	if ( $args['title'] ) {
+			$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	}
 	if ( $args['title_left'] || $args['title_right'] ) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "</thead>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "</thead>\n";
+	}
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";
 	$r .= "</table>";

src/wp-includes/plugin.php

Doc Comments +4 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
  *                                  and functions with the same priority are executed
  *                                  in the order in which they were added to the action.
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
- * @return true
+ * @return boolean
  */
 function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
 	global $wp_filter, $merged_filters;
@@ -171,7 +171,6 @@ 
  *
  * @param string $tag   The name of the filter hook.
  * @param mixed  $value The value on which the filters hooked to `$tag` are applied on.
- * @param mixed  $var   Additional variables passed to the functions hooked to `$tag`.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters( $tag, $value ) {
@@ -325,7 +324,7 @@ 
  *
  * @param string   $tag      The filter to remove hooks from.
  * @param int|bool $priority Optional. The priority number to remove. Default false.
- * @return true True when finished.
+ * @return boolean True when finished.
  */
 function remove_all_filters( $tag, $priority = false ) {
 	global $wp_filter, $merged_filters;
@@ -430,7 +429,7 @@ 
  *                                  and functions with the same priority are executed
  *                                  in the order in which they were added to the action.
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
- * @return true Will always return true.
+ * @return boolean Will always return true.
  */
 function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	return add_filter($tag, $function_to_add, $priority, $accepted_args);
@@ -628,7 +627,7 @@ 
  *
  * @param string   $tag      The action to remove hooks from.
  * @param int|bool $priority The priority number to remove them from. Default false.
- * @return true True when finished.
+ * @return boolean True when finished.
  */
 function remove_all_actions($tag, $priority = false) {
 	return remove_all_filters($tag, $priority);

Spacing +132 added lines, -132 removed lines

@@ -22,16 +22,16 @@ 
 // Initialize the filter globals.
 global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-if ( ! isset( $wp_filter ) )
+if ( ! isset($wp_filter))
 	$wp_filter = array();
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset($wp_actions))
 	$wp_actions = array();
 
-if ( ! isset( $merged_filters ) )
+if ( ! isset($merged_filters))
 	$merged_filters = array();
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset($wp_current_filter))
 	$wp_current_filter = array();
 
 /**
@@ -78,12 +78,12 @@ 
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
  * @return true
  */
-function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	global $wp_filter, $merged_filters;
 
 	$idx = _wp_filter_build_unique_id($tag, $function_to_add, $priority);
 	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 	return true;
 }
 
@@ -107,31 +107,31 @@ 
 	// Don't reset the internal array pointer
 	$wp_filter = $GLOBALS['wp_filter'];
 
-	$has = ! empty( $wp_filter[ $tag ] );
+	$has = ! empty($wp_filter[$tag]);
 
 	// Make sure at least one priority has a filter callback
-	if ( $has ) {
+	if ($has) {
 		$exists = false;
-		foreach ( $wp_filter[ $tag ] as $callbacks ) {
-			if ( ! empty( $callbacks ) ) {
+		foreach ($wp_filter[$tag] as $callbacks) {
+			if ( ! empty($callbacks)) {
 				$exists = true;
 				break;
 			}
 		}
 
-		if ( ! $exists ) {
+		if ( ! $exists) {
 			$has = false;
 		}
 	}
 
-	if ( false === $function_to_check || false === $has )
+	if (false === $function_to_check || false === $has)
 		return $has;
 
-	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) )
+	if ( ! $idx = _wp_filter_build_unique_id($tag, $function_to_check, false))
 		return false;
 
-	foreach ( (array) array_keys($wp_filter[$tag]) as $priority ) {
-		if ( isset($wp_filter[$tag][$priority][$idx]) )
+	foreach ((array) array_keys($wp_filter[$tag]) as $priority) {
+		if (isset($wp_filter[$tag][$priority][$idx]))
 			return $priority;
 	}
 
@@ -174,48 +174,48 @@ 
  * @param mixed  $var   Additional variables passed to the functions hooked to `$tag`.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
-function apply_filters( $tag, $value ) {
+function apply_filters($tag, $value) {
 	global $wp_filter, $merged_filters, $wp_current_filter;
 
 	$args = array();
 
 	// Do 'all' actions first.
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$args = func_get_args();
 		_wp_call_all_hook($args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort.
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
-	if ( empty($args) )
+	if (empty($args))
 		$args = func_get_args();
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) ){
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function'])) {
 				$args[1] = $value;
 				$value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
 			}
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $value;
 }
@@ -240,37 +240,37 @@ 
 	global $wp_filter, $merged_filters, $wp_current_filter;
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $args[0];
 }
@@ -296,20 +296,20 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool    Whether the function existed before it was removed.
  */
-function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
-	$function_to_remove = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority );
+function remove_filter($tag, $function_to_remove, $priority = 10) {
+	$function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
 
-	$r = isset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
+	$r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
 
-	if ( true === $r ) {
-		unset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
-		if ( empty( $GLOBALS['wp_filter'][ $tag ][ $priority ] ) ) {
-			unset( $GLOBALS['wp_filter'][ $tag ][ $priority ] );
+	if (true === $r) {
+		unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
+		if (empty($GLOBALS['wp_filter'][$tag][$priority])) {
+			unset($GLOBALS['wp_filter'][$tag][$priority]);
 		}
-		if ( empty( $GLOBALS['wp_filter'][ $tag ] ) ) {
-			$GLOBALS['wp_filter'][ $tag ] = array();
+		if (empty($GLOBALS['wp_filter'][$tag])) {
+			$GLOBALS['wp_filter'][$tag] = array();
 		}
-		unset( $GLOBALS['merged_filters'][ $tag ] );
+		unset($GLOBALS['merged_filters'][$tag]);
 	}
 
 	return $r;
@@ -327,18 +327,18 @@ 
  * @param int|bool $priority Optional. The priority number to remove. Default false.
  * @return true True when finished.
  */
-function remove_all_filters( $tag, $priority = false ) {
+function remove_all_filters($tag, $priority = false) {
 	global $wp_filter, $merged_filters;
 
-	if ( isset( $wp_filter[ $tag ]) ) {
-		if ( false === $priority ) {
-			$wp_filter[ $tag ] = array();
-		} elseif ( isset( $wp_filter[ $tag ][ $priority ] ) ) {
-			$wp_filter[ $tag ][ $priority ] = array();
+	if (isset($wp_filter[$tag])) {
+		if (false === $priority) {
+			$wp_filter[$tag] = array();
+		} elseif (isset($wp_filter[$tag][$priority])) {
+			$wp_filter[$tag][$priority] = array();
 		}
 	}
 
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 
 	return true;
 }
@@ -354,7 +354,7 @@ 
  */
 function current_filter() {
 	global $wp_current_filter;
-	return end( $wp_current_filter );
+	return end($wp_current_filter);
 }
 
 /**
@@ -389,14 +389,14 @@ 
  *                            checks if any filter is currently being run.
  * @return bool Whether the filter is currently in the stack.
  */
-function doing_filter( $filter = null ) {
+function doing_filter($filter = null) {
 	global $wp_current_filter;
 
-	if ( null === $filter ) {
-		return ! empty( $wp_current_filter );
+	if (null === $filter) {
+		return ! empty($wp_current_filter);
 	}
 
-	return in_array( $filter, $wp_current_filter );
+	return in_array($filter, $wp_current_filter);
 }
 
 /**
@@ -408,8 +408,8 @@ 
  *                            if any action is currently being run.
  * @return bool Whether the action is currently in the stack.
  */
-function doing_action( $action = null ) {
-	return doing_filter( $action );
+function doing_action($action = null) {
+	return doing_filter($action);
 }
 
 /**
@@ -460,49 +460,49 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
-		$args[] =& $arg[0];
+	if (is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0])) // array(&$this)
+		$args[] = & $arg[0];
 	else
 		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
+	for ($a = 2, $num = func_num_args(); $a < $num; $a++)
 		$args[] = func_get_arg($a);
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
 	array_pop($wp_current_filter);
 }
@@ -520,7 +520,7 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
+	if ( ! isset($wp_actions[$tag]))
 		return 0;
 
 	return $wp_actions[$tag];
@@ -544,41 +544,41 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
 	array_pop($wp_current_filter);
 }
@@ -617,8 +617,8 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool Whether the function is removed.
  */
-function remove_action( $tag, $function_to_remove, $priority = 10 ) {
-	return remove_filter( $tag, $function_to_remove, $priority );
+function remove_action($tag, $function_to_remove, $priority = 10) {
+	return remove_filter($tag, $function_to_remove, $priority);
 }
 
 /**
@@ -650,20 +650,20 @@ 
  * @param string $file The filename of plugin.
  * @return string The name of a plugin.
  */
-function plugin_basename( $file ) {
+function plugin_basename($file) {
 	global $wp_plugin_paths;
 
-	foreach ( $wp_plugin_paths as $dir => $realdir ) {
-		if ( strpos( $file, $realdir ) === 0 ) {
-			$file = $dir . substr( $file, strlen( $realdir ) );
+	foreach ($wp_plugin_paths as $dir => $realdir) {
+		if (strpos($file, $realdir) === 0) {
+			$file = $dir.substr($file, strlen($realdir));
 		}
 	}
 
-	$file = wp_normalize_path( $file );
-	$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$file = wp_normalize_path($file);
+	$plugin_dir = wp_normalize_path(WP_PLUGIN_DIR);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	$file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
+	$file = preg_replace('#^'.preg_quote($plugin_dir, '#').'/|^'.preg_quote($mu_plugin_dir, '#').'/#', '', $file); // get relative path from plugins dir
 	$file = trim($file, '/');
 	return $file;
 }
@@ -685,25 +685,25 @@ 
  * @param string $file Known path to the file.
  * @return bool Whether the path was able to be registered.
  */
-function wp_register_plugin_realpath( $file ) {
+function wp_register_plugin_realpath($file) {
 	global $wp_plugin_paths;
 
 	// Normalize, but store as static to avoid recalculation of a constant value
 	static $wp_plugin_path = null, $wpmu_plugin_path = null;
-	if ( ! isset( $wp_plugin_path ) ) {
-		$wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR   );
-		$wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR );
+	if ( ! isset($wp_plugin_path)) {
+		$wp_plugin_path   = wp_normalize_path(WP_PLUGIN_DIR);
+		$wpmu_plugin_path = wp_normalize_path(WPMU_PLUGIN_DIR);
 	}
 
-	$plugin_path = wp_normalize_path( dirname( $file ) );
-	$plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+	$plugin_path = wp_normalize_path(dirname($file));
+	$plugin_realpath = wp_normalize_path(dirname(realpath($file)));
 
-	if ( $plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path ) {
+	if ($plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path) {
 		return false;
 	}
 
-	if ( $plugin_path !== $plugin_realpath ) {
-		$wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
+	if ($plugin_path !== $plugin_realpath) {
+		$wp_plugin_paths[$plugin_path] = $plugin_realpath;
 	}
 
 	return true;
@@ -717,8 +717,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the filesystem path of the directory that contains the plugin.
  */
-function plugin_dir_path( $file ) {
-	return trailingslashit( dirname( $file ) );
+function plugin_dir_path($file) {
+	return trailingslashit(dirname($file));
 }
 
 /**
@@ -729,8 +729,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the URL path of the directory that contains the plugin.
  */
-function plugin_dir_url( $file ) {
-	return trailingslashit( plugins_url( '', $file ) );
+function plugin_dir_url($file) {
+	return trailingslashit(plugins_url('', $file));
 }
 
 /**
@@ -753,7 +753,7 @@ 
  */
 function register_activation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('activate_' . $file, $function);
+	add_action('activate_'.$file, $function);
 }
 
 /**
@@ -776,7 +776,7 @@ 
  */
 function register_deactivation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('deactivate_' . $file, $function);
+	add_action('deactivate_'.$file, $function);
 }
 
 /**
@@ -805,9 +805,9 @@ 
  * @param callback $callback The callback to run when the hook is called. Must be
  *                           a static method or function.
  */
-function register_uninstall_hook( $file, $callback ) {
-	if ( is_array( $callback ) && is_object( $callback[0] ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Only a static class method or function can be used in an uninstall hook.' ), '3.1' );
+function register_uninstall_hook($file, $callback) {
+	if (is_array($callback) && is_object($callback[0])) {
+		_doing_it_wrong(__FUNCTION__, __('Only a static class method or function can be used in an uninstall hook.'), '3.1');
 		return;
 	}
 
@@ -843,13 +843,13 @@ 
 function _wp_call_all_hook($args) {
 	global $wp_filter;
 
-	reset( $wp_filter['all'] );
+	reset($wp_filter['all']);
 	do {
-		foreach( (array) current($wp_filter['all']) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter['all']) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], $args);
 
-	} while ( next($wp_filter['all']) !== false );
+	} while (next($wp_filter['all']) !== false);
 }
 
 /**
@@ -890,26 +890,26 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
+	if (is_object($function[0])) {
 		// Object Class Calling
-		if ( function_exists('spl_object_hash') ) {
-			return spl_object_hash($function[0]) . $function[1];
+		if (function_exists('spl_object_hash')) {
+			return spl_object_hash($function[0]).$function[1];
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
-			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
+			if ( ! isset($function[0]->wp_filter_id)) {
+				if (false === $priority)
 					return false;
-				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
+				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array) $wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;
 			} else {
@@ -918,8 +918,8 @@ 
 
 			return $obj_idx;
 		}
-	} elseif ( is_string( $function[0] ) ) {
+	} elseif (is_string($function[0])) {
 		// Static Calling
-		return $function[0] . '::' . $function[1];
+		return $function[0].'::'.$function[1];
 	}
 }

Braces +86 added lines, -57 removed lines

@@ -22,17 +22,21 @@ 
 // Initialize the filter globals.
 global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-if ( ! isset( $wp_filter ) )
+if ( ! isset( $wp_filter ) ) {
 	$wp_filter = array();
+}
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset( $wp_actions ) ) {
 	$wp_actions = array();
+}
 
-if ( ! isset( $merged_filters ) )
+if ( ! isset( $merged_filters ) ) {
 	$merged_filters = array();
+}
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset( $wp_current_filter ) ) {
 	$wp_current_filter = array();
+}
 
 /**
  * Hook a function or method to a specific filter action.
@@ -124,15 +128,18 @@ 
 		}
 	}
 
-	if ( false === $function_to_check || false === $has )
-		return $has;
+	if ( false === $function_to_check || false === $has ) {
+			return $has;
+	}
 
-	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) )
-		return false;
+	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) ) {
+			return false;
+	}
 
 	foreach ( (array) array_keys($wp_filter[$tag]) as $priority ) {
-		if ( isset($wp_filter[$tag][$priority][$idx]) )
-			return $priority;
+		if ( isset($wp_filter[$tag][$priority][$idx]) ) {
+					return $priority;
+		}
 	}
 
 	return false;
@@ -187,13 +194,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort.
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -203,13 +212,15 @@ 
 
 	reset( $wp_filter[ $tag ] );
 
-	if ( empty($args) )
-		$args = func_get_args();
+	if ( empty($args) ) {
+			$args = func_get_args();
+	}
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) ){
+		foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) ){
 				$args[1] = $value;
+		}
 				$value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
 			}
 
@@ -247,13 +258,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -264,9 +277,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -460,10 +474,11 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -473,21 +488,26 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
+	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) {
+		// array(&$this)
 		$args[] =& $arg[0];
-	else
-		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
-		$args[] = func_get_arg($a);
+	} else {
+			$args[] = $arg;
+	}
+	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) {
+			$args[] = func_get_arg($a);
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -498,9 +518,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -520,8 +541,9 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
-		return 0;
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
+			return 0;
+	}
 
 	return $wp_actions[$tag];
 }
@@ -544,10 +566,11 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -557,13 +580,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -574,9 +599,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -845,9 +871,10 @@ 
 
 	reset( $wp_filter['all'] );
 	do {
-		foreach( (array) current($wp_filter['all']) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach( (array) current($wp_filter['all']) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], $args);
+		}
 
 	} while ( next($wp_filter['all']) !== false );
 }
@@ -890,8 +917,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -907,8 +935,9 @@ 
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
 			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
-					return false;
+				if ( false === $priority ) {
+									return false;
+				}
 				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;

src/wp-includes/pomo/mo.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Class for working with MO files
- *
- * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
- * @package pomo
- * @subpackage mo
- */
+	 * Class for working with MO files
+	 *
+	 * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
+	 * @package pomo
+	 * @subpackage mo
+	 */
 
 require_once dirname(__FILE__) . '/translations.php';
 require_once dirname(__FILE__) . '/streams.php';

Spacing +40 added lines, -40 removed lines

@@ -7,10 +7,10 @@ 
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once dirname(__FILE__).'/translations.php';
+require_once dirname(__FILE__).'/streams.php';
 
-if ( !class_exists( 'MO' ) ):
+if ( ! class_exists('MO')):
 class MO extends Gettext_Translations {
 
 	var $_nplurals = 2;
@@ -22,7 +22,7 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
+		if ( ! $reader->is_resource())
 			return false;
 		return $this->import_from_reader($reader);
 	}
@@ -33,8 +33,8 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
-		$res = $this->export_to_file_handle( $fh );
+		if ( ! $fh) return false;
+		$res = $this->export_to_file_handle($fh);
 		fclose($fh);
 		return $res;
 	}
@@ -44,22 +44,22 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
-		$this->export_to_file_handle( $tmp_fh );
-		rewind( $tmp_fh );
-		return stream_get_contents( $tmp_fh );
+		if ( ! $tmp_fh) return false;
+		$this->export_to_file_handle($tmp_fh);
+		rewind($tmp_fh);
+		return stream_get_contents($tmp_fh);
 	}
 
 	/**
 	 * @param Translation_Entry $entry
 	 * @return bool
 	 */
-	function is_entry_good_for_export( $entry ) {
-		if ( empty( $entry->translations ) ) {
+	function is_entry_good_for_export($entry) {
+		if (empty($entry->translations)) {
 			return false;
 		}
 
-		if ( !array_filter( $entry->translations ) ) {
+		if ( ! array_filter($entry->translations)) {
 			return false;
 		}
 
@@ -71,7 +71,7 @@ 
 	 * @return true
 	 */
 	function export_to_file_handle($fh) {
-		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
+		$entries = array_filter($this->entries, array($this, 'is_entry_good_for_export'));
 		ksort($entries);
 		$magic = 0x950412de;
 		$revision = 0;
@@ -92,8 +92,8 @@ 
 
 		$reader = new POMO_Reader();
 
-		foreach($entries as $entry) {
-			$originals_table .= $this->export_original($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$originals_table .= $this->export_original($entry).chr(0);
 			$length = $reader->strlen($this->export_original($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1; // account for the NULL byte after
@@ -102,10 +102,10 @@ 
 		$exported_headers = $this->export_headers();
 		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
 		$current_addr += strlen($exported_headers) + 1;
-		$translations_table = $exported_headers . chr(0);
+		$translations_table = $exported_headers.chr(0);
 
-		foreach($entries as $entry) {
-			$translations_table .= $this->export_translations($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$translations_table .= $this->export_translations($entry).chr(0);
 			$length = $reader->strlen($this->export_translations($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1;
@@ -124,7 +124,7 @@ 
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
 		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
+		if ( ! is_null($entry->context)) $exported = $entry->context.chr(4).$exported;
 		return $exported;
 	}
 
@@ -142,8 +142,8 @@ 
 	 */
 	function export_headers() {
 		$exported = '';
-		foreach($this->headers as $header => $value) {
-			$exported.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$exported .= "$header: $value\n";
 		}
 		return $exported;
 	}
@@ -156,10 +156,10 @@ 
 		// The magic is 0x950412de
 
 		// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
-		$magic_little = (int) - 1794895138;
+		$magic_little = (int) -1794895138;
 		$magic_little_64 = (int) 2500072158;
 		// 0xde120495
-		$magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+		$magic_big = ((int) -569244523) & 0xFFFFFFFF;
 		if ($magic_little == $magic || $magic_little_64 == $magic) {
 			return 'little';
 		} else if ($magic_big == $magic) {
@@ -179,7 +179,7 @@ 
 		}
 		$reader->setEndian($endian_string);
 
-		$endian = ('big' == $endian_string)? 'N' : 'V';
+		$endian = ('big' == $endian_string) ? 'N' : 'V';
 
 		$header = $reader->read(24);
 		if ($reader->strlen($header) != 24)
@@ -187,42 +187,42 @@ 
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
+		if ( ! is_array($header))
 			return false;
 
 		// support revision 0 of MO format specs, only
-		if ( $header['revision'] != 0 ) {
+		if ($header['revision'] != 0) {
 			return false;
 		}
 
 		// seek to data blocks
-		$reader->seekto( $header['originals_lenghts_addr'] );
+		$reader->seekto($header['originals_lenghts_addr']);
 
 		// read originals' indices
 		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-		if ( $originals_lengths_length != $header['total'] * 8 ) {
+		if ($originals_lengths_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+		if ($reader->strlen($originals) != $originals_lengths_length) {
 			return false;
 		}
 
 		// read translations' indices
 		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-		if ( $translations_lenghts_length != $header['total'] * 8 ) {
+		if ($translations_lenghts_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+		if ($reader->strlen($translations) != $translations_lenghts_length) {
 			return false;
 		}
 
 		// transform raw data into set of indices
-		$originals    = $reader->str_split( $originals, 8 );
-		$translations = $reader->str_split( $translations, 8 );
+		$originals    = $reader->str_split($originals, 8);
+		$translations = $reader->str_split($translations, 8);
 
 		// skip hash table
 		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
@@ -232,17 +232,17 @@ 
 		$strings = $reader->read_all();
 		$reader->close();
 
-		for ( $i = 0; $i < $header['total']; $i++ ) {
-			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
-			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+		for ($i = 0; $i < $header['total']; $i++) {
+			$o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+			$t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+			if ( ! $o || ! $t) return false;
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;
 			$t['pos'] -= $strings_addr;
 
-			$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
-			$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
+			$original    = $reader->substr($strings, $o['pos'], $o['length']);
+			$translation = $reader->substr($strings, $t['pos'], $t['length']);
 
 			if ('' === $original) {
 				$this->set_headers($this->make_headers($translation));

Braces +24 added lines, -11 removed lines

@@ -22,8 +22,9 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
-			return false;
+		if (!$reader->is_resource()) {
+					return false;
+		}
 		return $this->import_from_reader($reader);
 	}
 
@@ -33,7 +34,9 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
+		if ( !$fh ) {
+			return false;
+		}
 		$res = $this->export_to_file_handle( $fh );
 		fclose($fh);
 		return $res;
@@ -44,7 +47,9 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
+		if ( !$tmp_fh ) {
+			return false;
+		}
 		$this->export_to_file_handle( $tmp_fh );
 		rewind( $tmp_fh );
 		return stream_get_contents( $tmp_fh );
@@ -123,8 +128,12 @@ 
 	function export_original($entry) {
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
-		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->is_plural) {
+			$exported .= chr(0).$entry->plural;
+		}
+		if (!is_null($entry->context)) {
+			$exported = $entry->context . chr(4) . $exported;
+		}
 		return $exported;
 	}
 
@@ -182,13 +191,15 @@ 
 		$endian = ('big' == $endian_string)? 'N' : 'V';
 
 		$header = $reader->read(24);
-		if ($reader->strlen($header) != 24)
-			return false;
+		if ($reader->strlen($header) != 24) {
+					return false;
+		}
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
-			return false;
+		if (!is_array($header)) {
+					return false;
+		}
 
 		// support revision 0 of MO format specs, only
 		if ( $header['revision'] != 0 ) {
@@ -235,7 +246,9 @@ 
 		for ( $i = 0; $i < $header['total']; $i++ ) {
 			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
 			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+			if ( !$o || !$t ) {
+				return false;
+			}
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;

src/wp-includes/pomo/po.php

Doc Comments +4 added lines, -2 removed lines

@@ -85,6 +85,7 @@ 
 	 * Text to include as a comment before the start of the PO contents
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
+	 * @param string $text
 	 */
 	function set_comment_before_headers( $text ) {
 		$this->comments_before_headers = $text;
@@ -190,6 +191,7 @@ 
 	 *
 	 * @static
 	 * @param Translation_Entry &$entry the entry to convert to po string
+	 * @param Translation_Entry $entry
 	 * @return false|string PO-style formatted string for the entry or
 	 * 	false if the entry is empty
 	 */
@@ -358,7 +360,7 @@ 
 	 * 
 	 * @param     resource $f
 	 * @param     string   $action
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	function read_line($f, $action = 'read') {
 		static $last_line = '';
@@ -398,7 +400,7 @@ 
 
 	/**
 	 * @param string $s
-	 * @return sring
+	 * @return string
 	 */
 	function trim_quotes($s) {
 		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);

Spacing +32 added lines, -32 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage po
  */
 
-require_once dirname(__FILE__) . '/translations.php';
+require_once dirname(__FILE__).'/translations.php';
 
 define('PO_MAX_LINE_LEN', 79);
 
@@ -16,7 +16,7 @@ 
 /**
  * Routines for working with PO files
  */
-if ( !class_exists( 'PO' ) ):
+if ( ! class_exists('PO')):
 class PO extends Gettext_Translations {
 
 	var $comments_before_headers = '';
@@ -28,8 +28,8 @@ 
 	 */
 	function export_headers() {
 		$header_string = '';
-		foreach($this->headers as $header => $value) {
-			$header_string.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$header_string .= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
 		if ($this->comments_before_headers)
@@ -86,7 +86,7 @@ 
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
 	 */
-	function set_comment_before_headers( $text ) {
+	function set_comment_before_headers($text) {
 		$this->comments_before_headers = $text;
 	}
 
@@ -113,7 +113,7 @@ 
 		$po = $quote.implode("${slash}n$quote$newline$quote", explode($newline, $string)).$quote;
 		// add empty string on first line for readbility
 		if (false !== strpos($string, $newline) &&
-				(substr_count($string, $newline) > 1 || !($newline === substr($string, -strlen($newline))))) {
+				(substr_count($string, $newline) > 1 || ! ($newline === substr($string, -strlen($newline))))) {
 			$po = "$quote$quote$newline$po";
 		}
 		// remove empty strings
@@ -134,18 +134,18 @@ 
 		$lines = array_map(array('PO', 'trim_quotes'), $lines);
 		$unpoified = '';
 		$previous_is_backslash = false;
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			preg_match_all('/./u', $line, $chars);
 			$chars = $chars[0];
-			foreach($chars as $char) {
-				if (!$previous_is_backslash) {
+			foreach ($chars as $char) {
+				if ( ! $previous_is_backslash) {
 					if ('\\' == $char)
 						$previous_is_backslash = true;
 					else
 						$unpoified .= $char;
 				} else {
 					$previous_is_backslash = false;
-					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
+					$unpoified .= isset($escapes[$char]) ? $escapes[$char] : $char;
 				}
 			}
 		}
@@ -180,7 +180,7 @@ 
 	 * @param string $char character to denote a special PO comment,
 	 * 	like :, default is a space
 	 */
-	function comment_block($text, $char=' ') {
+	function comment_block($text, $char = ' ') {
 		$text = wordwrap($text, PO_MAX_LINE_LEN - 3);
 		return PO::prepend_each_line($text, "#$char ");
 	}
@@ -196,19 +196,19 @@ 
 	function export_entry(&$entry) {
 		if (is_null($entry->singular)) return false;
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
+		if ( ! empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
+		if ( ! empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
+		if ( ! empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		if ( ! empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		if ( ! is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
 		$po[] = 'msgid '.PO::poify($entry->singular);
-		if (!$entry->is_plural) {
-			$translation = empty($entry->translations)? '' : $entry->translations[0];
+		if ( ! $entry->is_plural) {
+			$translation = empty($entry->translations) ? '' : $entry->translations[0];
 			$po[] = 'msgstr '.PO::poify($translation);
 		} else {
 			$po[] = 'msgid_plural '.PO::poify($entry->plural);
-			$translations = empty($entry->translations)? array('', '') : $entry->translations;
-			foreach($translations as $i => $translation) {
+			$translations = empty($entry->translations) ? array('', '') : $entry->translations;
+			foreach ($translations as $i => $translation) {
 				$po[] = "msgstr[$i] ".PO::poify($translation);
 			}
 		}
@@ -221,11 +221,11 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if ( ! $f) return false;
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if ( ! $res) break;
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -233,10 +233,10 @@ 
 			}
 		}
 		PO::read_line($f, 'clear');
-		if ( false === $res ) {
+		if (false === $res) {
 			return false;
 		}
-		if ( ! $this->headers && ! $this->entries ) {
+		if ( ! $this->headers && ! $this->entries) {
 			return false;
 		}
 		return true;
@@ -257,11 +257,11 @@ 
 		while (true) {
 			$lineno++;
 			$line = PO::read_line($f);
-			if (!$line)  {
+			if ( ! $line) {
 				if (feof($f)) {
 					if ($is_final($context))
 						break;
-					elseif (!$context) // we haven't read a line and eof came
+					elseif ( ! $context) // we haven't read a line and eof came
 						return null;
 					else
 						return false;
@@ -371,8 +371,8 @@ 
 			$use_last_line = true;
 			return true;
 		}
-		$line = $use_last_line? $last_line : fgets($f);
-		$line = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
+		$line = $use_last_line ? $last_line : fgets($f);
+		$line = ("\r\n" == substr($line, -2)) ? rtrim($line, "\r\n")."\n" : $line;
 		$last_line = $line;
 		$use_last_line = false;
 		return $line;
@@ -388,11 +388,11 @@ 
 		if ('#:' == $first_two) {
 			$entry->references = array_merge($entry->references, preg_split('/\s+/', $comment));
 		} elseif ('#.' == $first_two) {
-			$entry->extracted_comments = trim($entry->extracted_comments . "\n" . $comment);
+			$entry->extracted_comments = trim($entry->extracted_comments."\n".$comment);
 		} elseif ('#,' == $first_two) {
 			$entry->flags = array_merge($entry->flags, preg_split('/,\s*/', $comment));
 		} else {
-			$entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
+			$entry->translator_comments = trim($entry->translator_comments."\n".$comment);
 		}
 	}
 
@@ -401,8 +401,8 @@ 
 	 * @return sring
 	 */
 	function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if (substr($s, 0, 1) == '"') $s = substr($s, 1);
+		if (substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
 		return $s;
 	}
 }

Braces +62 added lines, -28 removed lines

@@ -32,10 +32,11 @@ 
 			$header_string.= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
-		if ($this->comments_before_headers)
-			$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
-		else
-			$before_headers = '';
+		if ($this->comments_before_headers) {
+					$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
+		} else {
+					$before_headers = '';
+		}
 		return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
 	}
 
@@ -74,10 +75,14 @@ 
 	 */
 	function export_to_file($filename, $include_headers = true) {
 		$fh = fopen($filename, 'w');
-		if (false === $fh) return false;
+		if (false === $fh) {
+			return false;
+		}
 		$export = $this->export($include_headers);
 		$res = fwrite($fh, $export);
-		if (false === $res) return false;
+		if (false === $res) {
+			return false;
+		}
 		return fclose($fh);
 	}
 
@@ -139,10 +144,11 @@ 
 			$chars = $chars[0];
 			foreach($chars as $char) {
 				if (!$previous_is_backslash) {
-					if ('\\' == $char)
-						$previous_is_backslash = true;
-					else
-						$unpoified .= $char;
+					if ('\\' == $char) {
+											$previous_is_backslash = true;
+					} else {
+											$unpoified .= $char;
+					}
 				} else {
 					$previous_is_backslash = false;
 					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
@@ -164,10 +170,14 @@ 
 		$php_with = var_export($with, true);
 		$lines = explode("\n", $string);
 		// do not prepend the string on the last empty line, artefact by explode
-		if ("\n" == substr($string, -1)) unset($lines[count($lines) - 1]);
+		if ("\n" == substr($string, -1)) {
+			unset($lines[count($lines) - 1]);
+		}
 		$res = implode("\n", array_map(create_function('$x', "return $php_with.\$x;"), $lines));
 		// give back the empty line, we ignored above
-		if ("\n" == substr($string, -1)) $res .= "\n";
+		if ("\n" == substr($string, -1)) {
+			$res .= "\n";
+		}
 		return $res;
 	}
 
@@ -194,13 +204,25 @@ 
 	 * 	false if the entry is empty
 	 */
 	function export_entry(&$entry) {
-		if (is_null($entry->singular)) return false;
+		if (is_null($entry->singular)) {
+			return false;
+		}
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
+		if (!empty($entry->translator_comments)) {
+			$po[] = PO::comment_block($entry->translator_comments);
+		}
+		if (!empty($entry->extracted_comments)) {
+			$po[] = PO::comment_block($entry->extracted_comments, '.');
+		}
+		if (!empty($entry->references)) {
+			$po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		}
+		if (!empty($entry->flags)) {
+			$po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		}
+		if (!is_null($entry->context)) {
+			$po[] = 'msgctxt '.PO::poify($entry->context);
+		}
 		$po[] = 'msgid '.PO::poify($entry->singular);
 		if (!$entry->is_plural) {
 			$translation = empty($entry->translations)? '' : $entry->translations[0];
@@ -221,11 +243,15 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if (!$f) {
+			return false;
+		}
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if (!$res) {
+				break;
+			}
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -259,17 +285,21 @@ 
 			$line = PO::read_line($f);
 			if (!$line)  {
 				if (feof($f)) {
-					if ($is_final($context))
-						break;
-					elseif (!$context) // we haven't read a line and eof came
+					if ($is_final($context)) {
+											break;
+					} elseif (!$context) {
+						// we haven't read a line and eof came
 						return null;
-					else
-						return false;
+					} else {
+											return false;
+					}
 				} else {
 					return false;
 				}
 			}
-			if ($line == "\n") continue;
+			if ($line == "\n") {
+				continue;
+			}
 			$line = trim($line);
 			if (preg_match('/^#/', $line, $m)) {
 				// the comment is the start of a new entry
@@ -401,8 +431,12 @@ 
 	 * @return sring
 	 */
 	function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if ( substr($s, 0, 1) == '"') {
+			$s = substr($s, 1);
+		}
+		if ( substr($s, -1, 1) == '"') {
+			$s = substr($s, 0, -1);
+		}
 		return $s;
 	}
 }

src/wp-includes/pomo/streams.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Sets the endianness of the file.
 	 *
-	 * @param $endian string 'big' or 'little'
+	 * @param string $endian string 'big' or 'little'
 	 */
 	function setEndian($endian) {
 		$this->endian = $endian;
@@ -41,7 +41,7 @@ 
 	/**
 	 * Reads a 32bit Integer from the Stream
 	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
+	 * @return integer The integer, corresponding to the next 32 bits from
 	 * 	the stream of false if there are not enough bytes or on error
 	 */
 	function readint32() {
@@ -119,14 +119,14 @@ 
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function is_resource() {
 		return true;
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function close() {
 		return true;

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Classes, which help reading streams of data from files.
- * Based on the classes from Danilo Segan <danilo@kvota.net>
- *
- * @version $Id: streams.php 718 2012-10-31 00:32:02Z nbachiyski $
- * @package pomo
- * @subpackage streams
- */
+	 * Classes, which help reading streams of data from files.
+	 * Based on the classes from Danilo Segan <danilo@kvota.net>
+	 *
+	 * @version $Id: streams.php 718 2012-10-31 00:32:02Z nbachiyski $
+	 * @package pomo
+	 * @subpackage streams
+	 */
 
 if ( !class_exists( 'POMO_Reader' ) ):
 class POMO_Reader {

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage streams
  */
 
-if ( !class_exists( 'POMO_Reader' ) ):
+if ( ! class_exists('POMO_Reader')):
 class POMO_Reader {
 
 	var $endian = 'little';
@@ -48,9 +48,9 @@ 
 		$bytes = $this->read(4);
 		if (4 != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
+		return reset($int);
 	}
 
 	/**
@@ -62,9 +62,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
+		if (4 * $count != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
 
@@ -100,14 +100,14 @@ 
 	 * @return array
 	 */
 	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
+		if ( ! function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
 			for ($i = 0; $i < $length; $i += $chunk_size)
 				$out[] = $this->substr($string, $i, $chunk_size);
 			return $out;
 		} else {
-			return str_split( $string, $chunk_size );
+			return str_split($string, $chunk_size);
 		}
 	}
 
@@ -134,13 +134,13 @@ 
 }
 endif;
 
-if ( !class_exists( 'POMO_FileReader' ) ):
+if ( ! class_exists('POMO_FileReader')):
 class POMO_FileReader extends POMO_Reader {
 
 	/**
 	 * @param string $filename
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_Reader();
 		$this->_f = fopen($filename, 'rb');
 	}
@@ -148,8 +148,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_FileReader($filename) {
+		self::__construct($filename);
 	}
 
 	/**
@@ -197,14 +197,14 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
+		while ( ! $this->feof())
 			$all .= $this->read(4096);
 		return $all;
 	}
 }
 endif;
 
-if ( !class_exists( 'POMO_StringReader' ) ):
+if ( ! class_exists('POMO_StringReader')):
 /**
  * Provides file-like methods for manipulating a string instead
  * of a physical file.
@@ -216,7 +216,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $str = '' ) {
+	function __construct($str = '') {
 		parent::POMO_Reader();
 		$this->_str = $str;
 		$this->_pos = 0;
@@ -225,8 +225,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
+	public function POMO_StringReader($str = '') {
+		self::__construct($str);
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 }
 endif;
 
-if ( !class_exists( 'POMO_CachedFileReader' ) ):
+if ( ! class_exists('POMO_CachedFileReader')):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -275,7 +275,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
 		if (false === $this->_str)
@@ -286,13 +286,13 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_CachedFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;
 
-if ( !class_exists( 'POMO_CachedIntFileReader' ) ):
+if ( ! class_exists('POMO_CachedIntFileReader')):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -300,15 +300,15 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	public function __construct( $filename ) {
+	public function __construct($filename) {
 		parent::POMO_CachedFileReader($filename);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
+	function POMO_CachedIntFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;

Braces +21 added lines, -12 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	function readint32() {
 		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
+		if (4 != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
 		return reset( $int );
@@ -62,8 +63,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
+		if (4*$count != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
@@ -103,8 +105,9 @@ 
 		if (!function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
+			for ($i = 0; $i < $length; $i += $chunk_size) {
+							$out[] = $this->substr($string, $i, $chunk_size);
+			}
 			return $out;
 		} else {
 			return str_split( $string, $chunk_size );
@@ -197,8 +200,9 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
+		while ( !$this->feof() ) {
+					$all .= $this->read(4096);
+		}
 		return $all;
 	}
 }
@@ -236,7 +240,9 @@ 
 	function read($bytes) {
 		$data = $this->substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $data;
 	}
 
@@ -246,7 +252,9 @@ 
 	 */
 	function seekto($pos) {
 		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $this->_pos;
 	}
 
@@ -278,8 +286,9 @@ 
 	function __construct( $filename ) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
+		if (false === $this->_str) {
+					return false;
+		}
 		$this->_pos = 0;
 	}
 

src/wp-includes/pomo/translations.php

Doc Comments +4 added lines, -2 removed lines

@@ -18,6 +18,7 @@ 
 	 * Add entry to the PO structure
 	 *
 	 * @param array|Translation_Entry &$entry
+	 * @param Translation_Entry $entry
 	 * @return bool true on success, false if the entry doesn't have a key
 	 */
 	function add_entry($entry) {
@@ -72,6 +73,7 @@ 
 
 	/**
 	 * @param string $header
+	 * @return string
 	 */
 	function get_header($header) {
 		return isset($this->headers[$header])? $this->headers[$header] : false;
@@ -150,7 +152,7 @@ 
 	}
 
 	/**
-	 * @param object $other
+	 * @param Translations $other
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
@@ -326,7 +328,7 @@ 
 	/**
 	 *
 	 * @param int $count
-	 * @return bool
+	 * @return integer
 	 */
 	function select_plural_form($count) {
 		return 1 == $count? 0 : 1;

Spacing +24 added lines, -24 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/entry.php';
+require_once dirname(__FILE__).'/entry.php';
 
-if ( !class_exists( 'Translations' ) ):
+if ( ! class_exists('Translations')):
 class Translations {
 	var $entries = array();
 	var $headers = array();
@@ -65,7 +65,7 @@ 
 	 * @param array $headers
 	 */
 	function set_headers($headers) {
-		foreach($headers as $header => $value) {
+		foreach ($headers as $header => $value) {
 			$this->set_header($header, $value);
 		}
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $header
 	 */
 	function get_header($header) {
-		return isset($this->headers[$header])? $this->headers[$header] : false;
+		return isset($this->headers[$header]) ? $this->headers[$header] : false;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	function translate_entry(&$entry) {
 		$key = $entry->key();
-		return isset($this->entries[$key])? $this->entries[$key] : false;
+		return isset($this->entries[$key]) ? $this->entries[$key] : false;
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 * @param string $context
 	 * @return string
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		$entry = new Translation_Entry(array('singular' => $singular, 'context' => $context));
 		$translated = $this->translate_entry($entry);
-		return ($translated && !empty($translated->translations))? $translated->translations[0] : $singular;
+		return ($translated && ! empty($translated->translations)) ? $translated->translations[0] : $singular;
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param integer $count number of items
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 				isset($translated->translations[$index]))
 			return $translated->translations[$index];
 		else
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return void
 	 **/
 	function merge_with(&$other) {
-		foreach( $other->entries as $entry ) {
+		foreach ($other->entries as $entry) {
 			$this->entries[$entry->key()] = $entry;
 		}
 	}
@@ -153,8 +153,8 @@ 
 	 * @param object $other
 	 */
 	function merge_originals_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
+		foreach ($other->entries as $entry) {
+			if ( ! isset($this->entries[$entry->key()]))
 				$this->entries[$entry->key()] = $entry;
 			else
 				$this->entries[$entry->key()]->merge_with($entry);
@@ -172,8 +172,8 @@ 
 	 * @param int $count
 	 */
 	function gettext_select_plural_form($count) {
-		if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+		if ( ! isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	function nplurals_and_expression_from_header($header) {
 		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-			$nplurals = (int)$matches[1];
+			$nplurals = (int) $matches[1];
 			$expression = trim($this->parenthesize_plural_exression($matches[2]));
 			return array($nplurals, $expression);
 		} else {
@@ -230,8 +230,8 @@ 
 					$res .= ') : (';
 					break;
 				case ';':
-					$res .= str_repeat(')', $depth) . ';';
-					$depth= 0;
+					$res .= str_repeat(')', $depth).';';
+					$depth = 0;
 					break;
 				default:
 					$res .= $char;
@@ -249,9 +249,9 @@ 
 		// sometimes \ns are used instead of real new lines
 		$translation = str_replace('\n', "\n", $translation);
 		$lines = explode("\n", $translation);
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if ( ! isset($parts[1])) continue;
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;
@@ -264,7 +264,7 @@ 
 	function set_header($header, $value) {
 		parent::set_header($header, $value);
 		if ('Plural-Forms' == $header) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -272,7 +272,7 @@ 
 }
 endif;
 
-if ( !class_exists( 'NOOP_Translations' ) ):
+if ( ! class_exists('NOOP_Translations')):
 /**
  * Provides the same interface as Translations, but doesn't do anything
  */
@@ -319,7 +319,7 @@ 
 	 * @param string $singular
 	 * @param string $context
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		return $singular;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @return bool
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 * @param string $context
 	 */
 	function translate_plural($singular, $plural, $count, $context = null) {
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**

Braces +24 added lines, -15 removed lines

@@ -25,7 +25,9 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
+		if (false === $key) {
+			return false;
+		}
 		$this->entries[$key] = &$entry;
 		return true;
 	}
@@ -39,11 +41,14 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
-		if (isset($this->entries[$key]))
-			$this->entries[$key]->merge_with($entry);
-		else
-			$this->entries[$key] = &$entry;
+		if (false === $key) {
+			return false;
+		}
+		if (isset($this->entries[$key])) {
+					$this->entries[$key]->merge_with($entry);
+		} else {
+					$this->entries[$key] = &$entry;
+		}
 		return true;
 	}
 
@@ -131,10 +136,11 @@ 
 		$total_plural_forms = $this->get_plural_forms_count();
 		if ($translated && 0 <= $index && $index < $total_plural_forms &&
 				is_array($translated->translations) &&
-				isset($translated->translations[$index]))
-			return $translated->translations[$index];
-		else
-			return 1 == $count? $singular : $plural;
+				isset($translated->translations[$index])) {
+					return $translated->translations[$index];
+		} else {
+					return 1 == $count? $singular : $plural;
+		}
 	}
 
 	/**
@@ -154,10 +160,11 @@ 
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
-				$this->entries[$entry->key()] = $entry;
-			else
-				$this->entries[$entry->key()]->merge_with($entry);
+			if ( !isset( $this->entries[$entry->key()] ) ) {
+							$this->entries[$entry->key()] = $entry;
+			} else {
+							$this->entries[$entry->key()]->merge_with($entry);
+			}
 		}
 	}
 }
@@ -251,7 +258,9 @@ 
 		$lines = explode("\n", $translation);
 		foreach($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if (!isset($parts[1])) {
+				continue;
+			}
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;

src/wp-includes/post-formats.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
  * @since 3.1.0
  *
  * @param string $format The post format slug.
- * @return string|WP_Error|false The post format term link.
+ * @return string The post format term link.
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Post format functions.
- *
- * @package WordPress
- * @subpackage Post
- */
+	 * Post format functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Post
+	 */
 
 /**
  * Retrieve the format slug for a post

Spacing +67 added lines, -67 removed lines

@@ -14,21 +14,21 @@ 
  * @param int|object|null $post Post ID or post object. Optional, default is the current post from the loop.
  * @return string|false The format if successful. False otherwise.
  */
-function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_format($post = null) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( ! post_type_supports($post->post_type, 'post-formats'))
 		return false;
 
-	$_format = get_the_terms( $post->ID, 'post_format' );
+	$_format = get_the_terms($post->ID, 'post_format');
 
-	if ( empty( $_format ) )
+	if (empty($_format))
 		return false;
 
-	$format = reset( $_format );
+	$format = reset($_format);
 
-	return str_replace('post-format-', '', $format->slug );
+	return str_replace('post-format-', '', $format->slug);
 }
 
 /**
@@ -40,16 +40,16 @@ 
  * @param object|int|null $post   Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
  * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise.
  */
-function has_post_format( $format = array(), $post = null ) {
+function has_post_format($format = array(), $post = null) {
 	$prefixed = array();
 
-	if ( $format ) {
-		foreach ( (array) $format as $single ) {
-			$prefixed[] = 'post-format-' . sanitize_key( $single );
+	if ($format) {
+		foreach ((array) $format as $single) {
+			$prefixed[] = 'post-format-'.sanitize_key($single);
 		}
 	}
 
-	return has_term( $prefixed, 'post_format', $post );
+	return has_term($prefixed, 'post_format', $post);
 }
 
 /**
@@ -61,21 +61,21 @@ 
  * @param string     $format A format to assign. Use an empty string or array to remove all formats from the post.
  * @return array|WP_Error|false WP_Error on error. Array of affected term IDs on success.
  */
-function set_post_format( $post, $format ) {
-	$post = get_post( $post );
+function set_post_format($post, $format) {
+	$post = get_post($post);
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if (empty($post))
+		return new WP_Error('invalid_post', __('Invalid post.'));
 
-	if ( ! empty( $format ) ) {
-		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+	if ( ! empty($format)) {
+		$format = sanitize_key($format);
+		if ('standard' === $format || ! in_array($format, get_post_format_slugs()))
 			$format = '';
 		else
-			$format = 'post-format-' . $format;
+			$format = 'post-format-'.$format;
 	}
 
-	return wp_set_post_terms( $post->ID, $format, 'post_format' );
+	return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
 /**
@@ -87,16 +87,16 @@ 
  */
 function get_post_format_strings() {
 	$strings = array(
-		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'standard' => _x('Standard', 'Post format'), // Special case. any value that evals to false will be considered standard
+		'aside'    => _x('Aside', 'Post format'),
+		'chat'     => _x('Chat', 'Post format'),
+		'gallery'  => _x('Gallery', 'Post format'),
+		'link'     => _x('Link', 'Post format'),
+		'image'    => _x('Image', 'Post format'),
+		'quote'    => _x('Quote', 'Post format'),
+		'status'   => _x('Status', 'Post format'),
+		'video'    => _x('Video', 'Post format'),
+		'audio'    => _x('Audio', 'Post format'),
 	);
 	return $strings;
 }
@@ -109,8 +109,8 @@ 
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
-	$slugs = array_keys( get_post_format_strings() );
-	return array_combine( $slugs, $slugs );
+	$slugs = array_keys(get_post_format_strings());
+	return array_combine($slugs, $slugs);
 }
 
 /**
@@ -121,12 +121,12 @@ 
  * @param string $slug A post format slug.
  * @return string The translated post format name.
  */
-function get_post_format_string( $slug ) {
+function get_post_format_string($slug) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
+	if ( ! $slug)
 		return $strings['standard'];
 	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+		return (isset($strings[$slug])) ? $strings[$slug] : '';
 }
 
 /**
@@ -137,11 +137,11 @@ 
  * @param string $format The post format slug.
  * @return string|WP_Error|false The post format term link.
  */
-function get_post_format_link( $format ) {
-	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
+function get_post_format_link($format) {
+	$term = get_term_by('slug', 'post-format-'.$format, 'post_format');
+	if ( ! $term || is_wp_error($term))
 		return false;
-	return get_term_link( $term );
+	return get_term_link($term);
 }
 
 /**
@@ -153,14 +153,14 @@ 
  * @param array $qvs
  * @return array
  */
-function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
+function _post_format_request($qvs) {
+	if ( ! isset($qvs['post_format']))
 		return $qvs;
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
-	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
+	if (isset($slugs[$qvs['post_format']]))
+		$qvs['post_format'] = 'post-format-'.$slugs[$qvs['post_format']];
+	$tax = get_taxonomy('post_format');
+	if ( ! is_admin())
 		$qvs['post_type'] = $tax->object_type;
 	return $qvs;
 }
@@ -178,16 +178,16 @@ 
  * @param string $taxonomy
  * @return string
  */
-function _post_format_link( $link, $term, $taxonomy ) {
+function _post_format_link($link, $term, $taxonomy) {
 	global $wp_rewrite;
-	if ( 'post_format' != $taxonomy ) {
+	if ('post_format' != $taxonomy) {
 		return $link;
 	}
-	if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
-		return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
+	if ($wp_rewrite->get_extra_permastruct($taxonomy)) {
+		return str_replace("/{$term->slug}", '/'.str_replace('post-format-', '', $term->slug), $link);
 	} else {
-		$link = remove_query_arg( 'post_format', $link );
-		return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
+		$link = remove_query_arg('post_format', $link);
+		return add_query_arg('post_format', str_replace('post-format-', '', $term->slug), $link);
 	}
 }
 
@@ -200,9 +200,9 @@ 
  * @param object $term
  * @return object
  */
-function _post_format_get_term( $term ) {
-	if ( isset( $term->slug ) ) {
-		$term->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_get_term($term) {
+	if (isset($term->slug)) {
+		$term->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 	}
 	return $term;
 }
@@ -218,16 +218,16 @@ 
  * @param array        $args
  * @return array
  */
-function _post_format_get_terms( $terms, $taxonomies, $args ) {
-	if ( in_array( 'post_format', (array) $taxonomies ) ) {
-		if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
-			foreach( $terms as $order => $name ) {
-				$terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+function _post_format_get_terms($terms, $taxonomies, $args) {
+	if (in_array('post_format', (array) $taxonomies)) {
+		if (isset($args['fields']) && 'names' == $args['fields']) {
+			foreach ($terms as $order => $name) {
+				$terms[$order] = get_post_format_string(str_replace('post-format-', '', $name));
 			}
 		} else {
-			foreach ( (array) $terms as $order => $term ) {
-				if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-					$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+			foreach ((array) $terms as $order => $term) {
+				if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+					$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 				}
 			}
 		}
@@ -244,10 +244,10 @@ 
  * @param array $terms
  * @return array
  */
-function _post_format_wp_get_object_terms( $terms ) {
-	foreach ( (array) $terms as $order => $term ) {
-		if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-			$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_wp_get_object_terms($terms) {
+	foreach ((array) $terms as $order => $term) {
+		if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+			$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 		}
 	}
 	return $terms;

Braces +35 added lines, -25 removed lines

@@ -15,16 +15,19 @@ 
  * @return string|false The format if successful. False otherwise.
  */
 function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
-		return false;
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
+			return false;
+	}
 
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
-	if ( empty( $_format ) )
-		return false;
+	if ( empty( $_format ) ) {
+			return false;
+	}
 
 	$format = reset( $_format );
 
@@ -64,15 +67,17 @@ 
 function set_post_format( $post, $format ) {
 	$post = get_post( $post );
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if ( empty( $post ) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	}
 
 	if ( ! empty( $format ) ) {
 		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
-			$format = '';
-		else
-			$format = 'post-format-' . $format;
+		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
+					$format = '';
+		} else {
+					$format = 'post-format-' . $format;
+		}
 	}
 
 	return wp_set_post_terms( $post->ID, $format, 'post_format' );
@@ -123,11 +128,12 @@ 
  */
 function get_post_format_string( $slug ) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
-		return $strings['standard'];
-	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
-}
+	if ( !$slug ) {
+			return $strings['standard'];
+	} else {
+			return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+	}
+	}
 
 /**
  * Returns a link to a post format index.
@@ -139,8 +145,9 @@ 
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
-		return false;
+	if ( ! $term || is_wp_error( $term ) ) {
+			return false;
+	}
 	return get_term_link( $term );
 }
 
@@ -154,14 +161,17 @@ 
  * @return array
  */
 function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
-		return $qvs;
+	if ( ! isset( $qvs['post_format'] ) ) {
+			return $qvs;
+	}
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
+			$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	}
 	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
-		$qvs['post_type'] = $tax->object_type;
+	if ( ! is_admin() ) {
+			$qvs['post_type'] = $tax->object_type;
+	}
 	return $qvs;
 }