ntwb / wordpress

src/wp-admin/ms-users.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite users administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite users administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('users.php') );
+wp_redirect(network_admin_url('users.php'));
 exit;

src/wp-includes/post-thumbnail-template.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress Post Thumbnail Template Functions.
- *
- * Support for post thumbnails.
- * Theme's functions.php must call add_theme_support( 'post-thumbnails' ) to use these.
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * WordPress Post Thumbnail Template Functions.
+	 *
+	 * Support for post thumbnails.
+	 * Theme's functions.php must call add_theme_support( 'post-thumbnails' ) to use these.
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Check if post has an image attached.

Braces +12 added lines, -8 removed lines

@@ -66,16 +66,19 @@ 
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
 function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
-		$wp_query = $GLOBALS['wp_query'];
+	if ( ! $wp_query ) {
+			$wp_query = $GLOBALS['wp_query'];
+	}
 
-	if ( $wp_query->thumbnails_cached )
-		return;
+	if ( $wp_query->thumbnails_cached ) {
+			return;
+	}
 
 	$thumb_ids = array();
 	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
-			$thumb_ids[] = $id;
+		if ( $id = get_post_thumbnail_id( $post->ID ) ) {
+					$thumb_ids[] = $id;
+		}
 	}
 
 	if ( ! empty ( $thumb_ids ) ) {
@@ -130,8 +133,9 @@ 
 		 * @param string $size              The post thumbnail size.
 		 */
 		do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
-			update_post_thumbnail_cache();
+		if ( in_the_loop() ) {
+					update_post_thumbnail_cache();
+		}
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
  *
  * @see get_the_post_thumbnail()
  *
- * @param string|array $size Optional. Image size to use. Accepts any valid image size, or
+ * @param string $size Optional. Image size to use. Accepts any valid image size, or
  *                           an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.

Spacing +34 added lines, -34 removed lines

@@ -18,8 +18,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return bool Whether the post has an image attached.
  */
-function has_post_thumbnail( $post = null ) {
-	return (bool) get_post_thumbnail_id( $post );
+function has_post_thumbnail($post = null) {
+	return (bool) get_post_thumbnail_id($post);
 }
 
 /**
@@ -31,12 +31,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return string|int Post thumbnail ID or empty string.
  */
-function get_post_thumbnail_id( $post = null ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_post_thumbnail_id($post = null) {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	return get_post_meta( $post->ID, '_thumbnail_id', true );
+	return get_post_meta($post->ID, '_thumbnail_id', true);
 }
 
 /**
@@ -58,8 +58,8 @@ 
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  */
-function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
-	echo get_the_post_thumbnail( null, $size, $attr );
+function the_post_thumbnail($size = 'post-thumbnail', $attr = '') {
+	echo get_the_post_thumbnail(null, $size, $attr);
 }
 
 /**
@@ -71,21 +71,21 @@ 
  *
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
-function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
+function update_post_thumbnail_cache($wp_query = null) {
+	if ( ! $wp_query)
 		$wp_query = $GLOBALS['wp_query'];
 
-	if ( $wp_query->thumbnails_cached )
+	if ($wp_query->thumbnails_cached)
 		return;
 
 	$thumb_ids = array();
-	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
+	foreach ($wp_query->posts as $post) {
+		if ($id = get_post_thumbnail_id($post->ID))
 			$thumb_ids[] = $id;
 	}
 
-	if ( ! empty ( $thumb_ids ) ) {
-		_prime_post_caches( $thumb_ids, false, true );
+	if ( ! empty ($thumb_ids)) {
+		_prime_post_caches($thumb_ids, false, true);
 	}
 
 	$wp_query->thumbnails_cached = true;
@@ -111,12 +111,12 @@ 
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  * @return string The post thumbnail image tag.
  */
-function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_the_post_thumbnail($post = null, $size = 'post-thumbnail', $attr = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
+	$post_thumbnail_id = get_post_thumbnail_id($post);
 
 	/**
 	 * Filter the post thumbnail size.
@@ -126,9 +126,9 @@ 
 	 * @param string|array $size The post thumbnail size. Image size or array of width and height
 	 *                           values (in that order). Default 'post-thumbnail'.
 	 */
-	$size = apply_filters( 'post_thumbnail_size', $size );
+	$size = apply_filters('post_thumbnail_size', $size);
 
-	if ( $post_thumbnail_id ) {
+	if ($post_thumbnail_id) {
 
 		/**
 		 * Fires before fetching the post thumbnail HTML.
@@ -142,10 +142,10 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
+		do_action('begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
+		if (in_the_loop())
 			update_post_thumbnail_cache();
-		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
+		$html = wp_get_attachment_image($post_thumbnail_id, $size, false, $attr);
 
 		/**
 		 * Fires after fetching the post thumbnail HTML.
@@ -157,7 +157,7 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
+		do_action('end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
 
 	} else {
 		$html = '';
@@ -174,7 +174,7 @@ 
 	 *                                        values (in that order). Default 'post-thumbnail'.
 	 * @param string       $attr              Query string of attributes.
 	 */
-	return apply_filters( 'post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr );
+	return apply_filters('post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr);
 }
 
 /**
@@ -187,12 +187,12 @@ 
  *                           array of height and width dimensions. Default 'post-thumbnail'.
  * @return string|false Post thumbnail URL or false if no URL is available.
  */
-function get_the_post_thumbnail_url( $post = null, $size = 'post-thumbnail' ) {
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
-	if ( ! $post_thumbnail_id ) {
+function get_the_post_thumbnail_url($post = null, $size = 'post-thumbnail') {
+	$post_thumbnail_id = get_post_thumbnail_id($post);
+	if ( ! $post_thumbnail_id) {
 		return false;
 	}
-	return wp_get_attachment_image_url( $post_thumbnail_id, $size );
+	return wp_get_attachment_image_url($post_thumbnail_id, $size);
 }
 
 /**
@@ -204,9 +204,9 @@ 
  *                           or an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  */
-function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
-	$url = get_the_post_thumbnail_url( null, $size );
-	if ( $url ) {
-		echo esc_url( $url );
+function the_post_thumbnail_url($size = 'post-thumbnail') {
+	$url = get_the_post_thumbnail_url(null, $size);
+	if ($url) {
+		echo esc_url($url);
 	}
 }

src/wp-includes/version.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * The WordPress version string
- *
- * @global string $wp_version
- */
+	 * The WordPress version string
+	 *
+	 * @global string $wp_version
+	 */
 $wp_version = '4.4-alpha-33636-src';
 
 /**

src/wp-includes/vars.php

Braces +22 added lines, -16 removed lines

@@ -22,12 +22,13 @@ 
 // On which page are we ?
 if ( is_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
-		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
-		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	else
-		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	if ( is_network_admin() ) {
+			preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} elseif ( is_user_admin() ) {
+			preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} else {
+			preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	}
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -36,15 +37,18 @@ 
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
-			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+		if ( '.php' !== substr($pagenow, -4, 4) ) {
+					$pagenow .= '.php';
+		}
+		// for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
-		$pagenow = strtolower($self_matches[1]);
-	else
-		$pagenow = 'index.php';
-}
+	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) ) {
+			$pagenow = strtolower($self_matches[1]);
+	} else {
+			$pagenow = 'index.php';
+	}
+	}
 unset($self_matches);
 
 // Simple browser detection
@@ -63,8 +67,9 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) ) {
+							header( 'X-UA-Compatible: chrome=1' );
+			}
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
@@ -84,8 +89,9 @@ 
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false ) {
 	$is_iphone = true;
+}
 
 $is_IE = ( $is_macIE || $is_winIE );
 

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Creates common globals for the rest of WordPress
- *
- * Sets $pagenow global which is the current page. Checks
- * for the browser to set which one is currently being used.
- *
- * Detects which user environment WordPress is being used on.
- * Only attempts to check for Apache, Nginx and IIS -- three web
- * servers with known pretty permalink capability.
- *
- * Note: Though Nginx is detected, WordPress does not currently
- * generate rewrite rules for it. See https://codex.wordpress.org/Nginx
- *
- * @package WordPress
- */
+	 * Creates common globals for the rest of WordPress
+	 *
+	 * Sets $pagenow global which is the current page. Checks
+	 * for the browser to set which one is currently being used.
+	 *
+	 * Detects which user environment WordPress is being used on.
+	 * Only attempts to check for Apache, Nginx and IIS -- three web
+	 * servers with known pretty permalink capability.
+	 *
+	 * Note: Though Nginx is detected, WordPress does not currently
+	 * generate rewrite rules for it. See https://codex.wordpress.org/Nginx
+	 *
+	 * @package WordPress
+	 */
 
 global $pagenow,
 	$is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_edge,

Spacing +26 added lines, -26 removed lines

@@ -20,27 +20,27 @@ 
 	$is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
-if ( is_admin() ) {
+if (is_admin()) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
+	if (is_network_admin())
 		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	else
 		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
-	if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
+	if ('' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow) {
 		$pagenow = 'index.php';
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
+		if ('.php' !== substr($pagenow, -4, 4))
 			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
+	if (preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches))
 		$pagenow = strtolower($self_matches[1]);
 	else
 		$pagenow = 'index.php';
@@ -50,13 +50,13 @@ 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false;
 
-if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
-	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
 		$is_lynx = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false) {
 		$is_edge = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
-		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false) {
+		if (stripos($_SERVER['HTTP_USER_AGENT'], 'chromeframe') !== false) {
 			$is_admin = is_admin();
 			/**
 			 * Filter whether Google Chrome Frame should be used, if available.
@@ -65,31 +65,31 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ($is_chrome = apply_filters('use_google_chrome_frame', $is_admin))
+				header('X-UA-Compatible: chrome=1');
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) {
 		$is_safari = true;
-	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+	} elseif ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
 		$is_winIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
 		$is_gecko = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
 		$is_opera = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
 		$is_NS4 = true;
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ($is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false)
 	$is_iphone = true;
 
-$is_IE = ( $is_macIE || $is_winIE );
+$is_IE = ($is_macIE || $is_winIE);
 
 // Server detection
 
@@ -109,13 +109,13 @@ 
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */
-$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = ! $is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
  * Whether the server software is IIS 7.X or greater
  * @global bool $is_iis7
  */
-$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+$is_iis7 = $is_IIS && intval(substr($_SERVER['SERVER_SOFTWARE'], strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/') + 14)) >= 7;
 
 /**
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
@@ -123,15 +123,15 @@ 
  * @return bool
  */
 function wp_is_mobile() {
-	if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		$is_mobile = false;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;

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

Spacing +34 added lines, -34 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_styles() {
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		$wp_styles = new WP_Styles();
 	}
 	return $wp_styles;
@@ -39,8 +39,8 @@ 
  * @param string|bool|array $handles Styles to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_styles( $handles = false ) {
-	if ( '' === $handles ) { // for wp_head
+function wp_print_styles($handles = false) {
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 	/**
@@ -48,20 +48,20 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	if ( ! $handles ) {
-		do_action( 'wp_print_styles' );
+	if ( ! $handles) {
+		do_action('wp_print_styles');
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_styles()->do_items( $handles );
+	return wp_styles()->do_items($handles);
 }
 
 /**
@@ -80,15 +80,15 @@ 
  * @param string $data   String containing the CSS styles to be added.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_style( $handle, $data ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_style($handle, $data) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</style>' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Do not pass style tags to wp_add_inline_style().' ), '3.7' );
-		$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
+	if (false !== stripos($data, '</style>')) {
+		_doing_it_wrong(__FUNCTION__, __('Do not pass style tags to wp_add_inline_style().'), '3.7');
+		$data = trim(preg_replace('#<style[^>]*>(.*)</style>#is', '$1', $data));
 	}
 
-	return wp_styles()->add_inline_style( $handle, $data );
+	return wp_styles()->add_inline_style($handle, $data);
 }
 
 /**
@@ -110,10 +110,10 @@ 
  *                            'screen', 'tty', or 'tv'.
  * @return bool Whether the style has been registered. True on success, false on failure.
  */
-function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_register_style($handle, $src, $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return wp_styles()->add( $handle, $src, $deps, $ver, $media );
+	return wp_styles()->add($handle, $src, $deps, $ver, $media);
 }
 
 /**
@@ -125,10 +125,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_deregister_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->remove( $handle );
+	wp_styles()->remove($handle);
 }
 
 /**
@@ -151,16 +151,16 @@ 
  *                            Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
  *                            'screen', 'tty', or 'tv'.
  */
-function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_enqueue_style($handle, $src = false, $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	$wp_styles = wp_styles();
 
-	if ( $src ) {
+	if ($src) {
 		$_handle = explode('?', $handle);
-		$wp_styles->add( $_handle[0], $src, $deps, $ver, $media );
+		$wp_styles->add($_handle[0], $src, $deps, $ver, $media);
 	}
-	$wp_styles->enqueue( $handle );
+	$wp_styles->enqueue($handle);
 }
 
 /**
@@ -172,10 +172,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_dequeue_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->dequeue( $handle );
+	wp_styles()->dequeue($handle);
 }
 
 /**
@@ -188,10 +188,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether style is queued.
  */
-function wp_style_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_style_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_styles()->query( $handle, $list );
+	return (bool) wp_styles()->query($handle, $list);
 }
 
 /**
@@ -216,6 +216,6 @@ 
  * @param mixed  $value  String containing the CSS data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_style_add_data( $handle, $key, $value ) {
-	return wp_styles()->add_data( $handle, $key, $value );
+function wp_style_add_data($handle, $key, $value) {
+	return wp_styles()->add_data($handle, $key, $value);
 }

Doc Comments +3 added lines, -3 removed lines

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

Indentation +7 added lines, -7 removed lines

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

src/wp-includes/class-wp-http-ixr-client.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WP_HTTP_IXR_Client
- *
- * @package WordPress
- * @since 3.1.0
- *
- */
+	 * WP_HTTP_IXR_Client
+	 *
+	 * @package WordPress
+	 * @since 3.1.0
+	 *
+	 */
 class WP_HTTP_IXR_Client extends IXR_Client {
 	public $scheme;
 	/**

Spacing +19 added lines, -19 removed lines

@@ -20,21 +20,21 @@ 
 	 * @param int $timeout
 	 */
 	public function __construct($server, $path = false, $port = false, $timeout = 15) {
-		if ( ! $path ) {
+		if ( ! $path) {
 			// Assume we have been given a URL instead
 			$bits = parse_url($server);
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
 			$this->port = isset($bits['port']) ? $bits['port'] : $port;
-			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
+			$this->path = ! empty($bits['path']) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path
-			if ( ! $this->path ) {
+			if ( ! $this->path) {
 				$this->path = '/';
 			}
 
-			if ( ! empty( $bits['query'] ) ) {
-				$this->path .= '?' . $bits['query'];
+			if ( ! empty($bits['query'])) {
+				$this->path .= '?'.$bits['query'];
 			}
 		} else {
 			$this->scheme = 'http';
@@ -56,7 +56,7 @@ 
 		$xml = $request->getXml();
 
 		$port = $this->port ? ":$this->port" : '';
-		$url = $this->scheme . '://' . $this->server . $port . $this->path;
+		$url = $this->scheme.'://'.$this->server.$port.$this->path;
 		$args = array(
 			'headers'    => array('Content-Type' => 'text/xml'),
 			'user-agent' => $this->useragent,
@@ -64,7 +64,7 @@ 
 		);
 
 		// Merge Custom headers ala #8145
-		foreach ( $this->headers as $header => $value ) {
+		foreach ($this->headers as $header => $value) {
 			$args['headers'][$header] = $value;
 		}
 
@@ -75,45 +75,45 @@ 
 		 *
 		 * @param array $headers Array of headers to be sent.
 		 */
-		$args['headers'] = apply_filters( 'wp_http_ixr_client_headers', $args['headers'] );
+		$args['headers'] = apply_filters('wp_http_ixr_client_headers', $args['headers']);
 
-		if ( $this->timeout !== false ) {
+		if ($this->timeout !== false) {
 			$args['timeout'] = $this->timeout;
 		}
 
 		// Now send the request
-		if ( $this->debug ) {
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
 		}
 
 		$response = wp_remote_post($url, $args);
 
-		if ( is_wp_error($response) ) {
+		if (is_wp_error($response)) {
 			$errno    = $response->get_error_code();
 			$errorstr = $response->get_error_message();
 			$this->error = new IXR_Error(-32300, "transport error: $errno $errorstr");
 			return false;
 		}
 
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')');
+		if (200 != wp_remote_retrieve_response_code($response)) {
+			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 ('.wp_remote_retrieve_response_code($response).')');
 			return false;
 		}
 
-		if ( $this->debug ) {
-			echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_response">'.htmlspecialchars(wp_remote_retrieve_body($response))."\n</pre>\n\n";
 		}
 
 		// Now parse what we've got back
-		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );
-		if ( ! $this->message->parse() ) {
+		$this->message = new IXR_Message(wp_remote_retrieve_body($response));
+		if ( ! $this->message->parse()) {
 			// XML error
 			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
 			return false;
 		}
 
 		// Is the message a fault?
-		if ( $this->message->messageType == 'fault' ) {
+		if ($this->message->messageType == 'fault') {
 			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
 			return false;
 		}

src/wp-includes/ms-functions.php

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 {

Doc Comments +2 added lines, -2 removed lines

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

Spacing +511 added lines, -511 removed lines

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

Braces +303 added lines, -207 removed lines

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

src/wp-includes/js/tinymce/wp-tinymce.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Disable error reporting
- *
- * Set this to error_reporting( -1 ) for debugging.
- */
+	 * Disable error reporting
+	 *
+	 * Set this to error_reporting( -1 ) for debugging.
+	 */
 error_reporting(0);
 
 $basepath = dirname(__FILE__);

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
+	if (function_exists('realpath'))
 		$path = realpath($path);
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file($path))
 		return false;
 
 	return @file_get_contents($path);
@@ -23,17 +23,17 @@ 
 
 header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if (isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ($file = get_file($basepath.'/wp-tinymce.js.gz'))) {
 
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
 	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
-	echo get_file( $basepath . '/tinymce.min.js' );
-	echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
+	echo get_file($basepath.'/tinymce.min.js');
+	echo get_file($basepath.'/plugins/compat3x/plugin.min.js');
 }
 exit;

Braces +6 added lines, -4 removed lines

@@ -10,11 +10,13 @@
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists('realpath') ) {
+			$path = realpath($path);
+	}
 
-	if ( ! $path || ! @is_file($path) )
-		return false;
+	if ( ! $path || ! @is_file($path) ) {
+			return false;
+	}
 
 	return @file_get_contents($path);
 }

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Error API.
- *
- * Contains the WP_Error class and the is_wp_error() function.
- *
- * @package WordPress
- */
+	 * WordPress Error API.
+	 *
+	 * Contains the WP_Error class and the is_wp_error() function.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * WordPress Error class.

Spacing +19 added lines, -19 removed lines

@@ -52,13 +52,13 @@ 
 	 * @param string $message Error message
 	 * @param mixed $data Optional. Error data.
 	 */
-	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
+	public function __construct($code = '', $message = '', $data = '') {
+		if (empty($code))
 			return;
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
+		if (empty($this->errors))
 			return array();
 
 		return array_keys($this->errors);
@@ -88,7 +88,7 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
+		if (empty($codes))
 			return '';
 
 		return $codes[0];
@@ -104,15 +104,15 @@ 
 	 */
 	public function get_error_messages($code = '') {
 		// Return all messages if no code specified.
-		if ( empty($code) ) {
+		if (empty($code)) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
+			foreach ((array) $this->errors as $code => $messages)
 				$all_messages = array_merge($all_messages, $messages);
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
+		if (isset($this->errors[$code]))
 			return $this->errors[$code];
 		else
 			return array();
@@ -130,10 +130,10 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
+		if (empty($messages))
 			return '';
 		return $messages[0];
 	}
@@ -147,10 +147,10 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
-		if ( isset($this->error_data[$code]) )
+		if (isset($this->error_data[$code]))
 			return $this->error_data[$code];
 	}
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
 		$this->error_data[$code] = $data;
@@ -197,9 +197,9 @@ 
 	 *
 	 * @param string|int $code Error code.
 	 */
-	public function remove( $code ) {
-		unset( $this->errors[ $code ] );
-		unset( $this->error_data[ $code ] );
+	public function remove($code) {
+		unset($this->errors[$code]);
+		unset($this->error_data[$code]);
 	}
 }
 
@@ -213,6 +213,6 @@ 
  * @param mixed $thing Check if unknown variable is a WP_Error object.
  * @return bool True, if WP_Error. False, if not WP_Error.
  */
-function is_wp_error( $thing ) {
-	return ( $thing instanceof WP_Error );
+function is_wp_error($thing) {
+	return ($thing instanceof WP_Error);
 }

Braces +38 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
 	 * @param mixed $data Optional. Error data.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
-			return;
+		if ( empty($code) ) {
+					return;
+		}
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -71,8 +73,9 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
-			return array();
+		if ( empty($this->errors) ) {
+					return array();
+		}
 
 		return array_keys($this->errors);
 	}
@@ -88,8 +91,9 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
-			return '';
+		if ( empty($codes) ) {
+					return '';
+		}
 
 		return $codes[0];
 	}
@@ -106,16 +110,18 @@ 
 		// Return all messages if no code specified.
 		if ( empty($code) ) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
-				$all_messages = array_merge($all_messages, $messages);
+			foreach ( (array) $this->errors as $code => $messages ) {
+							$all_messages = array_merge($all_messages, $messages);
+			}
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
-			return $this->errors[$code];
-		else
-			return array();
+		if ( isset($this->errors[$code]) ) {
+					return $this->errors[$code];
+		} else {
+					return array();
+		}
 	}
 
 	/**
@@ -130,11 +136,13 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
-			return '';
+		if ( empty($messages) ) {
+					return '';
+		}
 		return $messages[0];
 	}
 
@@ -147,11 +155,13 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
-		if ( isset($this->error_data[$code]) )
-			return $this->error_data[$code];
+		if ( isset($this->error_data[$code]) ) {
+					return $this->error_data[$code];
+		}
 	}
 
 	/**
@@ -166,8 +176,9 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -181,8 +192,9 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
 		$this->error_data[$code] = $data;
 	}