ntwb / wordpress

src/wp-includes/theme.php

Doc Comments +1 added lines, -1 removed lines

@@ -1309,7 +1309,7 @@
  *
  * @global array $editor_styles
  *
- * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * @param string[] $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Theme, template, and stylesheet functions.
- *
- * @package WordPress
- * @subpackage Theme
- */
+	 * Theme, template, and stylesheet functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Theme
+	 */
 
 /**
  * Returns an array of WP_Theme objects based on the arguments.

Spacing +455 added lines, -455 removed lines

@@ -27,55 +27,55 @@ 
  *                      synonymous for the current blog.
  * @return array Array of WP_Theme objects.
  */
-function wp_get_themes( $args = array() ) {
+function wp_get_themes($args = array()) {
 	global $wp_theme_directories;
 
-	$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('errors' => false, 'allowed' => null, 'blog_id' => 0);
+	$args = wp_parse_args($args, $defaults);
 
 	$theme_directories = search_theme_directories();
 
-	if ( count( $wp_theme_directories ) > 1 ) {
+	if (count($wp_theme_directories) > 1) {
 		// Make sure the current theme wins out, in case search_theme_directories() picks the wrong
 		// one in the case of a conflict. (Normally, last registered theme root wins.)
 		$current_theme = get_stylesheet();
-		if ( isset( $theme_directories[ $current_theme ] ) ) {
-			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
-			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
+		if (isset($theme_directories[$current_theme])) {
+			$root_of_current_theme = get_raw_theme_root($current_theme);
+			if ( ! in_array($root_of_current_theme, $wp_theme_directories))
+				$root_of_current_theme = WP_CONTENT_DIR.$root_of_current_theme;
+			$theme_directories[$current_theme]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
+	if (empty($theme_directories))
 		return array();
 
-	if ( is_multisite() && null !== $args['allowed'] ) {
+	if (is_multisite() && null !== $args['allowed']) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ('network' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_network());
+		elseif ('site' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_site($args['blog_id']));
+		elseif ($allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+			$theme_directories = array_diff_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 	}
 
 	$themes = array();
 	static $_themes = array();
 
-	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+	foreach ($theme_directories as $theme => $theme_root) {
+		if (isset($_themes[$theme_root['theme_root'].'/'.$theme]))
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme];
 		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme] = new WP_Theme($theme, $theme_root['theme_root']);
 	}
 
-	if ( null !== $args['errors'] ) {
-		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+	if (null !== $args['errors']) {
+		foreach ($themes as $theme => $wp_theme) {
+			if ($wp_theme->errors() != $args['errors'])
+				unset($themes[$theme]);
 		}
 	}
 
@@ -94,21 +94,21 @@ 
  * 	                         is used to calculate the theme root for the $stylesheet provided (or current theme).
  * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
-function wp_get_theme( $stylesheet = null, $theme_root = null ) {
+function wp_get_theme($stylesheet = null, $theme_root = null) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
+	if (empty($stylesheet))
 		$stylesheet = get_stylesheet();
 
-	if ( empty( $theme_root ) ) {
-		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+	if (empty($theme_root)) {
+		$theme_root = get_raw_theme_root($stylesheet);
+		if (false === $theme_root)
+			$theme_root = WP_CONTENT_DIR.'/themes';
+		elseif ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	}
 
-	return new WP_Theme( $stylesheet, $theme_root );
+	return new WP_Theme($stylesheet, $theme_root);
 }
 
 /**
@@ -117,11 +117,11 @@ 
  * @since 3.5.0
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
-function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
-	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
+function wp_clean_themes_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_themes');
+	search_theme_directories(true);
+	foreach (wp_get_themes(array('errors' => null)) as $theme)
 		$theme->cache_delete();
 }
 
@@ -133,7 +133,7 @@ 
  * @return bool true if a child theme is in use, false otherwise.
  **/
 function is_child_theme() {
-	return ( TEMPLATEPATH !== STYLESHEETPATH );
+	return (TEMPLATEPATH !== STYLESHEETPATH);
 }
 
 /**
@@ -157,7 +157,7 @@ 
 	 *
 	 * @param string $stylesheet Name of the current stylesheet.
 	 */
-	return apply_filters( 'stylesheet', get_option( 'stylesheet' ) );
+	return apply_filters('stylesheet', get_option('stylesheet'));
 }
 
 /**
@@ -169,7 +169,7 @@ 
  */
 function get_stylesheet_directory() {
 	$stylesheet = get_stylesheet();
-	$theme_root = get_theme_root( $stylesheet );
+	$theme_root = get_theme_root($stylesheet);
 	$stylesheet_dir = "$theme_root/$stylesheet";
 
 	/**
@@ -181,7 +181,7 @@ 
 	 * @param string $stylesheet     Directory name of the current theme.
 	 * @param string $theme_root     Absolute path to themes directory.
 	 */
-	return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root );
+	return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  * @return string
  */
 function get_stylesheet_directory_uri() {
-	$stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
-	$theme_root_uri = get_theme_root_uri( $stylesheet );
+	$stylesheet = str_replace('%2F', '/', rawurlencode(get_stylesheet()));
+	$theme_root_uri = get_theme_root_uri($stylesheet);
 	$stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
 
 	/**
@@ -205,7 +205,7 @@ 
 	 * @param string $stylesheet         Name of the activated theme's directory.
 	 * @param string $theme_root_uri     Themes root URI.
 	 */
-	return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri );
+	return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri);
 }
 
 /**
@@ -220,7 +220,7 @@ 
  */
 function get_stylesheet_uri() {
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
+	$stylesheet_uri = $stylesheet_dir_uri.'/style.css';
 	/**
 	 * Filter the URI of the current theme stylesheet.
 	 *
@@ -229,7 +229,7 @@ 
 	 * @param string $stylesheet_uri     Stylesheet URI for the current theme/child theme.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI for the current theme/child theme.
 	 */
-	return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -257,9 +257,9 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
+	if (file_exists("$dir/$locale.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+	elseif ( ! empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
 	else
 		$stylesheet_uri = '';
@@ -271,7 +271,7 @@ 
 	 * @param string $stylesheet_uri     Localized stylesheet URI.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI.
 	 */
-	return apply_filters( 'locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -289,7 +289,7 @@ 
 	 *
 	 * @param string $template Current theme's directory name.
 	 */
-	return apply_filters( 'template', get_option( 'template' ) );
+	return apply_filters('template', get_option('template'));
 }
 
 /**
@@ -301,7 +301,7 @@ 
  */
 function get_template_directory() {
 	$template = get_template();
-	$theme_root = get_theme_root( $template );
+	$theme_root = get_theme_root($template);
 	$template_dir = "$theme_root/$template";
 
 	/**
@@ -313,7 +313,7 @@ 
 	 * @param string $template     Directory name of the current theme.
 	 * @param string $theme_root   Absolute path to the themes directory.
 	 */
-	return apply_filters( 'template_directory', $template_dir, $template, $theme_root );
+	return apply_filters('template_directory', $template_dir, $template, $theme_root);
 }
 
 /**
@@ -324,8 +324,8 @@ 
  * @return string Template directory URI.
  */
 function get_template_directory_uri() {
-	$template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
-	$theme_root_uri = get_theme_root_uri( $template );
+	$template = str_replace('%2F', '/', rawurlencode(get_template()));
+	$theme_root_uri = get_theme_root_uri($template);
 	$template_dir_uri = "$theme_root_uri/$template";
 
 	/**
@@ -337,7 +337,7 @@ 
 	 * @param string $template         Directory name of the current theme.
 	 * @param string $theme_root_uri   The themes root URI.
 	 */
-	return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri );
+	return apply_filters('template_directory_uri', $template_dir_uri, $template, $theme_root_uri);
 }
 
 /**
@@ -352,13 +352,13 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
-	$theme_roots = get_site_transient( 'theme_roots' );
-	if ( false === $theme_roots ) {
-		search_theme_directories( true ); // Regenerate the transient.
-		$theme_roots = get_site_transient( 'theme_roots' );
+	$theme_roots = get_site_transient('theme_roots');
+	if (false === $theme_roots) {
+		search_theme_directories(true); // Regenerate the transient.
+		$theme_roots = get_site_transient('theme_roots');
 	}
 	return $theme_roots;
 }
@@ -373,24 +373,24 @@ 
  * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
  * @return bool
  */
-function register_theme_directory( $directory ) {
+function register_theme_directory($directory) {
 	global $wp_theme_directories;
 
-	if ( ! file_exists( $directory ) ) {
+	if ( ! file_exists($directory)) {
 		// Try prepending as the theme directory could be relative to the content directory
-		$directory = WP_CONTENT_DIR . '/' . $directory;
+		$directory = WP_CONTENT_DIR.'/'.$directory;
 		// If this directory does not exist, return and do not register
-		if ( ! file_exists( $directory ) ) {
+		if ( ! file_exists($directory)) {
 			return false;
 		}
 	}
 
-	if ( ! is_array( $wp_theme_directories ) ) {
+	if ( ! is_array($wp_theme_directories)) {
 		$wp_theme_directories = array();
 	}
 
-	$untrailed = untrailingslashit( $directory );
-	if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+	$untrailed = untrailingslashit($directory);
+	if ( ! empty($untrailed) && ! in_array($untrailed, $wp_theme_directories)) {
 		$wp_theme_directories[] = $untrailed;
 	}
 
@@ -408,14 +408,14 @@ 
  * @param bool $force Optional. Whether to force a new directory scan. Defaults to false.
  * @return array|false Valid themes found
  */
-function search_theme_directories( $force = false ) {
+function search_theme_directories($force = false) {
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
+	if (empty($wp_theme_directories))
 		return false;
 
-	if ( ! $force && isset( $found_themes ) )
+	if ( ! $force && isset($found_themes))
 		return $found_themes;
 
 	$found_themes = array();
@@ -426,11 +426,11 @@ 
 	// Set up maybe-relative, maybe-absolute array of theme directories.
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
-	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+	foreach ($wp_theme_directories as $theme_root) {
+		if (0 === strpos($theme_root, WP_CONTENT_DIR))
+			$relative_theme_roots[str_replace(WP_CONTENT_DIR, '', $theme_root)] = $theme_root;
 		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+			$relative_theme_roots[$theme_root] = $theme_root;
 	}
 
 	/**
@@ -441,87 +441,87 @@ 
 	 * @param bool   $cache_expiration Whether to get the cache of the theme directories. Default false.
 	 * @param string $cache_directory  Directory to be searched for the cache.
 	 */
-	if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
-		$cached_roots = get_site_transient( 'theme_roots' );
-		if ( is_array( $cached_roots ) ) {
-			foreach ( $cached_roots as $theme_dir => $theme_root ) {
+	if ($cache_expiration = apply_filters('wp_cache_themes_persistently', false, 'search_theme_directories')) {
+		$cached_roots = get_site_transient('theme_roots');
+		if (is_array($cached_roots)) {
+			foreach ($cached_roots as $theme_dir => $theme_root) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
+				if ( ! isset($relative_theme_roots[$theme_root]))
 					continue;
-				$found_themes[ $theme_dir ] = array(
-					'theme_file' => $theme_dir . '/style.css',
-					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
+				$found_themes[$theme_dir] = array(
+					'theme_file' => $theme_dir.'/style.css',
+					'theme_root' => $relative_theme_roots[$theme_root], // Convert relative to absolute.
 				);
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
+		if ( ! is_int($cache_expiration))
 			$cache_expiration = 1800; // half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
 
 	/* Loop the registered theme directories and extract all themes */
-	foreach ( $wp_theme_directories as $theme_root ) {
+	foreach ($wp_theme_directories as $theme_root) {
 
 		// Start with directories in the root of the current theme directory.
-		$dirs = @ scandir( $theme_root );
-		if ( ! $dirs ) {
-			trigger_error( "$theme_root is not readable", E_USER_NOTICE );
+		$dirs = @ scandir($theme_root);
+		if ( ! $dirs) {
+			trigger_error("$theme_root is not readable", E_USER_NOTICE);
 			continue;
 		}
-		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
+		foreach ($dirs as $dir) {
+			if ( ! is_dir($theme_root.'/'.$dir) || $dir[0] == '.' || $dir == 'CVS')
 				continue;
-			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
+			if (file_exists($theme_root.'/'.$dir.'/style.css')) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
-				$found_themes[ $dir ] = array(
-					'theme_file' => $dir . '/style.css',
+				$found_themes[$dir] = array(
+					'theme_file' => $dir.'/style.css',
 					'theme_root' => $theme_root,
 				);
 			} else {
 				$found_theme = false;
 				// wp-content/themes/a-folder-of-themes/*
 				// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs
-				$sub_dirs = @ scandir( $theme_root . '/' . $dir );
-				if ( ! $sub_dirs ) {
-					trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
+				$sub_dirs = @ scandir($theme_root.'/'.$dir);
+				if ( ! $sub_dirs) {
+					trigger_error("$theme_root/$dir is not readable", E_USER_NOTICE);
 					continue;
 				}
-				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
+				foreach ($sub_dirs as $sub_dir) {
+					if ( ! is_dir($theme_root.'/'.$dir.'/'.$sub_dir) || $dir[0] == '.' || $dir == 'CVS')
 						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
+					if ( ! file_exists($theme_root.'/'.$dir.'/'.$sub_dir.'/style.css'))
 						continue;
-					$found_themes[ $dir . '/' . $sub_dir ] = array(
-						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
+					$found_themes[$dir.'/'.$sub_dir] = array(
+						'theme_file' => $dir.'/'.$sub_dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 					$found_theme = true;
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
-						'theme_file' => $dir . '/style.css',
+				if ( ! $found_theme)
+					$found_themes[$dir] = array(
+						'theme_file' => $dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 			}
 		}
 	}
 
-	asort( $found_themes );
+	asort($found_themes);
 
 	$theme_roots = array();
-	$relative_theme_roots = array_flip( $relative_theme_roots );
+	$relative_theme_roots = array_flip($relative_theme_roots);
 
-	foreach ( $found_themes as $theme_dir => $theme_data ) {
-		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
+	foreach ($found_themes as $theme_dir => $theme_data) {
+		$theme_roots[$theme_dir] = $relative_theme_roots[$theme_data['theme_root']]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ($theme_roots != get_site_transient('theme_roots'))
+		set_site_transient('theme_roots', $theme_roots, $cache_expiration);
 
 	return $found_themes;
 }
@@ -538,16 +538,16 @@ 
  * @param string $stylesheet_or_template The stylesheet or template name of the theme
  * @return string Theme path.
  */
-function get_theme_root( $stylesheet_or_template = false ) {
+function get_theme_root($stylesheet_or_template = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
+	if ($stylesheet_or_template && $theme_root = get_raw_theme_root($stylesheet_or_template)) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	} else {
-		$theme_root = WP_CONTENT_DIR . '/themes';
+		$theme_root = WP_CONTENT_DIR.'/themes';
 	}
 
 	/**
@@ -557,7 +557,7 @@ 
 	 *
 	 * @param string $theme_root Absolute path to themes directory.
 	 */
-	return apply_filters( 'theme_root', $theme_root );
+	return apply_filters('theme_root', $theme_root);
 }
 
 /**
@@ -575,28 +575,28 @@ 
  * 	                                     the need for a get_raw_theme_root() call.
  * @return string Themes URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
+function get_theme_root_uri($stylesheet_or_template = false, $theme_root = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ($stylesheet_or_template && ! $theme_root)
+		$theme_root = get_raw_theme_root($stylesheet_or_template);
 
-	if ( $stylesheet_or_template && $theme_root ) {
-		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
+	if ($stylesheet_or_template && $theme_root) {
+		if (in_array($theme_root, (array) $wp_theme_directories)) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			if (0 === strpos($theme_root, WP_CONTENT_DIR))
+				$theme_root_uri = content_url(str_replace(WP_CONTENT_DIR, '', $theme_root));
+			elseif (0 === strpos($theme_root, ABSPATH))
+				$theme_root_uri = site_url(str_replace(ABSPATH, '', $theme_root));
+			elseif (0 === strpos($theme_root, WP_PLUGIN_DIR) || 0 === strpos($theme_root, WPMU_PLUGIN_DIR))
+				$theme_root_uri = plugins_url(basename($theme_root), $theme_root);
 			else
 				$theme_root_uri = $theme_root;
 		} else {
-			$theme_root_uri = content_url( $theme_root );
+			$theme_root_uri = content_url($theme_root);
 		}
 	} else {
-		$theme_root_uri = content_url( 'themes' );
+		$theme_root_uri = content_url('themes');
 	}
 
 	/**
@@ -608,7 +608,7 @@ 
 	 * @param string $siteurl                WordPress web address which is set in General Options.
 	 * @param string $stylesheet_or_template Stylesheet or template name of the theme.
 	 */
-	return apply_filters( 'theme_root_uri', $theme_root_uri, get_option( 'siteurl' ), $stylesheet_or_template );
+	return apply_filters('theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template);
 }
 
 /**
@@ -623,25 +623,25 @@ 
  *                                       Defaults to false, meaning the cache is used.
  * @return string Theme root
  */
-function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
+function get_raw_theme_root($stylesheet_or_template, $skip_cache = false) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
-	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
+	if ( ! $skip_cache) {
+		if (get_option('stylesheet') == $stylesheet_or_template)
 			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
+		elseif (get_option('template') == $stylesheet_or_template)
 			$theme_root = get_option('template_root');
 	}
 
-	if ( empty($theme_root) ) {
+	if (empty($theme_root)) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
+		if ( ! empty($theme_roots[$stylesheet_or_template]))
 			$theme_root = $theme_roots[$stylesheet_or_template];
 	}
 
@@ -655,9 +655,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return;
-	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+	echo '<link rel="stylesheet" href="'.$stylesheet.'" type="text/css" media="screen" />';
 }
 
 /**
@@ -674,61 +674,61 @@ 
  *
  * @param string $stylesheet Stylesheet name
  */
-function switch_theme( $stylesheet ) {
+function switch_theme($stylesheet) {
 	global $wp_theme_directories, $wp_customize, $sidebars_widgets;
 
 	$_sidebars_widgets = null;
-	if ( 'wp_ajax_customize_save' === current_action() ) {
-		$_sidebars_widgets = $wp_customize->post_value( $wp_customize->get_setting( 'old_sidebars_widgets_data' ) );
-	} elseif ( is_array( $sidebars_widgets ) ) {
+	if ('wp_ajax_customize_save' === current_action()) {
+		$_sidebars_widgets = $wp_customize->post_value($wp_customize->get_setting('old_sidebars_widgets_data'));
+	} elseif (is_array($sidebars_widgets)) {
 		$_sidebars_widgets = $sidebars_widgets;
 	}
 
-	if ( is_array( $_sidebars_widgets ) ) {
-		set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+	if (is_array($_sidebars_widgets)) {
+		set_theme_mod('sidebars_widgets', array('time' => time(), 'data' => $_sidebars_widgets));
 	}
 
-	$old_theme  = wp_get_theme();
-	$new_theme = wp_get_theme( $stylesheet );
+	$old_theme = wp_get_theme();
+	$new_theme = wp_get_theme($stylesheet);
 
-	if ( func_num_args() > 1 ) {
+	if (func_num_args() > 1) {
 		$template = $stylesheet;
-		$stylesheet = func_get_arg( 1 );
+		$stylesheet = func_get_arg(1);
 	} else {
 		$template = $new_theme->get_template();
 	}
 
-	update_option( 'template', $template );
-	update_option( 'stylesheet', $stylesheet );
+	update_option('template', $template);
+	update_option('stylesheet', $stylesheet);
 
-	if ( count( $wp_theme_directories ) > 1 ) {
-		update_option( 'template_root', get_raw_theme_root( $template, true ) );
-		update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
+	if (count($wp_theme_directories) > 1) {
+		update_option('template_root', get_raw_theme_root($template, true));
+		update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
 	} else {
-		delete_option( 'template_root' );
-		delete_option( 'stylesheet_root' );
+		delete_option('template_root');
+		delete_option('stylesheet_root');
 	}
 
-	$new_name  = $new_theme->get('Name');
+	$new_name = $new_theme->get('Name');
 
-	update_option( 'current_theme', $new_name );
+	update_option('current_theme', $new_name);
 
 	// Migrate from the old mods_{name} option to theme_mods_{slug}.
-	if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
-		$default_theme_mods = (array) get_option( 'mods_' . $new_name );
-		add_option( "theme_mods_$stylesheet", $default_theme_mods );
+	if (is_admin() && false === get_option('theme_mods_'.$stylesheet)) {
+		$default_theme_mods = (array) get_option('mods_'.$new_name);
+		add_option("theme_mods_$stylesheet", $default_theme_mods);
 	} else {
 		/*
 		 * Since retrieve_widgets() is called when initializing a theme in the Customizer,
 		 * we need to to remove the theme mods to avoid overwriting changes made via
 		 * the Customizer when accessing wp-admin/widgets.php.
 		 */
-		if ( 'wp_ajax_customize_save' === current_action() ) {
-			remove_theme_mod( 'sidebars_widgets' );
+		if ('wp_ajax_customize_save' === current_action()) {
+			remove_theme_mod('sidebars_widgets');
 		}
 	}
 
-	update_option( 'theme_switched', $old_theme->get_stylesheet() );
+	update_option('theme_switched', $old_theme->get_stylesheet());
 	/**
 	 * Fires after the theme is switched.
 	 *
@@ -737,7 +737,7 @@ 
 	 * @param string   $new_name  Name of the new theme.
 	 * @param WP_Theme $new_theme WP_Theme instance of the new theme.
 	 */
-	do_action( 'switch_theme', $new_name, $new_theme );
+	do_action('switch_theme', $new_name, $new_theme);
 }
 
 /**
@@ -761,21 +761,21 @@ 
 	 *
 	 * @param bool true Validation flag to check the current theme.
 	 */
-	if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) )
+	if (defined('WP_INSTALLING') || ! apply_filters('validate_current_theme', true))
 		return true;
 
-	if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
-		switch_theme( WP_DEFAULT_THEME );
+	if (get_template() != WP_DEFAULT_THEME && ! file_exists(get_template_directory().'/index.php')) {
+		switch_theme(WP_DEFAULT_THEME);
 		return false;
 	}
 
-	if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
-		switch_theme( WP_DEFAULT_THEME );
+	if (get_stylesheet() != WP_DEFAULT_THEME && ! file_exists(get_template_directory().'/style.css')) {
+		switch_theme(WP_DEFAULT_THEME);
 		return false;
 	}
 
-	if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
-		switch_theme( WP_DEFAULT_THEME );
+	if (is_child_theme() && ! file_exists(get_stylesheet_directory().'/style.css')) {
+		switch_theme(WP_DEFAULT_THEME);
 		return false;
 	}
 
@@ -790,16 +790,16 @@ 
  * @return array|void Theme modifications.
  */
 function get_theme_mods() {
-	$theme_slug = get_option( 'stylesheet' );
-	$mods = get_option( "theme_mods_$theme_slug" );
-	if ( false === $mods ) {
-		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
+	$theme_slug = get_option('stylesheet');
+	$mods = get_option("theme_mods_$theme_slug");
+	if (false === $mods) {
+		$theme_name = get_option('current_theme');
+		if (false === $theme_name)
 			$theme_name = wp_get_theme()->get('Name');
-		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
-		if ( is_admin() && false !== $mods ) {
-			update_option( "theme_mods_$theme_slug", $mods );
-			delete_option( "mods_$theme_name" );
+		$mods = get_option("mods_$theme_name"); // Deprecated location.
+		if (is_admin() && false !== $mods) {
+			update_option("theme_mods_$theme_slug", $mods);
+			delete_option("mods_$theme_name");
 		}
 	}
 	return $mods;
@@ -819,10 +819,10 @@ 
  * @param bool|string $default
  * @return string
  */
-function get_theme_mod( $name, $default = false ) {
+function get_theme_mod($name, $default = false) {
 	$mods = get_theme_mods();
 
-	if ( isset( $mods[$name] ) ) {
+	if (isset($mods[$name])) {
 		/**
 		 * Filter the theme modification, or 'theme_mod', value.
 		 *
@@ -835,14 +835,14 @@ 
 		 *
 		 * @param string $current_mod The value of the current theme modification.
 		 */
-		return apply_filters( "theme_mod_{$name}", $mods[$name] );
+		return apply_filters("theme_mod_{$name}", $mods[$name]);
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if (is_string($default))
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 	/** This filter is documented in wp-includes/theme.php */
-	return apply_filters( "theme_mod_{$name}", $default );
+	return apply_filters("theme_mod_{$name}", $default);
 }
 
 /**
@@ -853,9 +853,9 @@ 
  * @param string $name  Theme modification name.
  * @param mixed  $value Theme modification value.
  */
-function set_theme_mod( $name, $value ) {
+function set_theme_mod($name, $value) {
 	$mods = get_theme_mods();
-	$old_value = isset( $mods[ $name ] ) ? $mods[ $name ] : false;
+	$old_value = isset($mods[$name]) ? $mods[$name] : false;
 
 	/**
 	 * Filter the theme mod value on save.
@@ -869,10 +869,10 @@ 
 	 * @param string $value     The new value of the theme mod.
 	 * @param string $old_value The current value of the theme mod.
 	 */
-	$mods[ $name ] = apply_filters( "pre_set_theme_mod_$name", $value, $old_value );
+	$mods[$name] = apply_filters("pre_set_theme_mod_$name", $value, $old_value);
 
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -885,20 +885,20 @@ 
  *
  * @param string $name Theme modification name.
  */
-function remove_theme_mod( $name ) {
+function remove_theme_mod($name) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
+	if ( ! isset($mods[$name]))
 		return;
 
-	unset( $mods[ $name ] );
+	unset($mods[$name]);
 
-	if ( empty( $mods ) ) {
+	if (empty($mods)) {
 		remove_theme_mods();
 		return;
 	}
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -907,13 +907,13 @@ 
  * @since 2.1.0
  */
 function remove_theme_mods() {
-	delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+	delete_option('theme_mods_'.get_option('stylesheet'));
 
 	// Old style.
-	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
+	$theme_name = get_option('current_theme');
+	if (false === $theme_name)
 		$theme_name = wp_get_theme()->get('Name');
-	delete_option( 'mods_' . $theme_name );
+	delete_option('mods_'.$theme_name);
 }
 
 /**
@@ -924,7 +924,7 @@ 
  * @return string
  */
 function get_header_textcolor() {
-	return get_theme_mod('header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	return get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 }
 
 /**
@@ -944,10 +944,10 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
+	if ( ! current_theme_supports('custom-header', 'header-text'))
 		return false;
 
-	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	$text_color = get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 	return 'blank' !== $text_color;
 }
 
@@ -972,15 +972,15 @@ 
  * @return string|false
  */
 function get_header_image() {
-	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+	$url = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'remove-header' == $url )
+	if ('remove-header' == $url)
 		return false;
 
-	if ( is_random_header_image() )
+	if (is_random_header_image())
 		$url = get_random_header_image();
 
-	return esc_url_raw( set_url_scheme( $url ) );
+	return esc_url_raw(set_url_scheme($url));
 }
 
 /**
@@ -998,29 +998,29 @@ 
 function _get_random_header_data() {
 	static $_wp_random_header = null;
 
-	if ( empty( $_wp_random_header ) ) {
+	if (empty($_wp_random_header)) {
 		global $_wp_default_headers;
-		$header_image_mod = get_theme_mod( 'header_image', '' );
+		$header_image_mod = get_theme_mod('header_image', '');
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
+		if ('random-uploaded-image' == $header_image_mod)
 			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
-			if ( 'random-default-image' == $header_image_mod ) {
+		elseif ( ! empty($_wp_default_headers)) {
+			if ('random-default-image' == $header_image_mod) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
+				if (current_theme_supports('custom-header', 'random-default'))
 					$headers = $_wp_default_headers;
 			}
 		}
 
-		if ( empty( $headers ) )
+		if (empty($headers))
 			return new stdClass;
 
-		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
+		$_wp_random_header = (object) $headers[array_rand($headers)];
 
-		$_wp_random_header->url =  sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
-		$_wp_random_header->thumbnail_url =  sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$_wp_random_header->url = sprintf($_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri());
+		$_wp_random_header->thumbnail_url = sprintf($_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri());
 	}
 	return $_wp_random_header;
 }
@@ -1034,7 +1034,7 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
+	if (empty($random_image->url))
 		return '';
 	return $random_image->url;
 }
@@ -1051,16 +1051,16 @@ 
  * @param string $type The random pool to use. any|default|uploaded
  * @return bool
  */
-function is_random_header_image( $type = 'any' ) {
-	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+function is_random_header_image($type = 'any') {
+	$header_image_mod = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
+	if ('any' == $type) {
+		if ('random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ('' != get_random_header_image() && empty($header_image_mod)))
 			return true;
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
+		if ("random-$type-image" == $header_image_mod)
 			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+		elseif ('default' == $type && empty($header_image_mod) && '' != get_random_header_image())
 			return true;
 	}
 
@@ -1074,8 +1074,8 @@ 
  */
 function header_image() {
 	$image = get_header_image();
-	if ( $image ) {
-		echo esc_url( $image );
+	if ($image) {
+		echo esc_url($image);
 	}
 }
 
@@ -1090,25 +1090,25 @@ 
 	$header_images = array();
 
 	// @todo caching
-	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+	$headers = get_posts(array('post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true));
 
-	if ( empty( $headers ) )
+	if (empty($headers))
 		return array();
 
-	foreach ( (array) $headers as $header ) {
-		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
-		$header_data = wp_get_attachment_metadata( $header->ID );
+	foreach ((array) $headers as $header) {
+		$url = esc_url_raw(wp_get_attachment_url($header->ID));
+		$header_data = wp_get_attachment_metadata($header->ID);
 		$header_index = basename($url);
 
 		$header_images[$header_index] = array();
 		$header_images[$header_index]['attachment_id'] = $header->ID;
-		$header_images[$header_index]['url'] =  $url;
+		$header_images[$header_index]['url'] = $url;
 		$header_images[$header_index]['thumbnail_url'] = $url;
-		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
+		$header_images[$header_index]['alt_text'] = get_post_meta($header->ID, '_wp_attachment_image_alt', true);
 
-		if ( isset( $header_data['width'] ) )
+		if (isset($header_data['width']))
 			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
+		if (isset($header_data['height']))
 			$header_images[$header_index]['height'] = $header_data['height'];
 	}
 
@@ -1127,21 +1127,21 @@ 
 function get_custom_header() {
 	global $_wp_default_headers;
 
-	if ( is_random_header_image() ) {
+	if (is_random_header_image()) {
 		$data = _get_random_header_data();
 	} else {
-		$data = get_theme_mod( 'header_image_data' );
-		if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
-			$directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$data = get_theme_mod('header_image_data');
+		if ( ! $data && current_theme_supports('custom-header', 'default-image')) {
+			$directory_args = array(get_template_directory_uri(), get_stylesheet_directory_uri());
 			$data = array();
-			$data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
-			if ( ! empty( $_wp_default_headers ) ) {
-				foreach ( (array) $_wp_default_headers as $default_header ) {
-					$url = vsprintf( $default_header['url'], $directory_args );
-					if ( $data['url'] == $url ) {
+			$data['url'] = $data['thumbnail_url'] = vsprintf(get_theme_support('custom-header', 'default-image'), $directory_args);
+			if ( ! empty($_wp_default_headers)) {
+				foreach ((array) $_wp_default_headers as $default_header) {
+					$url = vsprintf($default_header['url'], $directory_args);
+					if ($data['url'] == $url) {
 						$data = $default_header;
 						$data['url'] = $url;
-						$data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
+						$data['thumbnail_url'] = vsprintf($data['thumbnail_url'], $directory_args);
 						break;
 					}
 				}
@@ -1152,10 +1152,10 @@ 
 	$default = array(
 		'url'           => '',
 		'thumbnail_url' => '',
-		'width'         => get_theme_support( 'custom-header', 'width' ),
-		'height'        => get_theme_support( 'custom-header', 'height' ),
+		'width'         => get_theme_support('custom-header', 'width'),
+		'height'        => get_theme_support('custom-header', 'height'),
 	);
-	return (object) wp_parse_args( $data, $default );
+	return (object) wp_parse_args($data, $default);
 }
 
 /**
@@ -1167,10 +1167,10 @@ 
  *
  * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys.
  */
-function register_default_headers( $headers ) {
+function register_default_headers($headers) {
 	global $_wp_default_headers;
 
-	$_wp_default_headers = array_merge( (array) $_wp_default_headers, (array) $headers );
+	$_wp_default_headers = array_merge((array) $_wp_default_headers, (array) $headers);
 }
 
 /**
@@ -1188,12 +1188,12 @@ 
  * @return bool|void A single header returns true on success, false on failure.
  *                   There is currently no return value for multiple headers.
  */
-function unregister_default_headers( $header ) {
+function unregister_default_headers($header) {
 	global $_wp_default_headers;
-	if ( is_array( $header ) ) {
-		array_map( 'unregister_default_headers', $header );
-	} elseif ( isset( $_wp_default_headers[ $header ] ) ) {
-		unset( $_wp_default_headers[ $header ] );
+	if (is_array($header)) {
+		array_map('unregister_default_headers', $header);
+	} elseif (isset($_wp_default_headers[$header])) {
+		unset($_wp_default_headers[$header]);
 		return true;
 	} else {
 		return false;
@@ -1208,7 +1208,7 @@ 
  * @return string
  */
 function get_background_image() {
-	return get_theme_mod('background_image', get_theme_support( 'custom-background', 'default-image' ) );
+	return get_theme_mod('background_image', get_theme_support('custom-background', 'default-image'));
 }
 
 /**
@@ -1228,7 +1228,7 @@ 
  * @return string
  */
 function get_background_color() {
-	return get_theme_mod('background_color', get_theme_support( 'custom-background', 'default-color' ) );
+	return get_theme_mod('background_color', get_theme_support('custom-background', 'default-color'));
 }
 
 /**
@@ -1248,44 +1248,44 @@ 
  */
 function _custom_background_cb() {
 	// $background is the saved custom image, or the default image.
-	$background = set_url_scheme( get_background_image() );
+	$background = set_url_scheme(get_background_image());
 
 	// $color is the saved custom color.
 	// A default has to be specified in style.css. It will not be printed here.
 	$color = get_background_color();
 
-	if ( $color === get_theme_support( 'custom-background', 'default-color' ) ) {
+	if ($color === get_theme_support('custom-background', 'default-color')) {
 		$color = false;
 	}
 
-	if ( ! $background && ! $color )
+	if ( ! $background && ! $color)
 		return;
 
 	$style = $color ? "background-color: #$color;" : '';
 
-	if ( $background ) {
+	if ($background) {
 		$image = " background-image: url('$background');";
 
-		$repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
+		$repeat = get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'));
+		if ( ! in_array($repeat, array('no-repeat', 'repeat-x', 'repeat-y', 'repeat')))
 			$repeat = 'repeat';
 		$repeat = " background-repeat: $repeat;";
 
-		$position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
+		$position = get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'));
+		if ( ! in_array($position, array('center', 'right', 'left')))
 			$position = 'left';
 		$position = " background-position: top $position;";
 
-		$attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
+		$attachment = get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'));
+		if ( ! in_array($attachment, array('fixed', 'scroll')))
 			$attachment = 'scroll';
 		$attachment = " background-attachment: $attachment;";
 
-		$style .= $image . $repeat . $position . $attachment;
+		$style .= $image.$repeat.$position.$attachment;
 	}
 ?>
 <style type="text/css" id="custom-background-css">
-body.custom-background { <?php echo trim( $style ); ?> }
+body.custom-background { <?php echo trim($style); ?> }
 </style>
 <?php
 }
@@ -1312,21 +1312,21 @@ 
  * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
-function add_editor_style( $stylesheet = 'editor-style.css' ) {
-	add_theme_support( 'editor-style' );
+function add_editor_style($stylesheet = 'editor-style.css') {
+	add_theme_support('editor-style');
 
-	if ( ! is_admin() )
+	if ( ! is_admin())
 		return;
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
 	$stylesheet    = (array) $stylesheet;
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$rtl_stylesheet = str_replace('.css', '-rtl.css', $stylesheet[0]);
 		$stylesheet[] = $rtl_stylesheet;
 	}
 
-	$editor_styles = array_merge( $editor_styles, $stylesheet );
+	$editor_styles = array_merge($editor_styles, $stylesheet);
 }
 
 /**
@@ -1339,10 +1339,10 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
+	if ( ! current_theme_supports('editor-style'))
 		return false;
-	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
+	_remove_theme_support('editor-style');
+	if (is_admin())
 		$GLOBALS['editor_styles'] = array();
 	return true;
 }
@@ -1359,35 +1359,35 @@ 
 function get_editor_stylesheets() {
 	$stylesheets = array();
 	// load editor_style.css if the current theme supports it
-	if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
+	if ( ! empty($GLOBALS['editor_styles']) && is_array($GLOBALS['editor_styles'])) {
 		$editor_styles = $GLOBALS['editor_styles'];
 
-		$editor_styles = array_unique( array_filter( $editor_styles ) );
+		$editor_styles = array_unique(array_filter($editor_styles));
 		$style_uri = get_stylesheet_directory_uri();
 		$style_dir = get_stylesheet_directory();
 
 		// Support externally referenced styles (like, say, fonts).
-		foreach ( $editor_styles as $key => $file ) {
-			if ( preg_match( '~^(https?:)?//~', $file ) ) {
-				$stylesheets[] = esc_url_raw( $file );
-				unset( $editor_styles[ $key ] );
+		foreach ($editor_styles as $key => $file) {
+			if (preg_match('~^(https?:)?//~', $file)) {
+				$stylesheets[] = esc_url_raw($file);
+				unset($editor_styles[$key]);
 			}
 		}
 
 		// Look in a parent theme first, that way child theme CSS overrides.
-		if ( is_child_theme() ) {
+		if (is_child_theme()) {
 			$template_uri = get_template_directory_uri();
 			$template_dir = get_template_directory();
 
-			foreach ( $editor_styles as $key => $file ) {
-				if ( $file && file_exists( "$template_dir/$file" ) ) {
+			foreach ($editor_styles as $key => $file) {
+				if ($file && file_exists("$template_dir/$file")) {
 					$stylesheets[] = "$template_uri/$file";
 				}
 			}
 		}
 
-		foreach ( $editor_styles as $file ) {
-			if ( $file && file_exists( "$style_dir/$file" ) ) {
+		foreach ($editor_styles as $file) {
+			if ($file && file_exists("$style_dir/$file")) {
 				$stylesheets[] = "$style_uri/$file";
 			}
 		}
@@ -1400,7 +1400,7 @@ 
 	 *
 	 * @param array $stylesheets Array of stylesheets to be applied to the editor.
 	 */
-	return apply_filters( 'editor_stylesheets', $stylesheets );
+	return apply_filters('editor_stylesheets', $stylesheets);
 }
 
 /**
@@ -1417,45 +1417,45 @@ 
  * @param string $feature The feature being added.
  * @return void|bool False on failure, void otherwise.
  */
-function add_theme_support( $feature ) {
+function add_theme_support($feature) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
+	if (func_num_args() == 1)
 		$args = true;
 	else
-		$args = array_slice( func_get_args(), 1 );
+		$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-formats' :
-			if ( is_array( $args[0] ) ) {
+			if (is_array($args[0])) {
 				$post_formats = get_post_format_slugs();
-				unset( $post_formats['standard'] );
+				unset($post_formats['standard']);
 
-				$args[0] = array_intersect( $args[0], array_keys( $post_formats ) );
+				$args[0] = array_intersect($args[0], array_keys($post_formats));
 			}
 			break;
 
 		case 'html5' :
 			// You can't just pass 'html5', you need to pass an array of types.
-			if ( empty( $args[0] ) ) {
+			if (empty($args[0])) {
 				// Build an array of types for back-compat.
-				$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
-			} elseif ( ! is_array( $args[0] ) ) {
-				_doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' );
+				$args = array(0 => array('comment-list', 'comment-form', 'search-form'));
+			} elseif ( ! is_array($args[0])) {
+				_doing_it_wrong("add_theme_support( 'html5' )", __('You need to pass an array of types.'), '3.6.1');
 				return false;
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if (isset($_wp_theme_features['html5']))
+				$args[0] = array_merge($_wp_theme_features['html5'][0], $args[0]);
 			break;
 
 		case 'custom-header-uploads' :
-			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
+			return add_theme_support('custom-header', array('uploads' => true));
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image' => '',
@@ -1472,18 +1472,18 @@ 
 				'admin-preview-callback' => '',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-header']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-header'][0], $args[0]);
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -1491,48 +1491,48 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backwards compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
+			if (defined('NO_HEADER_TEXT'))
 				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			elseif (isset($args[0]['header-text']))
+				define('NO_HEADER_TEXT', empty($args[0]['header-text']));
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
+			if (defined('HEADER_IMAGE_WIDTH'))
 				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			elseif (isset($args[0]['width']))
+				define('HEADER_IMAGE_WIDTH', (int) $args[0]['width']);
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
+			if (defined('HEADER_IMAGE_HEIGHT'))
 				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			elseif (isset($args[0]['height']))
+				define('HEADER_IMAGE_HEIGHT', (int) $args[0]['height']);
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
+			if (defined('HEADER_TEXTCOLOR'))
 				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			elseif (isset($args[0]['default-text-color']))
+				define('HEADER_TEXTCOLOR', $args[0]['default-text-color']);
 
-			if ( defined( 'HEADER_IMAGE' ) )
+			if (defined('HEADER_IMAGE'))
 				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']))
+				define('HEADER_IMAGE', $args[0]['default-image']);
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
+			if ($jit && ! empty($args[0]['default-image']))
 				$args[0]['random-default'] = false;
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
-			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
+			if ($jit) {
+				if (empty($args[0]['width']) && empty($args[0]['flex-width']))
 					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
+				if (empty($args[0]['height']) && empty($args[0]['flex-height']))
 					$args[0]['flex-height'] = true;
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image'          => '',
@@ -1545,41 +1545,41 @@ 
 				'admin-preview-callback' => '',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-background']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-background'][0], $args[0]);
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
+			if (defined('BACKGROUND_COLOR'))
 				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			elseif (isset($args[0]['default-color']) || $jit)
+				define('BACKGROUND_COLOR', $args[0]['default-color']);
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
+			if (defined('BACKGROUND_IMAGE'))
 				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']) || $jit)
+				define('BACKGROUND_IMAGE', $args[0]['default-image']);
 
 			break;
 
 		// Ensure that 'title-tag' is accessible in the admin.
 		case 'title-tag' :
 			// Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
-			if ( did_action( 'wp_loaded' ) ) {
+			if (did_action('wp_loaded')) {
 				/* translators: 1: Theme support 2: hook name */
-				_doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
-					'<code>title-tag</code>', '<code>wp_loaded</code>' ), '4.1' );
+				_doing_it_wrong("add_theme_support( 'title-tag' )", sprintf(__('Theme support for %1$s should be registered before the %2$s hook.'),
+					'<code>title-tag</code>', '<code>wp_loaded</code>'), '4.1');
 
 				return false;
 			}
 	}
 
-	$_wp_theme_features[ $feature ] = $args;
+	$_wp_theme_features[$feature] = $args;
 }
 
 /**
@@ -1594,30 +1594,30 @@ 
 function _custom_header_background_just_in_time() {
 	global $custom_image_header, $custom_background;
 
-	if ( current_theme_supports( 'custom-header' ) ) {
+	if (current_theme_supports('custom-header')) {
 		// In case any constants were defined after an add_custom_image_header() call, re-run.
-		add_theme_support( 'custom-header', array( '__jit' => true ) );
+		add_theme_support('custom-header', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-header');
+		if ($args[0]['wp-head-callback'])
+			add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-header.php' );
-			$custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-header.php');
+			$custom_image_header = new Custom_Image_Header($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background' ) ) {
+	if (current_theme_supports('custom-background')) {
 		// In case any constants were defined after an add_custom_background() call, re-run.
-		add_theme_support( 'custom-background', array( '__jit' => true ) );
+		add_theme_support('custom-background', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-background' );
-		add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-background');
+		add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-background.php' );
-			$custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-background.php');
+			$custom_background = new Custom_Background($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 }
@@ -1632,24 +1632,24 @@ 
  * @param string $feature the feature to check
  * @return mixed The array of extra arguments or the value for the registered feature.
  */
-function get_theme_support( $feature ) {
+function get_theme_support($feature) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if (func_num_args() <= 1)
+		return $_wp_theme_features[$feature];
 
-	$args = array_slice( func_get_args(), 1 );
-	switch ( $feature ) {
+	$args = array_slice(func_get_args(), 1);
+	switch ($feature) {
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if (isset($_wp_theme_features[$feature][0][$args[0]]))
+				return $_wp_theme_features[$feature][0][$args[0]];
 			return false;
 
 		default :
-			return $_wp_theme_features[ $feature ];
+			return $_wp_theme_features[$feature];
 	}
 }
 
@@ -1664,12 +1664,12 @@ 
  * @param string $feature the feature being added
  * @return bool|void Whether feature was removed.
  */
-function remove_theme_support( $feature ) {
+function remove_theme_support($feature) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
+	if (in_array($feature, array('editor-style', 'widgets', 'menus')))
 		return false;
 
-	return _remove_theme_support( $feature );
+	return _remove_theme_support($feature);
 }
 
 /**
@@ -1684,42 +1684,42 @@ 
  *
  * @param string $feature
  */
-function _remove_theme_support( $feature ) {
+function _remove_theme_support($feature) {
 	global $_wp_theme_features;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
+			if ( ! isset($_wp_theme_features['custom-header']))
 				return false;
-			add_theme_support( 'custom-header', array( 'uploads' => false ) );
+			add_theme_support('custom-header', array('uploads' => false));
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-header' );
-			if ( $support[0]['wp-head-callback'] )
-				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-			remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
-			unset( $GLOBALS['custom_image_header'] );
+			$support = get_theme_support('custom-header');
+			if ($support[0]['wp-head-callback'])
+				remove_action('wp_head', $support[0]['wp-head-callback']);
+			remove_action('admin_menu', array($GLOBALS['custom_image_header'], 'init'));
+			unset($GLOBALS['custom_image_header']);
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-background' );
-			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
-			unset( $GLOBALS['custom_background'] );
+			$support = get_theme_support('custom-background');
+			remove_action('wp_head', $support[0]['wp-head-callback']);
+			remove_action('admin_menu', array($GLOBALS['custom_background'], 'init'));
+			unset($GLOBALS['custom_background']);
 			break;
 	}
 
-	unset( $_wp_theme_features[ $feature ] );
+	unset($_wp_theme_features[$feature]);
 	return true;
 }
 
@@ -1733,38 +1733,38 @@ 
  * @param string $feature the feature being checked
  * @return bool
  */
-function current_theme_supports( $feature ) {
+function current_theme_supports($feature) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ('custom-header-uploads' == $feature)
+		return current_theme_supports('custom-header', 'uploads');
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	if ( 'title-tag' == $feature ) {
+	if ('title-tag' == $feature) {
 		// Don't confirm support unless called internally.
 		$trace = debug_backtrace();
-		if ( ! in_array( $trace[1]['function'], array( '_wp_render_title_tag', 'wp_title' ) ) ) {
+		if ( ! in_array($trace[1]['function'], array('_wp_render_title_tag', 'wp_title'))) {
 			return false;
 		}
 	}
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
+	if (func_num_args() <= 1)
 		return true;
 
-	$args = array_slice( func_get_args(), 1 );
+	$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-thumbnails':
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if (true === $_wp_theme_features[$feature])  // Registered for all types
 				return true;
 			$content_type = $args[0];
-			return in_array( $content_type, $_wp_theme_features[$feature][0] );
+			return in_array($content_type, $_wp_theme_features[$feature][0]);
 
 		case 'html5':
 		case 'post-formats':
@@ -1774,14 +1774,14 @@ 
 			// Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
 
 			$type = $args[0];
-			return in_array( $type, $_wp_theme_features[$feature][0] );
+			return in_array($type, $_wp_theme_features[$feature][0]);
 
 		case 'custom-header':
 		case 'custom-background' :
 			// specific custom header and background capabilities can be registered by passing
 			// an array to add_theme_support()
 			$header_support = $args[0];
-			return ( isset( $_wp_theme_features[$feature][0][$header_support] ) && $_wp_theme_features[$feature][0][$header_support] );
+			return (isset($_wp_theme_features[$feature][0][$header_support]) && $_wp_theme_features[$feature][0][$header_support]);
 	}
 
 	/**
@@ -1797,7 +1797,7 @@ 
 	 * @param array  $args    Array of arguments for the feature.
 	 * @param string $feature The theme feature.
 	 */
-	return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature] );
+	return apply_filters("current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature]);
 }
 
 /**
@@ -1809,9 +1809,9 @@ 
  * @param string $include Path to the file.
  * @return bool True if the current theme supports the supplied feature, false otherwise.
  */
-function require_if_theme_supports( $feature, $include ) {
-	if ( current_theme_supports( $feature ) ) {
-		require ( $include );
+function require_if_theme_supports($feature, $include) {
+	if (current_theme_supports($feature)) {
+		require ($include);
 		return true;
 	}
 	return false;
@@ -1829,18 +1829,18 @@ 
  *
  * @param int $id The attachment id.
  */
-function _delete_attachment_theme_mod( $id ) {
-	$attachment_image = wp_get_attachment_url( $id );
+function _delete_attachment_theme_mod($id) {
+	$attachment_image = wp_get_attachment_url($id);
 	$header_image     = get_header_image();
 	$background_image = get_background_image();
 
-	if ( $header_image && $header_image == $attachment_image ) {
-		remove_theme_mod( 'header_image' );
-		remove_theme_mod( 'header_image_data' );
+	if ($header_image && $header_image == $attachment_image) {
+		remove_theme_mod('header_image');
+		remove_theme_mod('header_image_data');
 	}
 
-	if ( $background_image && $background_image == $attachment_image ) {
-		remove_theme_mod( 'background_image' );
+	if ($background_image && $background_image == $attachment_image) {
+		remove_theme_mod('background_image');
 	}
 }
 
@@ -1850,16 +1850,16 @@ 
  * @since 3.3.0
  */
 function check_theme_switched() {
-	if ( $stylesheet = get_option( 'theme_switched' ) ) {
-		$old_theme = wp_get_theme( $stylesheet );
+	if ($stylesheet = get_option('theme_switched')) {
+		$old_theme = wp_get_theme($stylesheet);
 
 		// Prevent retrieve_widgets() from running since Customizer already called it up front
-		if ( get_option( 'theme_switched_via_customizer' ) ) {
-			remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
-			update_option( 'theme_switched_via_customizer', false );
+		if (get_option('theme_switched_via_customizer')) {
+			remove_action('after_switch_theme', '_wp_sidebars_changed');
+			update_option('theme_switched_via_customizer', false);
 		}
 
-		if ( $old_theme->exists() ) {
+		if ($old_theme->exists()) {
 			/**
 			 * Fires on the first WP load after a theme switch if the old theme still exists.
 			 *
@@ -1873,13 +1873,13 @@ 
 			 * @param string   $old_name  Old theme name.
 			 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 			 */
-			do_action( 'after_switch_theme', $old_theme->get( 'Name' ), $old_theme );
+			do_action('after_switch_theme', $old_theme->get('Name'), $old_theme);
 		} else {
 			/** This action is documented in wp-includes/theme.php */
-			do_action( 'after_switch_theme', $stylesheet );
+			do_action('after_switch_theme', $stylesheet);
 		}
 
-		update_option( 'theme_switched', false );
+		update_option('theme_switched', false);
 	}
 }
 
@@ -1893,12 +1893,12 @@ 
  * @global WP_Customize_Manager $wp_customize
  */
 function _wp_customize_include() {
-	if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
-		|| ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
-	) )
+	if ( ! ((isset($_REQUEST['wp_customize']) && 'on' == $_REQUEST['wp_customize'])
+		|| (is_admin() && 'customize.php' == basename($_SERVER['PHP_SELF']))
+	))
 		return;
 
-	require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+	require_once ABSPATH.WPINC.'/class-wp-customize-manager.php';
 	$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 }
 
@@ -1908,33 +1908,33 @@ 
  * @since 3.4.0
  */
 function _wp_customize_loader_settings() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	$browser = array(
 		'mobile' => wp_is_mobile(),
-		'ios'    => wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] ),
+		'ios'    => wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']),
 	);
 
 	$settings = array(
-		'url'           => esc_url( admin_url( 'customize.php' ) ),
+		'url'           => esc_url(admin_url('customize.php')),
 		'isCrossDomain' => $cross_domain,
 		'browser'       => $browser,
 		'l10n'          => array(
-			'saveAlert'       => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'mainIframeTitle' => __( 'Customizer' ),
+			'saveAlert'       => __('The changes you made will be lost if you navigate away from this page.'),
+			'mainIframeTitle' => __('Customizer'),
 		),
 	);
 
-	$script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpCustomizeLoaderSettings = '.wp_json_encode($settings).';';
 
 	$wp_scripts = wp_scripts();
-	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
+	$data = $wp_scripts->get_data('customize-loader', 'data');
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'customize-loader', 'data', $script );
+	$wp_scripts->add_data('customize-loader', 'data', $script);
 }
 
 /**
@@ -1946,11 +1946,11 @@ 
  * 	                         The theme's stylesheet will be urlencoded if necessary.
  * @return string
  */
-function wp_customize_url( $stylesheet = null ) {
-	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
-	return esc_url( $url );
+function wp_customize_url($stylesheet = null) {
+	$url = admin_url('customize.php');
+	if ($stylesheet)
+		$url .= '?theme='.urlencode($stylesheet);
+	return esc_url($url);
 }
 
 /**
@@ -1969,16 +1969,16 @@ 
  * @since 3.4.0
  */
 function wp_customize_support_script() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	?>
 	<script type="text/javascript">
 		(function() {
 			var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
 
-<?php		if ( $cross_domain ): ?>
+<?php		if ($cross_domain): ?>
 			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
 <?php		else: ?>
 			request = true;
@@ -2003,5 +2003,5 @@ 
 function is_customize_preview() {
 	global $wp_customize;
 
-	return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+	return ($wp_customize instanceof WP_Customize_Manager) && $wp_customize->is_preview();
 }

Braces +310 added lines, -219 removed lines

@@ -41,41 +41,46 @@ 
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
+							$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			}
 			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
-		return array();
+	if ( empty( $theme_directories ) ) {
+			return array();
+	}
 
 	if ( is_multisite() && null !== $args['allowed'] ) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
-		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ( 'network' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
+		} elseif ( 'site' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
+		} elseif ( $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		} else {
+					$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		}
 	}
 
 	$themes = array();
 	static $_themes = array();
 
 	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
-		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) ) {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+		} else {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		}
 	}
 
 	if ( null !== $args['errors'] ) {
 		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+			if ( $wp_theme->errors() != $args['errors'] ) {
+							unset( $themes[ $theme ] );
+			}
 		}
 	}
 
@@ -97,15 +102,17 @@ 
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
-		$stylesheet = get_stylesheet();
+	if ( empty( $stylesheet ) ) {
+			$stylesheet = get_stylesheet();
+	}
 
 	if ( empty( $theme_root ) ) {
 		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( false === $theme_root ) {
+					$theme_root = WP_CONTENT_DIR . '/themes';
+		} elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	}
 
 	return new WP_Theme( $stylesheet, $theme_root );
@@ -118,12 +125,14 @@ 
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
 function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
+	if ( $clear_update_cache ) {
+			delete_site_transient( 'update_themes' );
+	}
 	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
-		$theme->cache_delete();
-}
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme ) {
+			$theme->cache_delete();
+	}
+	}
 
 /**
  * Whether a child theme is in use.
@@ -257,12 +266,13 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
-	else
-		$stylesheet_uri = '';
+	if ( file_exists("$dir/$locale.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
+	} elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
+	} else {
+			$stylesheet_uri = '';
+	}
 	/**
 	 * Filter the localized stylesheet URI.
 	 *
@@ -352,8 +362,9 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_roots = get_site_transient( 'theme_roots' );
 	if ( false === $theme_roots ) {
@@ -412,11 +423,13 @@ 
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
-		return false;
+	if ( empty( $wp_theme_directories ) ) {
+			return false;
+	}
 
-	if ( ! $force && isset( $found_themes ) )
-		return $found_themes;
+	if ( ! $force && isset( $found_themes ) ) {
+			return $found_themes;
+	}
 
 	$found_themes = array();
 
@@ -427,10 +440,11 @@ 
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
-		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+					$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+		} else {
+					$relative_theme_roots[ $theme_root ] = $theme_root;
+		}
 	}
 
 	/**
@@ -446,8 +460,9 @@ 
 		if ( is_array( $cached_roots ) ) {
 			foreach ( $cached_roots as $theme_dir => $theme_root ) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
-					continue;
+				if ( ! isset( $relative_theme_roots[ $theme_root ] ) ) {
+									continue;
+				}
 				$found_themes[ $theme_dir ] = array(
 					'theme_file' => $theme_dir . '/style.css',
 					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
@@ -455,8 +470,10 @@ 
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
-			$cache_expiration = 1800; // half hour
+		if ( ! is_int( $cache_expiration ) ) {
+					$cache_expiration = 1800;
+		}
+		// half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
@@ -471,8 +488,9 @@ 
 			continue;
 		}
 		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
-				continue;
+			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+							continue;
+			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
@@ -490,10 +508,12 @@ 
 					continue;
 				}
 				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
-						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
-						continue;
+					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+											continue;
+					}
+					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) ) {
+											continue;
+					}
 					$found_themes[ $dir . '/' . $sub_dir ] = array(
 						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
 						'theme_root' => $theme_root,
@@ -502,11 +522,12 @@ 
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
+				if ( ! $found_theme ) {
+									$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
+				}
 			}
 		}
 	}
@@ -520,8 +541,9 @@ 
 		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ( $theme_roots != get_site_transient( 'theme_roots' ) ) {
+			set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	}
 
 	return $found_themes;
 }
@@ -544,8 +566,9 @@ 
 	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	} else {
 		$theme_root = WP_CONTENT_DIR . '/themes';
 	}
@@ -578,20 +601,22 @@ 
 function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ( $stylesheet_or_template && ! $theme_root ) {
+			$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	}
 
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
-			else
-				$theme_root_uri = $theme_root;
+			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+							$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
+							$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
+							$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			} else {
+							$theme_root_uri = $theme_root;
+			}
 		} else {
 			$theme_root_uri = content_url( $theme_root );
 		}
@@ -626,23 +651,26 @@ 
 function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
 	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
-			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
-			$theme_root = get_option('template_root');
+		if ( get_option('stylesheet') == $stylesheet_or_template ) {
+					$theme_root = get_option('stylesheet_root');
+		} elseif ( get_option('template') == $stylesheet_or_template ) {
+					$theme_root = get_option('template_root');
+		}
 	}
 
 	if ( empty($theme_root) ) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
-			$theme_root = $theme_roots[$stylesheet_or_template];
+		if ( !empty($theme_roots[$stylesheet_or_template]) ) {
+					$theme_root = $theme_roots[$stylesheet_or_template];
+		}
 	}
 
 	return $theme_root;
@@ -655,8 +683,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
-		return;
+	if ( empty($stylesheet) ) {
+			return;
+	}
 	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
 }
 
@@ -761,8 +790,9 @@ 
 	 *
 	 * @param bool true Validation flag to check the current theme.
 	 */
-	if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) )
-		return true;
+	if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) ) {
+			return true;
+	}
 
 	if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
 		switch_theme( WP_DEFAULT_THEME );
@@ -794,8 +824,9 @@ 
 	$mods = get_option( "theme_mods_$theme_slug" );
 	if ( false === $mods ) {
 		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
-			$theme_name = wp_get_theme()->get('Name');
+		if ( false === $theme_name ) {
+					$theme_name = wp_get_theme()->get('Name');
+		}
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
 		if ( is_admin() && false !== $mods ) {
 			update_option( "theme_mods_$theme_slug", $mods );
@@ -838,8 +869,9 @@ 
 		return apply_filters( "theme_mod_{$name}", $mods[$name] );
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if ( is_string( $default ) ) {
+			$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	}
 
 	/** This filter is documented in wp-includes/theme.php */
 	return apply_filters( "theme_mod_{$name}", $default );
@@ -888,8 +920,9 @@ 
 function remove_theme_mod( $name ) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
-		return;
+	if ( ! isset( $mods[ $name ] ) ) {
+			return;
+	}
 
 	unset( $mods[ $name ] );
 
@@ -911,8 +944,9 @@ 
 
 	// Old style.
 	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
-		$theme_name = wp_get_theme()->get('Name');
+	if ( false === $theme_name ) {
+			$theme_name = wp_get_theme()->get('Name');
+	}
 	delete_option( 'mods_' . $theme_name );
 }
 
@@ -944,8 +978,9 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
-		return false;
+	if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
+			return false;
+	}
 
 	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
 	return 'blank' !== $text_color;
@@ -974,11 +1009,13 @@ 
 function get_header_image() {
 	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
-	if ( 'remove-header' == $url )
-		return false;
+	if ( 'remove-header' == $url ) {
+			return false;
+	}
 
-	if ( is_random_header_image() )
-		$url = get_random_header_image();
+	if ( is_random_header_image() ) {
+			$url = get_random_header_image();
+	}
 
 	return esc_url_raw( set_url_scheme( $url ) );
 }
@@ -1003,19 +1040,21 @@ 
 		$header_image_mod = get_theme_mod( 'header_image', '' );
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
-			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
+		if ( 'random-uploaded-image' == $header_image_mod ) {
+					$headers = get_uploaded_header_images();
+		} elseif ( ! empty( $_wp_default_headers ) ) {
 			if ( 'random-default-image' == $header_image_mod ) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
-					$headers = $_wp_default_headers;
+				if ( current_theme_supports( 'custom-header', 'random-default' ) ) {
+									$headers = $_wp_default_headers;
+				}
 			}
 		}
 
-		if ( empty( $headers ) )
-			return new stdClass;
+		if ( empty( $headers ) ) {
+					return new stdClass;
+		}
 
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
 
@@ -1034,8 +1073,9 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
-		return '';
+	if ( empty( $random_image->url ) ) {
+			return '';
+	}
 	return $random_image->url;
 }
 
@@ -1055,13 +1095,15 @@ 
 	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
 	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
-			return true;
+		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) ) {
+					return true;
+		}
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
-			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
-			return true;
+		if ( "random-$type-image" == $header_image_mod ) {
+					return true;
+		} elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() ) {
+					return true;
+		}
 	}
 
 	return false;
@@ -1092,8 +1134,9 @@ 
 	// @todo caching
 	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
 
-	if ( empty( $headers ) )
-		return array();
+	if ( empty( $headers ) ) {
+			return array();
+	}
 
 	foreach ( (array) $headers as $header ) {
 		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
@@ -1106,10 +1149,12 @@ 
 		$header_images[$header_index]['thumbnail_url'] = $url;
 		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
 
-		if ( isset( $header_data['width'] ) )
-			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
-			$header_images[$header_index]['height'] = $header_data['height'];
+		if ( isset( $header_data['width'] ) ) {
+					$header_images[$header_index]['width'] = $header_data['width'];
+		}
+		if ( isset( $header_data['height'] ) ) {
+					$header_images[$header_index]['height'] = $header_data['height'];
+		}
 	}
 
 	return $header_images;
@@ -1258,8 +1303,9 @@ 
 		$color = false;
 	}
 
-	if ( ! $background && ! $color )
-		return;
+	if ( ! $background && ! $color ) {
+			return;
+	}
 
 	$style = $color ? "background-color: #$color;" : '';
 
@@ -1267,18 +1313,21 @@ 
 		$image = " background-image: url('$background');";
 
 		$repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
-			$repeat = 'repeat';
+		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) ) {
+					$repeat = 'repeat';
+		}
 		$repeat = " background-repeat: $repeat;";
 
 		$position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
-			$position = 'left';
+		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) ) {
+					$position = 'left';
+		}
 		$position = " background-position: top $position;";
 
 		$attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
-			$attachment = 'scroll';
+		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) ) {
+					$attachment = 'scroll';
+		}
 		$attachment = " background-attachment: $attachment;";
 
 		$style .= $image . $repeat . $position . $attachment;
@@ -1315,8 +1364,9 @@ 
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
 	add_theme_support( 'editor-style' );
 
-	if ( ! is_admin() )
-		return;
+	if ( ! is_admin() ) {
+			return;
+	}
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
@@ -1339,11 +1389,13 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
-		return false;
+	if ( ! current_theme_supports( 'editor-style' ) ) {
+			return false;
+	}
 	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
-		$GLOBALS['editor_styles'] = array();
+	if ( is_admin() ) {
+			$GLOBALS['editor_styles'] = array();
+	}
 	return true;
 }
 
@@ -1420,10 +1472,11 @@ 
 function add_theme_support( $feature ) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
-		$args = true;
-	else
-		$args = array_slice( func_get_args(), 1 );
+	if ( func_num_args() == 1 ) {
+			$args = true;
+	} else {
+			$args = array_slice( func_get_args(), 1 );
+	}
 
 	switch ( $feature ) {
 		case 'post-formats' :
@@ -1446,16 +1499,18 @@ 
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if ( isset( $_wp_theme_features['html5'] ) ) {
+							$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			}
 			break;
 
 		case 'custom-header-uploads' :
 			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image' => '',
@@ -1477,13 +1532,15 @@ 
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-header'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			}
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -1491,48 +1548,57 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backwards compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
-				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			if ( defined( 'NO_HEADER_TEXT' ) ) {
+							$args[0]['header-text'] = ! NO_HEADER_TEXT;
+			} elseif ( isset( $args[0]['header-text'] ) ) {
+							define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			}
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
-				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			if ( defined( 'HEADER_IMAGE_WIDTH' ) ) {
+							$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
+			} elseif ( isset( $args[0]['width'] ) ) {
+							define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
-				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			if ( defined( 'HEADER_IMAGE_HEIGHT' ) ) {
+							$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
+			} elseif ( isset( $args[0]['height'] ) ) {
+							define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			}
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
-				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			if ( defined( 'HEADER_TEXTCOLOR' ) ) {
+							$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
+			} elseif ( isset( $args[0]['default-text-color'] ) ) {
+							define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE' ) )
-				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'HEADER_IMAGE' ) ) {
+							$args[0]['default-image'] = HEADER_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) ) {
+							define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			}
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
-				$args[0]['random-default'] = false;
+			if ( $jit && ! empty( $args[0]['default-image'] ) ) {
+							$args[0]['random-default'] = false;
+			}
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
 			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
-					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
-					$args[0]['flex-height'] = true;
+				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
+									$args[0]['flex-width'] = true;
+				}
+				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) ) {
+									$args[0]['flex-height'] = true;
+				}
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image'          => '',
@@ -1549,21 +1615,25 @@ 
 			unset( $args[0]['__jit'] );
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-background'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			}
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
-				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			if ( defined( 'BACKGROUND_COLOR' ) ) {
+							$args[0]['default-color'] = BACKGROUND_COLOR;
+			} elseif ( isset( $args[0]['default-color'] ) || $jit ) {
+							define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			}
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
-				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'BACKGROUND_IMAGE' ) ) {
+							$args[0]['default-image'] = BACKGROUND_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) || $jit ) {
+							define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			}
 
 			break;
 
@@ -1599,8 +1669,9 @@ 
 		add_theme_support( 'custom-header', array( '__jit' => true ) );
 
 		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		if ( $args[0]['wp-head-callback'] ) {
+					add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		}
 
 		if ( is_admin() ) {
 			require_once( ABSPATH . 'wp-admin/custom-header.php' );
@@ -1634,18 +1705,21 @@ 
  */
 function get_theme_support( $feature ) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if ( func_num_args() <= 1 ) {
+			return $_wp_theme_features[ $feature ];
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	switch ( $feature ) {
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) {
+							return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			}
 			return false;
 
 		default :
@@ -1666,8 +1740,9 @@ 
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
-		return false;
+	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
+			return false;
+	}
 
 	return _remove_theme_support( $feature );
 }
@@ -1689,29 +1764,34 @@ 
 
 	switch ( $feature ) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
-				return false;
+			if ( ! isset( $_wp_theme_features['custom-header'] ) ) {
+							return false;
+			}
 			add_theme_support( 'custom-header', array( 'uploads' => false ) );
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
 	switch ( $feature ) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-header' );
-			if ( $support[0]['wp-head-callback'] )
-				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+			if ( $support[0]['wp-head-callback'] ) {
+							remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+			}
 			remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
 			unset( $GLOBALS['custom_image_header'] );
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-background' );
 			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
 			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
@@ -1736,11 +1816,13 @@ 
 function current_theme_supports( $feature ) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ( 'custom-header-uploads' == $feature ) {
+			return current_theme_supports( 'custom-header', 'uploads' );
+	}
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
-		return false;
+	if ( !isset( $_wp_theme_features[$feature] ) ) {
+			return false;
+	}
 
 	if ( 'title-tag' == $feature ) {
 		// Don't confirm support unless called internally.
@@ -1751,8 +1833,9 @@ 
 	}
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
-		return true;
+	if ( func_num_args() <= 1 ) {
+			return true;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 
@@ -1761,8 +1844,10 @@ 
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if ( true === $_wp_theme_features[$feature] ) {
+				// Registered for all types
 				return true;
+			}
 			$content_type = $args[0];
 			return in_array( $content_type, $_wp_theme_features[$feature][0] );
 
@@ -1895,8 +1980,9 @@ 
 function _wp_customize_include() {
 	if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
 		|| ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
-	) )
-		return;
+	) ) {
+			return;
+	}
 
 	require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
 	$GLOBALS['wp_customize'] = new WP_Customize_Manager();
@@ -1931,8 +2017,9 @@ 
 
 	$wp_scripts = wp_scripts();
 	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'customize-loader', 'data', $script );
 }
@@ -1948,8 +2035,9 @@ 
  */
 function wp_customize_url( $stylesheet = null ) {
 	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
+	if ( $stylesheet ) {
+			$url .= '?theme=' . urlencode( $stylesheet );
+	}
 	return esc_url( $url );
 }
 
@@ -1980,9 +2068,12 @@ 
 
 <?php		if ( $cross_domain ): ?>
 			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
-<?php		else: ?>
+<?php		else {
+	: ?>
 			request = true;
-<?php		endif; ?>
+<?php		endif;
+}
+?>
 
 			b[c] = b[c].replace( rcs, ' ' );
 			b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;

src/wp-includes/user.php

Doc Comments +2 added lines, -3 removed lines

@@ -507,7 +507,6 @@ 
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param null|string|array $args Optional. The query variables.
 	 */
 	public function __construct( $query = null ) {
 		if ( ! empty( $query ) ) {
@@ -1095,7 +1094,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -1293,7 +1292,7 @@ 
  *
  * @param int    $user_id    User ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Metadata value.
+ * @param string  $meta_value Metadata value.
  * @param bool   $unique     Optional, default is false. Whether the same key should not be added.
  * @return int|false Meta ID on success, false on failure.
  */

Indentation +7 added lines, -7 removed lines

@@ -65,13 +65,13 @@ 
 	 *
 	 * @param bool  $secure_cookie Whether to use a secure sign-on cookie.
 	 * @param array $credentials {
- 	 *     Array of entered sign-on data.
- 	 *
- 	 *     @type string $user_login    Username.
- 	 *     @type string $user_password Password entered.
+	 *     Array of entered sign-on data.
+	 *
+	 *     @type string $user_login    Username.
+	 *     @type string $user_password Password entered.
 	 *     @type bool   $remember      Whether to 'remember' the user. Increases the time
 	 *                                 that the cookie will be kept. Default false.
- 	 * }
+	 * }
 	 */
 	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
 
@@ -1675,7 +1675,7 @@ 
 			 *
 			 * The dynamic portion of the hook name, `$field`, refers to the prefixed user
 			 * field being filtered, such as 'user_login', 'user_email', 'first_name', etc.
- 			 *
+			 *
 			 * @since 2.9.0
 			 *
 			 * @param mixed $value Value of the prefixed user field.
@@ -2390,7 +2390,7 @@ 
 	 * @since 2.9.0
 	 *
 	 * @param array   $methods Array of contact methods and their labels.
- 	 * @param WP_User $user    WP_User object.
+	 * @param WP_User $user    WP_User object.
 	 */
 	return apply_filters( 'user_contactmethods', $methods, $user );
 }

Spacing +528 added lines, -528 removed lines

@@ -25,17 +25,17 @@ 
  * @param string|bool $secure_cookie Optional. Whether to use secure cookie.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_signon( $credentials = array(), $secure_cookie = '' ) {
-	if ( empty($credentials) ) {
-		if ( ! empty($_POST['log']) )
+function wp_signon($credentials = array(), $secure_cookie = '') {
+	if (empty($credentials)) {
+		if ( ! empty($_POST['log']))
 			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
+		if ( ! empty($_POST['pwd']))
 			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
+		if ( ! empty($_POST['rememberme']))
 			$credentials['remember'] = $_POST['rememberme'];
 	}
 
-	if ( !empty($credentials['remember']) )
+	if ( ! empty($credentials['remember']))
 		$credentials['remember'] = true;
 	else
 		$credentials['remember'] = false;
@@ -53,9 +53,9 @@ 
 	 * @param string $user_login    Username, passed by reference.
 	 * @param string $user_password User password, passed by reference.
 	 */
-	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
+	do_action_ref_array('wp_authenticate', array(&$credentials['user_login'], &$credentials['user_password']));
 
-	if ( '' === $secure_cookie )
+	if ('' === $secure_cookie)
 		$secure_cookie = is_ssl();
 
 	/**
@@ -73,7 +73,7 @@ 
 	 *                                 that the cookie will be kept. Default false.
  	 * }
 	 */
-	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
+	$secure_cookie = apply_filters('secure_signon_cookie', $secure_cookie, $credentials);
 
 	global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie
 	$auth_secure_cookie = $secure_cookie;
@@ -82,8 +82,8 @@ 
 
 	$user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
 
-	if ( is_wp_error($user) ) {
-		if ( $user->get_error_codes() == array('empty_username', 'empty_password') ) {
+	if (is_wp_error($user)) {
+		if ($user->get_error_codes() == array('empty_username', 'empty_password')) {
 			$user = new WP_Error('', '');
 		}
 
@@ -99,7 +99,7 @@ 
 	 * @param string  $user_login Username.
 	 * @param WP_User $user       WP_User object of the logged-in user.
 	 */
-	do_action( 'wp_login', $user->user_login, $user );
+	do_action('wp_login', $user->user_login, $user);
 	return $user;
 }
 
@@ -114,20 +114,20 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_username_password($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
+	if (empty($username) || empty($password)) {
+		if (is_wp_error($user))
 			return $user;
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
+		if (empty($username))
 			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
 
-		if ( empty($password) )
+		if (empty($password))
 			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
 
 		return $error;
@@ -135,8 +135,8 @@ 
 
 	$user = get_user_by('login', $username);
 
-	if ( !$user )
-		return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>' ), wp_lostpassword_url() ) );
+	if ( ! $user)
+		return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>'), wp_lostpassword_url()));
 
 	/**
 	 * Filter whether the given user can be authenticated with the provided $password.
@@ -147,13 +147,13 @@ 
 	 *                                   callback failed authentication.
 	 * @param string           $password Password to check against the user.
 	 */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
+	$user = apply_filters('wp_authenticate_user', $user, $password);
+	if (is_wp_error($user))
 		return $user;
 
-	if ( !wp_check_password($password, $user->user_pass, $user->ID) )
-		return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>' ),
-		$username, wp_lostpassword_url() ) );
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID))
+		return new WP_Error('incorrect_password', sprintf(__('<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>'),
+		$username, wp_lostpassword_url()));
 
 	return $user;
 }
@@ -171,23 +171,23 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_cookie($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) && empty($password) ) {
+	if (empty($username) && empty($password)) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
+		if ($user_id)
 			return new WP_User($user_id);
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
+		if ($auth_secure_cookie)
 			$auth_cookie = SECURE_AUTH_COOKIE;
 		else
 			$auth_cookie = AUTH_COOKIE;
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
+		if ( ! empty($_COOKIE[$auth_cookie]))
 			return new WP_Error('expired_session', __('Please log in again.'));
 
 		// If the cookie is not set, be silent.
@@ -205,8 +205,8 @@ 
  * @param WP_User|WP_Error|null $user WP_User or WP_Error object from a previous callback. Default null.
  * @return WP_User|WP_Error WP_User on success, WP_Error if the user is considered a spammer.
  */
-function wp_authenticate_spam_check( $user ) {
-	if ( $user instanceof WP_User && is_multisite() ) {
+function wp_authenticate_spam_check($user) {
+	if ($user instanceof WP_User && is_multisite()) {
 		/**
 		 * Filter whether the user has been marked as a spammer.
 		 *
@@ -215,10 +215,10 @@ 
 		 * @param bool    $spammed Whether the user is considered a spammer.
 		 * @param WP_User $user    User to check against.
 		 */
-		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy(), $user );
+		$spammed = apply_filters('check_is_user_spammed', is_user_spammy(), $user);
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ($spammed)
+			return new WP_Error('spammer_account', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
 	}
 	return $user;
 }
@@ -238,16 +238,16 @@ 
  * @return int|false User ID if validated, false otherwise. If a user ID from
  *                   an earlier filter callback is received, that value is returned.
  */
-function wp_validate_logged_in_cookie( $user_id ) {
-	if ( $user_id ) {
+function wp_validate_logged_in_cookie($user_id) {
+	if ($user_id) {
 		return $user_id;
 	}
 
-	if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) ) {
+	if (is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE])) {
 		return false;
 	}
 
-	return wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' );
+	return wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in');
 }
 
 /**
@@ -265,12 +265,12 @@ 
  * @param bool         $public_only Optional. Whether to only return counts for public posts. Default false.
  * @return int Number of posts the user has written in this post type.
  */
-function count_user_posts( $userid, $post_type = 'post', $public_only = false ) {
+function count_user_posts($userid, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
-	$where = get_posts_by_author_sql( $post_type, true, $userid, $public_only );
+	$where = get_posts_by_author_sql($post_type, true, $userid, $public_only);
 
-	$count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
+	$count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts $where");
 
 	/**
 	 * Filter the number of posts a user has written.
@@ -284,7 +284,7 @@ 
 	 * @param string|array $post_types  Post types to count the number of posts for.
 	 * @param bool         $public_only Whether to limit counted posts to public posts.
 	 */
-	return apply_filters( 'get_usernumposts', $count, $userid, $post_type );
+	return apply_filters('get_usernumposts', $count, $userid, $post_type);
 }
 
 /**
@@ -299,24 +299,24 @@ 
  * @param bool         $public_only Optional. Only return counts for public posts.  Defaults to false.
  * @return array Amount of posts each user has written.
  */
-function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
+function count_many_users_posts($users, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
+	if (empty($users) || ! is_array($users))
 		return $count;
 
-	$userlist = implode( ',', array_map( 'absint', $users ) );
-	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
+	$userlist = implode(',', array_map('absint', $users));
+	$where = get_posts_by_author_sql($post_type, true, null, $public_only);
 
-	$result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
-	foreach ( $result as $row ) {
-		$count[ $row[0] ] = $row[1];
+	$result = $wpdb->get_results("SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N);
+	foreach ($result as $row) {
+		$count[$row[0]] = $row[1];
 	}
 
-	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+	foreach ($users as $id) {
+		if ( ! isset($count[$id]))
+			$count[$id] = 0;
 	}
 
 	return $count;
@@ -334,10 +334,10 @@ 
  * @return int The current user's ID
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
+	if ( ! function_exists('wp_get_current_user'))
 		return 0;
 	$user = wp_get_current_user();
-	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
+	return (isset($user->ID) ? (int) $user->ID : 0);
 }
 
 /**
@@ -359,23 +359,23 @@ 
  * @param string $deprecated Use get_option() to check for an option in the options table.
  * @return mixed User option value on success, false on failure.
  */
-function get_user_option( $option, $user = 0, $deprecated = '' ) {
+function get_user_option($option, $user = 0, $deprecated = '') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
-	if ( empty( $user ) )
+	if (empty($user))
 		$user = get_current_user_id();
 
-	if ( ! $user = get_userdata( $user ) )
+	if ( ! $user = get_userdata($user))
 		return false;
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
-		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
-		$result = $user->get( $option );
+	if ($user->has_prop($prefix.$option)) // Blog specific
+		$result = $user->get($prefix.$option);
+	elseif ($user->has_prop($option)) // User specific and cross-blog
+		$result = $user->get($option);
 	else
 		$result = false;
 
@@ -390,7 +390,7 @@ 
 	 * @param string  $option Name of the option being retrieved.
 	 * @param WP_User $user   WP_User object of the user whose option is being retrieved.
 	 */
-	return apply_filters( "get_user_option_{$option}", $result, $option, $user );
+	return apply_filters("get_user_option_{$option}", $result, $option, $user);
 }
 
 /**
@@ -414,13 +414,13 @@ 
  * @return int|bool User meta ID if the option didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
+function update_user_option($user_id, $option_name, $newvalue, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
 
-	return update_user_meta( $user_id, $option_name, $newvalue );
+	return update_user_meta($user_id, $option_name, $newvalue);
 }
 
 /**
@@ -440,12 +440,12 @@ 
  *                            Default false (blog specific).
  * @return bool True on success, false on failure.
  */
-function delete_user_option( $user_id, $option_name, $global = false ) {
+function delete_user_option($user_id, $option_name, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
-	return delete_user_meta( $user_id, $option_name );
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
+	return delete_user_meta($user_id, $option_name);
 }
 
 /**
@@ -493,7 +493,7 @@ 
 	 */
 	public $meta_query = false;
 
-	private $compat_fields = array( 'results', 'total_users' );
+	private $compat_fields = array('results', 'total_users');
 
 	// SQL clauses
 	public $query_fields;
@@ -509,9 +509,9 @@ 
 	 *
 	 * @param null|string|array $args Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! empty( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if ( ! empty($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -578,12 +578,12 @@ 
 	 *                                             public post types.
 	 * }
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || ! empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars = wp_parse_args( $query, array(
+			$this->query_vars = wp_parse_args($query, array(
 				'blog_id' => $GLOBALS['blog_id'],
 				'role' => '',
 				'meta_key' => '',
@@ -601,7 +601,7 @@ 
 				'fields' => 'all',
 				'who' => '',
 				'has_published_posts' => null,
-			) );
+			));
 		}
 
 		/**
@@ -615,127 +615,127 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action( 'pre_get_users', $this );
+		do_action('pre_get_users', $this);
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields'] = array_unique( $qv['fields'] );
+		if (is_array($qv['fields'])) {
+			$qv['fields'] = array_unique($qv['fields']);
 
 			$this->query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				$field = 'ID' === $field ? 'ID' : sanitize_key( $field );
+			foreach ($qv['fields'] as $field) {
+				$field = 'ID' === $field ? 'ID' : sanitize_key($field);
 				$this->query_fields[] = "$wpdb->users.$field";
 			}
-			$this->query_fields = implode( ',', $this->query_fields );
-		} elseif ( 'all' == $qv['fields'] ) {
+			$this->query_fields = implode(',', $this->query_fields);
+		} elseif ('all' == $qv['fields']) {
 			$this->query_fields = "$wpdb->users.*";
 		} else {
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->query_fields = 'SQL_CALC_FOUND_ROWS '.$this->query_fields;
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
 
 		// Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
-		if ( ! empty( $qv['include'] ) ) {
-			$include = wp_parse_id_list( $qv['include'] );
+		if ( ! empty($qv['include'])) {
+			$include = wp_parse_id_list($qv['include']);
 		} else {
 			$include = false;
 		}
 
 		$blog_id = 0;
-		if ( isset( $qv['blog_id'] ) ) {
-			$blog_id = absint( $qv['blog_id'] );
+		if (isset($qv['blog_id'])) {
+			$blog_id = absint($qv['blog_id']);
 		}
 
-		if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
-			$qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
+		if (isset($qv['who']) && 'authors' == $qv['who'] && $blog_id) {
+			$qv['meta_key'] = $wpdb->get_blog_prefix($blog_id).'user_level';
 			$qv['meta_value'] = 0;
 			$qv['meta_compare'] = '!=';
 			$qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
 		}
 
-		if ( $qv['has_published_posts'] && $blog_id ) {
-			if ( true === $qv['has_published_posts'] ) {
-				$post_types = get_post_types( array( 'public' => true ) );
+		if ($qv['has_published_posts'] && $blog_id) {
+			if (true === $qv['has_published_posts']) {
+				$post_types = get_post_types(array('public' => true));
 			} else {
 				$post_types = (array) $qv['has_published_posts'];
 			}
 
-			foreach ( $post_types as &$post_type ) {
-				$post_type = $wpdb->prepare( '%s', $post_type );
+			foreach ($post_types as &$post_type) {
+				$post_type = $wpdb->prepare('%s', $post_type);
 			}
 
-			$posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
-			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+			$posts_table = $wpdb->get_blog_prefix($blog_id).'posts';
+			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( ".join(", ", $post_types)." ) )";
 		}
 
 		// Meta query.
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $qv );
+		$this->meta_query->parse_query_vars($qv);
 
 		$role = '';
-		if ( isset( $qv['role'] ) ) {
-			$role = trim( $qv['role'] );
+		if (isset($qv['role'])) {
+			$role = trim($qv['role']);
 		}
 
-		if ( $blog_id && ( $role || is_multisite() ) ) {
+		if ($blog_id && ($role || is_multisite())) {
 			$cap_meta_query = array();
-			$cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+			$cap_meta_query['key'] = $wpdb->get_blog_prefix($blog_id).'capabilities';
 
-			if ( $role ) {
-				$cap_meta_query['value'] = '"' . $role . '"';
+			if ($role) {
+				$cap_meta_query['value'] = '"'.$role.'"';
 				$cap_meta_query['compare'] = 'like';
 			}
 
-			if ( empty( $this->meta_query->queries ) ) {
-				$this->meta_query->queries = array( $cap_meta_query );
-			} elseif ( ! in_array( $cap_meta_query, $this->meta_query->queries, true ) ) {
+			if (empty($this->meta_query->queries)) {
+				$this->meta_query->queries = array($cap_meta_query);
+			} elseif ( ! in_array($cap_meta_query, $this->meta_query->queries, true)) {
 				// Append the cap query to the original queries and reparse the query.
 				$this->meta_query->queries = array(
 					'relation' => 'AND',
-					array( $this->meta_query->queries, $cap_meta_query ),
+					array($this->meta_query->queries, $cap_meta_query),
 				);
 			}
 
-			$this->meta_query->parse_query_vars( $this->meta_query->queries );
+			$this->meta_query->parse_query_vars($this->meta_query->queries);
 		}
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('user', $wpdb->users, 'ID', $this);
 			$this->query_from .= $clauses['join'];
 			$this->query_where .= $clauses['where'];
 
-			if ( $this->meta_query->has_or_relation() ) {
-				$this->query_fields = 'DISTINCT ' . $this->query_fields;
+			if ($this->meta_query->has_or_relation()) {
+				$this->query_fields = 'DISTINCT '.$this->query_fields;
 			}
 		}
 
 		// sorting
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order = $this->parse_order($qv['order']);
 
-		if ( empty( $qv['orderby'] ) ) {
+		if (empty($qv['orderby'])) {
 			// Default order is by 'user_login'.
-			$ordersby = array( 'user_login' => $order );
-		} elseif ( is_array( $qv['orderby'] ) ) {
+			$ordersby = array('user_login' => $order);
+		} elseif (is_array($qv['orderby'])) {
 			$ordersby = $qv['orderby'];
 		} else {
 			// 'orderby' values may be a comma- or space-separated list.
-			$ordersby = preg_split( '/[,\s]+/', $qv['orderby'] );
+			$ordersby = preg_split('/[,\s]+/', $qv['orderby']);
 		}
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-			if ( ! $_value ) {
+		foreach ($ordersby as $_key => $_value) {
+			if ( ! $_value) {
 				continue;
 			}
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order = $order;
@@ -745,57 +745,57 @@ 
 				$_order = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby );
+			$parsed = $this->parse_orderby($_orderby);
 
-			if ( ! $parsed ) {
+			if ( ! $parsed) {
 				continue;
 			}
 
-			$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 		}
 
 		// If no valid clauses were found, order by user_login.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "user_login $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY '.implode(', ', $orderby_array);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] ) {
-			if ( $qv['offset'] )
+		if (isset($qv['number']) && $qv['number']) {
+			if ($qv['offset'])
 				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
 			else
 				$this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']);
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if (isset($qv['search']))
+			$search = trim($qv['search']);
 
-		if ( $search ) {
-			$leading_wild = ( ltrim($search, '*') != $search );
-			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
+		if ($search) {
+			$leading_wild = (ltrim($search, '*') != $search);
+			$trailing_wild = (rtrim($search, '*') != $search);
+			if ($leading_wild && $trailing_wild)
 				$wild = 'both';
-			elseif ( $leading_wild )
+			elseif ($leading_wild)
 				$wild = 'leading';
-			elseif ( $trailing_wild )
+			elseif ($trailing_wild)
 				$wild = 'trailing';
 			else
 				$wild = false;
-			if ( $wild )
+			if ($wild)
 				$search = trim($search, '*');
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
-			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
+			if ($qv['search_columns'])
+				$search_columns = array_intersect($qv['search_columns'], array('ID', 'user_login', 'user_email', 'user_url', 'user_nicename'));
+			if ( ! $search_columns) {
+				if (false !== strpos($search, '@'))
 					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
+				elseif (is_numeric($search))
 					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
+				elseif (preg_match('|^https?://|', $search) && ! (is_multisite() && wp_is_large_network('users')))
 					$search_columns = array('user_url');
 				else
 					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
@@ -813,23 +813,23 @@ 
 			 * @param string        $search         Text being searched.
 			 * @param WP_User_Query $this           The current WP_User_Query instance.
 			 */
-			$search_columns = apply_filters( 'user_search_columns', $search_columns, $search, $this );
+			$search_columns = apply_filters('user_search_columns', $search_columns, $search, $this);
 
-			$this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
+			$this->query_where .= $this->get_search_sql($search, $search_columns, $wild);
 		}
 
-		if ( ! empty( $include ) ) {
+		if ( ! empty($include)) {
 			// Sanitized earlier.
-			$ids = implode( ',', $include );
+			$ids = implode(',', $include);
 			$this->query_where .= " AND $wpdb->users.ID IN ($ids)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif ( ! empty($qv['exclude'])) {
+			$ids = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
 		}
 
 		// Date queries are allowed for the user_registered field.
-		if ( ! empty( $qv['date_query'] ) && is_array( $qv['date_query'] ) ) {
-			$date_query = new WP_Date_Query( $qv['date_query'], 'user_registered' );
+		if ( ! empty($qv['date_query']) && is_array($qv['date_query'])) {
+			$date_query = new WP_Date_Query($qv['date_query'], 'user_registered');
 			$this->query_where .= $date_query->get_sql();
 		}
 
@@ -845,7 +845,7 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action_ref_array( 'pre_user_query', array( &$this ) );
+		do_action_ref_array('pre_user_query', array(&$this));
 	}
 
 	/**
@@ -858,14 +858,14 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		$query = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-		if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-			$this->results = $wpdb->get_results( $query );
+		if (is_array($qv['fields']) || 'all' == $qv['fields']) {
+			$this->results = $wpdb->get_results($query);
 		} else {
-			$this->results = $wpdb->get_col( $query );
+			$this->results = $wpdb->get_col($query);
 		}
 
 		/**
@@ -877,23 +877,23 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->total_users = $wpdb->get_var(apply_filters('found_users_query', 'SELECT FOUND_ROWS()'));
 
-		if ( !$this->results )
+		if ( ! $this->results)
 			return;
 
-		if ( 'all_with_meta' == $qv['fields'] ) {
-			cache_users( $this->results );
+		if ('all_with_meta' == $qv['fields']) {
+			cache_users($this->results);
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ($this->results as $userid)
+				$r[$userid] = new WP_User($userid, '', $qv['blog_id']);
 
 			$this->results = $r;
-		} elseif ( 'all' == $qv['fields'] ) {
-			foreach ( $this->results as $key => $user ) {
-				$this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
+		} elseif ('all' == $qv['fields']) {
+			foreach ($this->results as $key => $user) {
+				$this->results[$key] = new WP_User($user, '', $qv['blog_id']);
 			}
 		}
 	}
@@ -907,8 +907,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var]))
 			return $this->query_vars[$query_var];
 
 		return null;
@@ -923,7 +923,7 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
+	public function set($query_var, $value) {
 		$this->query_vars[$query_var] = $value;
 	}
 
@@ -941,23 +941,23 @@ 
 	 *                       Single site allows leading and trailing wildcards, Network Admin only trailing.
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols, $wild = false ) {
+	protected function get_search_sql($string, $cols, $wild = false) {
 		global $wpdb;
 
 		$searches = array();
-		$leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
-		$trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
-		$like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+		$leading_wild = ('leading' == $wild || 'both' == $wild) ? '%' : '';
+		$trailing_wild = ('trailing' == $wild || 'both' == $wild) ? '%' : '';
+		$like = $leading_wild.$wpdb->esc_like($string).$trailing_wild;
 
-		foreach ( $cols as $col ) {
-			if ( 'ID' == $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );
+		foreach ($cols as $col) {
+			if ('ID' == $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string);
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 			}
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -995,21 +995,21 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string Value to used in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
 
 		$_orderby = '';
-		if ( in_array( $orderby, array( 'login', 'nicename', 'email', 'url', 'registered' ) ) ) {
-			$_orderby = 'user_' . $orderby;
-		} elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ) ) ) {
+		if (in_array($orderby, array('login', 'nicename', 'email', 'url', 'registered'))) {
+			$_orderby = 'user_'.$orderby;
+		} elseif (in_array($orderby, array('user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered'))) {
 			$_orderby = $orderby;
-		} elseif ( 'name' == $orderby || 'display_name' == $orderby ) {
+		} elseif ('name' == $orderby || 'display_name' == $orderby) {
 			$_orderby = 'display_name';
-		} elseif ( 'post_count' == $orderby ) {
+		} elseif ('post_count' == $orderby) {
 			// todo: avoid the JOIN
-			$where = get_posts_by_author_sql( 'post' );
+			$where = get_posts_by_author_sql('post');
 			$this->query_from .= " LEFT OUTER JOIN (
 				SELECT post_author, COUNT(*) as post_count
 				FROM $wpdb->posts
@@ -1018,19 +1018,19 @@ 
 			) p ON ({$wpdb->users}.ID = p.post_author)
 			";
 			$_orderby = 'post_count';
-		} elseif ( 'ID' == $orderby || 'id' == $orderby ) {
+		} elseif ('ID' == $orderby || 'id' == $orderby) {
 			$_orderby = 'ID';
-		} elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
+		} elseif ('meta_value' == $orderby || $this->get('meta_key') == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value";
-		} elseif ( 'meta_value_num' == $orderby ) {
+		} elseif ('meta_value_num' == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value+0";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && ! empty($this->query_vars['include'])) {
+			$include = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
-		} elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
-			$meta_clause = $meta_query_clauses[ $orderby ];
-			$_orderby = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+		} elseif (isset($meta_query_clauses[$orderby])) {
+			$meta_clause = $meta_query_clauses[$orderby];
+			$_orderby = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 		}
 
 		return $_orderby;
@@ -1045,12 +1045,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -1066,8 +1066,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -1082,8 +1082,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -1097,9 +1097,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -1111,9 +1111,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -1127,9 +1127,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -1146,9 +1146,9 @@ 
  *                    for more information on accepted arguments.
  * @return array List of users.
  */
-function get_users( $args = array() ) {
+function get_users($args = array()) {
 
-	$args = wp_parse_args( $args );
+	$args = wp_parse_args($args);
 	$args['count_total'] = false;
 
 	$user_search = new WP_User_Query($args);
@@ -1169,40 +1169,40 @@ 
  * @return array A list of the user's blogs. An empty array if the user doesn't exist
  *               or belongs to no blogs.
  */
-function get_blogs_of_user( $user_id, $all = false ) {
+function get_blogs_of_user($user_id, $all = false) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have blogs
-	if ( empty( $user_id ) )
+	if (empty($user_id))
 		return array();
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
+	$keys = get_user_meta($user_id);
+	if (empty($keys))
 		return array();
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$blog_id = get_current_blog_id();
-		$blogs = array( $blog_id => new stdClass );
-		$blogs[ $blog_id ]->userblog_id = $blog_id;
-		$blogs[ $blog_id ]->blogname = get_option('blogname');
-		$blogs[ $blog_id ]->domain = '';
-		$blogs[ $blog_id ]->path = '';
-		$blogs[ $blog_id ]->site_id = 1;
-		$blogs[ $blog_id ]->siteurl = get_option('siteurl');
-		$blogs[ $blog_id ]->archived = 0;
-		$blogs[ $blog_id ]->spam = 0;
-		$blogs[ $blog_id ]->deleted = 0;
+		$blogs = array($blog_id => new stdClass);
+		$blogs[$blog_id]->userblog_id = $blog_id;
+		$blogs[$blog_id]->blogname = get_option('blogname');
+		$blogs[$blog_id]->domain = '';
+		$blogs[$blog_id]->path = '';
+		$blogs[$blog_id]->site_id = 1;
+		$blogs[$blog_id]->siteurl = get_option('siteurl');
+		$blogs[$blog_id]->archived = 0;
+		$blogs[$blog_id]->spam = 0;
+		$blogs[$blog_id]->deleted = 0;
 		return $blogs;
 	}
 
 	$blogs = array();
 
-	if ( isset( $keys[ $wpdb->base_prefix . 'capabilities' ] ) && defined( 'MULTISITE' ) ) {
-		$blog = get_blog_details( 1 );
-		if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-			$blogs[ 1 ] = (object) array(
+	if (isset($keys[$wpdb->base_prefix.'capabilities']) && defined('MULTISITE')) {
+		$blog = get_blog_details(1);
+		if ($blog && isset($blog->domain) && ($all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted))) {
+			$blogs[1] = (object) array(
 				'userblog_id' => 1,
 				'blogname'    => $blog->blogname,
 				'domain'      => $blog->domain,
@@ -1215,24 +1215,24 @@ 
 				'deleted'     => $blog->deleted,
 			);
 		}
-		unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
+		unset($keys[$wpdb->base_prefix.'capabilities']);
 	}
 
-	$keys = array_keys( $keys );
+	$keys = array_keys($keys);
 
-	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
+	foreach ($keys as $key) {
+		if ('capabilities' !== substr($key, -12))
 			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
+		if ($wpdb->base_prefix && 0 !== strpos($key, $wpdb->base_prefix))
 			continue;
-		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $blog_id ) )
+		$blog_id = str_replace(array($wpdb->base_prefix, '_capabilities'), '', $key);
+		if ( ! is_numeric($blog_id))
 			continue;
 
 		$blog_id = (int) $blog_id;
-		$blog = get_blog_details( $blog_id );
-		if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-			$blogs[ $blog_id ] = (object) array(
+		$blog = get_blog_details($blog_id);
+		if ($blog && isset($blog->domain) && ($all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted))) {
+			$blogs[$blog_id] = (object) array(
 				'userblog_id' => $blog_id,
 				'blogname'    => $blog->blogname,
 				'domain'      => $blog->domain,
@@ -1257,7 +1257,7 @@ 
 	 * @param bool  $all     Whether the returned blogs array should contain all blogs, including
 	 *                       those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	return apply_filters( 'get_blogs_of_user', $blogs, $user_id, $all );
+	return apply_filters('get_blogs_of_user', $blogs, $user_id, $all);
 }
 
 /**
@@ -1269,18 +1269,18 @@ 
  * @param int $blog_id Optional. ID of the blog to check. Defaults to the current site.
  * @return bool
  */
-function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
+function is_user_member_of_blog($user_id = 0, $blog_id = 0) {
 	$user_id = (int) $user_id;
 	$blog_id = (int) $blog_id;
 
-	if ( empty( $user_id ) )
+	if (empty($user_id))
 		$user_id = get_current_user_id();
 
-	if ( empty( $blog_id ) )
+	if (empty($blog_id))
 		$blog_id = get_current_blog_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	return array_key_exists( $blog_id, $blogs );
+	$blogs = get_blogs_of_user($user_id);
+	return array_key_exists($blog_id, $blogs);
 }
 
 /**
@@ -1379,23 +1379,23 @@ 
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$result = array();
 
-	if ( 'time' == $strategy ) {
+	if ('time' == $strategy) {
 		$avail_roles = wp_roles()->get_names();
 
 		// Build a CPU-intensive query that will return concise information.
 		$select_count = array();
-		foreach ( $avail_roles as $this_role => $name ) {
-			$select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%');
+		foreach ($avail_roles as $this_role => $name) {
+			$select_count[] = $wpdb->prepare("COUNT(NULLIF(`meta_value` LIKE %s, false))", '%'.$wpdb->esc_like('"'.$this_role.'"').'%');
 		}
 		$select_count = implode(', ', $select_count);
 
 		// Add the meta_value index to the selection list, then run the query.
-		$row = $wpdb->get_row( "SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N );
+		$row = $wpdb->get_row("SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N);
 
 		// Run the previous loop again to associate results with role names.
 		$col = 0;
 		$role_counts = array();
-		foreach ( $avail_roles as $this_role => $name ) {
+		foreach ($avail_roles as $this_role => $name) {
 			$count = (int) $row[$col++];
 			if ($count > 0) {
 				$role_counts[$this_role] = $count;
@@ -1406,18 +1406,18 @@ 
 		$total_users = (int) $row[$col];
 
 		$result['total_users'] = $total_users;
-		$result['avail_roles'] =& $role_counts;
+		$result['avail_roles'] = & $role_counts;
 	} else {
 		$avail_roles = array();
 
-		$users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
+		$users_of_blog = $wpdb->get_col("SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'");
 
-		foreach ( $users_of_blog as $caps_meta ) {
+		foreach ($users_of_blog as $caps_meta) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
+			if ( ! is_array($b_roles))
 				continue;
-			foreach ( $b_roles as $b_role => $val ) {
-				if ( isset($avail_roles[$b_role]) ) {
+			foreach ($b_roles as $b_role => $val) {
+				if (isset($avail_roles[$b_role])) {
 					$avail_roles[$b_role]++;
 				} else {
 					$avail_roles[$b_role] = 1;
@@ -1425,8 +1425,8 @@ 
 			}
 		}
 
-		$result['total_users'] = count( $users_of_blog );
-		$result['avail_roles'] =& $avail_roles;
+		$result['total_users'] = count($users_of_blog);
+		$result['avail_roles'] = & $avail_roles;
 	}
 
 	return $result;
@@ -1456,11 +1456,11 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
+	if ('' == $for_user_id)
 		$for_user_id = get_current_user_id();
-	$user = get_userdata( $for_user_id );
+	$user = get_userdata($for_user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		$user_ID = 0;
 		$user_level = 0;
 		$userdata = null;
@@ -1532,7 +1532,7 @@ 
  * }
  * @return string String of HTML content.
  */
-function wp_dropdown_users( $args = '' ) {
+function wp_dropdown_users($args = '') {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
 		'orderby' => 'display_name', 'order' => 'ASC',
@@ -1543,53 +1543,53 @@ 
 		'option_none_value' => -1
 	);
 
-	$defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
+	$defaults['selected'] = is_author() ? get_query_var('author') : 0;
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 	$show = $r['show'];
 	$show_option_all = $r['show_option_all'];
 	$show_option_none = $r['show_option_none'];
 	$option_none_value = $r['option_none_value'];
 
-	$query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
-	$query_args['fields'] = array( 'ID', 'user_login', $show );
-	$users = get_users( $query_args );
+	$query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who'));
+	$query_args['fields'] = array('ID', 'user_login', $show);
+	$users = get_users($query_args);
 
 	$output = '';
-	if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-		$name = esc_attr( $r['name'] );
-		if ( $r['multi'] && ! $r['id'] ) {
+	if ( ! empty($users) && (empty($r['hide_if_only_one_author']) || count($users) > 1)) {
+		$name = esc_attr($r['name']);
+		if ($r['multi'] && ! $r['id']) {
 			$id = '';
 		} else {
-			$id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
+			$id = $r['id'] ? " id='".esc_attr($r['id'])."'" : " id='$name'";
 		}
-		$output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
+		$output = "<select name='{$name}'{$id} class='".$r['class']."'>\n";
 
-		if ( $show_option_all ) {
+		if ($show_option_all) {
 			$output .= "\t<option value='0'>$show_option_all</option>\n";
 		}
 
-		if ( $show_option_none ) {
-			$_selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+		if ($show_option_none) {
+			$_selected = selected($option_none_value, $r['selected'], false);
+			$output .= "\t<option value='".esc_attr($option_none_value)."'$_selected>$show_option_none</option>\n";
 		}
 
 		$found_selected = false;
-		foreach ( (array) $users as $user ) {
+		foreach ((array) $users as $user) {
 			$user->ID = (int) $user->ID;
-			$_selected = selected( $user->ID, $r['selected'], false );
-			if ( $_selected ) {
+			$_selected = selected($user->ID, $r['selected'], false);
+			if ($_selected) {
 				$found_selected = true;
 			}
-			$display = ! empty( $user->$show ) ? $user->$show : '('. $user->user_login . ')';
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+			$display = ! empty($user->$show) ? $user->$show : '('.$user->user_login.')';
+			$output .= "\t<option value='$user->ID'$_selected>".esc_html($display)."</option>\n";
 		}
 
-		if ( $r['include_selected'] && ! $found_selected && ( $r['selected'] > 0 ) ) {
-			$user = get_userdata( $r['selected'] );
-			$_selected = selected( $user->ID, $r['selected'], false );
-			$display = ! empty( $user->$show ) ? $user->$show : '('. $user->user_login . ')';
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+		if ($r['include_selected'] && ! $found_selected && ($r['selected'] > 0)) {
+			$user = get_userdata($r['selected']);
+			$_selected = selected($user->ID, $r['selected'], false);
+			$display = ! empty($user->$show) ? $user->$show : '('.$user->user_login.')';
+			$output .= "\t<option value='$user->ID'$_selected>".esc_html($display)."</option>\n";
 		}
 
 		$output .= "</select>";
@@ -1602,9 +1602,9 @@ 
 	 *
 	 * @param string $output HTML output generated by wp_dropdown_users().
 	 */
-	$html = apply_filters( 'wp_dropdown_users', $output );
+	$html = apply_filters('wp_dropdown_users', $output);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1628,22 +1628,22 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( !is_string($value) && !is_numeric($value) )
+	if ( ! is_string($value) && ! is_numeric($value))
 		return $value;
 
-	$prefixed = false !== strpos( $field, 'user_' );
+	$prefixed = false !== strpos($field, 'user_');
 
-	if ( 'edit' == $context ) {
-		if ( $prefixed ) {
+	if ('edit' == $context) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "edit_{$field}", $value, $user_id );
+			$value = apply_filters("edit_{$field}", $value, $user_id);
 		} else {
 
 			/**
@@ -1657,17 +1657,17 @@ 
 			 * @param mixed $value   Value of the prefixed user field.
 			 * @param int   $user_id User ID.
 			 */
-			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
+			$value = apply_filters("edit_user_{$field}", $value, $user_id);
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
+		if ('description' == $field)
+			$value = esc_html($value); // textarea_escaped?
 		else
 			$value = esc_attr($value);
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 		} else {
 
 			/**
@@ -1680,14 +1680,14 @@ 
 			 *
 			 * @param mixed $value Value of the prefixed user field.
 			 */
-			$value = apply_filters( "pre_user_{$field}", $value );
+			$value = apply_filters("pre_user_{$field}", $value);
 		}
 	} else {
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( $field, $value, $user_id, $context );
+			$value = apply_filters($field, $value, $user_id, $context);
 		} else {
 
 			/**
@@ -1702,17 +1702,17 @@ 
 			 * @param int    $user_id User ID.
 			 * @param string $context The context to filter within.
 			 */
-			$value = apply_filters( "user_{$field}", $value, $user_id, $context );
+			$value = apply_filters("user_{$field}", $value, $user_id, $context);
 		}
 	}
 
-	if ( 'user_url' == $field )
+	if ('user_url' == $field)
 		$value = esc_url($value);
 
-	if ( 'attribute' == $context ) {
-		$value = esc_attr( $value );
-	} elseif ( 'js' == $context ) {
-		$value = esc_js( $value );
+	if ('attribute' == $context) {
+		$value = esc_attr($value);
+	} elseif ('js' == $context) {
+		$value = esc_js($value);
 	}
 	return $value;
 }
@@ -1738,17 +1738,17 @@ 
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
-function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+function clean_user_cache($user) {
+	if (is_numeric($user))
+		$user = new WP_User($user);
 
-	if ( ! $user->exists() )
+	if ( ! $user->exists())
 		return;
 
-	wp_cache_delete( $user->ID, 'users' );
-	wp_cache_delete( $user->user_login, 'userlogins' );
-	wp_cache_delete( $user->user_email, 'useremail' );
-	wp_cache_delete( $user->user_nicename, 'userslugs' );
+	wp_cache_delete($user->ID, 'users');
+	wp_cache_delete($user->user_login, 'userlogins');
+	wp_cache_delete($user->user_email, 'useremail');
+	wp_cache_delete($user->user_nicename, 'userslugs');
 }
 
 /**
@@ -1759,8 +1759,8 @@ 
  * @param string $username Username.
  * @return int|false The user's ID on success, and false on failure.
  */
-function username_exists( $username ) {
-	if ( $user = get_user_by( 'login', $username ) ) {
+function username_exists($username) {
+	if ($user = get_user_by('login', $username)) {
 		return $user->ID;
 	}
 	return false;
@@ -1774,8 +1774,8 @@ 
  * @param string $email Email.
  * @return int|false The user's ID on success, and false on failure.
  */
-function email_exists( $email ) {
-	if ( $user = get_user_by( 'email', $email) ) {
+function email_exists($email) {
+	if ($user = get_user_by('email', $email)) {
 		return $user->ID;
 	}
 	return false;
@@ -1789,9 +1789,9 @@ 
  * @param string $username Username.
  * @return bool Whether username given is valid
  */
-function validate_username( $username ) {
-	$sanitized = sanitize_user( $username, true );
-	$valid = ( $sanitized == $username );
+function validate_username($username) {
+	$sanitized = sanitize_user($username, true);
+	$valid = ($sanitized == $username);
 	/**
 	 * Filter whether the provided username is valid or not.
 	 *
@@ -1800,7 +1800,7 @@ 
 	 * @param bool   $valid    Whether given username is valid.
 	 * @param string $username Username to check.
 	 */
-	return apply_filters( 'validate_username', $valid, $username );
+	return apply_filters('validate_username', $valid, $username);
 }
 
 /**
@@ -1853,28 +1853,28 @@ 
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_insert_user( $userdata ) {
+function wp_insert_user($userdata) {
 	global $wpdb;
 
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 	// Are we updating or creating?
-	if ( ! empty( $userdata['ID'] ) ) {
+	if ( ! empty($userdata['ID'])) {
 		$ID = (int) $userdata['ID'];
 		$update = true;
-		$old_user_data = WP_User::get_data_by( 'id', $ID );
+		$old_user_data = WP_User::get_data_by('id', $ID);
 		// hashed in wp_update_user(), plaintext if called directly
 		$user_pass = $userdata['user_pass'];
 	} else {
 		$update = false;
 		// Hash the password
-		$user_pass = wp_hash_password( $userdata['user_pass'] );
+		$user_pass = wp_hash_password($userdata['user_pass']);
 	}
 
-	$sanitized_user_login = sanitize_user( $userdata['user_login'], true );
+	$sanitized_user_login = sanitize_user($userdata['user_login'], true);
 
 	/**
 	 * Filter a username after it has been sanitized.
@@ -1885,27 +1885,27 @@ 
 	 *
 	 * @param string $sanitized_user_login Username after it has been sanitized.
 	 */
-	$pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login );
+	$pre_user_login = apply_filters('pre_user_login', $sanitized_user_login);
 
 	//Remove any non-printable chars from the login string to see if we have ended up with an empty username
-	$user_login = trim( $pre_user_login );
+	$user_login = trim($pre_user_login);
 
-	if ( empty( $user_login ) ) {
-		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
+	if (empty($user_login)) {
+		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.'));
 	}
-	if ( ! $update && username_exists( $user_login ) ) {
-		return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
+	if ( ! $update && username_exists($user_login)) {
+		return new WP_Error('existing_user_login', __('Sorry, that username already exists!'));
 	}
 
 	// If a nicename is provided, remove unsafe user characters before
 	// using it. Otherwise build a nicename from the user_login.
-	if ( ! empty( $userdata['user_nicename'] ) ) {
-		$user_nicename = sanitize_user( $userdata['user_nicename'], true );
+	if ( ! empty($userdata['user_nicename'])) {
+		$user_nicename = sanitize_user($userdata['user_nicename'], true);
 	} else {
 		$user_nicename = $user_login;
 	}
 
-	$user_nicename = sanitize_title( $user_nicename );
+	$user_nicename = sanitize_title($user_nicename);
 
 	// Store values to save in user meta.
 	$meta = array();
@@ -1917,9 +1917,9 @@ 
 	 *
 	 * @param string $user_nicename The user's nicename.
 	 */
-	$user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );
+	$user_nicename = apply_filters('pre_user_nicename', $user_nicename);
 
-	$raw_user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url'];
+	$raw_user_url = empty($userdata['user_url']) ? '' : $userdata['user_url'];
 
 	/**
 	 * Filter a user's URL before the user is created or updated.
@@ -1928,9 +1928,9 @@ 
 	 *
 	 * @param string $raw_user_url The user's URL.
 	 */
-	$user_url = apply_filters( 'pre_user_url', $raw_user_url );
+	$user_url = apply_filters('pre_user_url', $raw_user_url);
 
-	$raw_user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email'];
+	$raw_user_email = empty($userdata['user_email']) ? '' : $userdata['user_email'];
 
 	/**
 	 * Filter a user's email before the user is created or updated.
@@ -1939,20 +1939,20 @@ 
 	 *
 	 * @param string $raw_user_email The user's email.
 	 */
-	$user_email = apply_filters( 'pre_user_email', $raw_user_email );
+	$user_email = apply_filters('pre_user_email', $raw_user_email);
 
 	/*
 	 * If there is no update, just check for `email_exists`. If there is an update,
 	 * check if current email and new email are the same, or not, and check `email_exists`
 	 * accordingly.
 	 */
-	if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )
-		&& ! defined( 'WP_IMPORTING' )
-		&& email_exists( $user_email )
+	if (( ! $update || ( ! empty($old_user_data) && 0 !== strcasecmp($user_email, $old_user_data->user_email)))
+		&& ! defined('WP_IMPORTING')
+		&& email_exists($user_email)
 	) {
-		return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
+		return new WP_Error('existing_user_email', __('Sorry, that email address is already used!'));
 	}
-	$nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
+	$nickname = empty($userdata['nickname']) ? $user_login : $userdata['nickname'];
 
 	/**
 	 * Filter a user's nickname before the user is created or updated.
@@ -1961,9 +1961,9 @@ 
 	 *
 	 * @param string $nickname The user's nickname.
 	 */
-	$meta['nickname'] = apply_filters( 'pre_user_nickname', $nickname );
+	$meta['nickname'] = apply_filters('pre_user_nickname', $nickname);
 
-	$first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name'];
+	$first_name = empty($userdata['first_name']) ? '' : $userdata['first_name'];
 
 	/**
 	 * Filter a user's first name before the user is created or updated.
@@ -1972,9 +1972,9 @@ 
 	 *
 	 * @param string $first_name The user's first name.
 	 */
-	$meta['first_name'] = apply_filters( 'pre_user_first_name', $first_name );
+	$meta['first_name'] = apply_filters('pre_user_first_name', $first_name);
 
-	$last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name'];
+	$last_name = empty($userdata['last_name']) ? '' : $userdata['last_name'];
 
 	/**
 	 * Filter a user's last name before the user is created or updated.
@@ -1983,17 +1983,17 @@ 
 	 *
 	 * @param string $last_name The user's last name.
 	 */
-	$meta['last_name'] = apply_filters( 'pre_user_last_name', $last_name );
+	$meta['last_name'] = apply_filters('pre_user_last_name', $last_name);
 
-	if ( empty( $userdata['display_name'] ) ) {
-		if ( $update ) {
+	if (empty($userdata['display_name'])) {
+		if ($update) {
 			$display_name = $user_login;
-		} elseif ( $meta['first_name'] && $meta['last_name'] ) {
+		} elseif ($meta['first_name'] && $meta['last_name']) {
 			/* translators: 1: first name, 2: last name */
-			$display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] );
-		} elseif ( $meta['first_name'] ) {
+			$display_name = sprintf(_x('%1$s %2$s', 'Display name based on first name and last name'), $meta['first_name'], $meta['last_name']);
+		} elseif ($meta['first_name']) {
 			$display_name = $meta['first_name'];
-		} elseif ( $meta['last_name'] ) {
+		} elseif ($meta['last_name']) {
 			$display_name = $meta['last_name'];
 		} else {
 			$display_name = $user_login;
@@ -2009,9 +2009,9 @@ 
 	 *
 	 * @param string $display_name The user's display name.
 	 */
-	$display_name = apply_filters( 'pre_user_display_name', $display_name );
+	$display_name = apply_filters('pre_user_display_name', $display_name);
 
-	$description = empty( $userdata['description'] ) ? '' : $userdata['description'];
+	$description = empty($userdata['description']) ? '' : $userdata['description'];
 
 	/**
 	 * Filter a user's description before the user is created or updated.
@@ -2020,69 +2020,69 @@ 
 	 *
 	 * @param string $description The user's description.
 	 */
-	$meta['description'] = apply_filters( 'pre_user_description', $description );
+	$meta['description'] = apply_filters('pre_user_description', $description);
 
-	$meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
+	$meta['rich_editing'] = empty($userdata['rich_editing']) ? 'true' : $userdata['rich_editing'];
 
-	$meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
+	$meta['comment_shortcuts'] = empty($userdata['comment_shortcuts']) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
-	$admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
-	$meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
+	$admin_color = empty($userdata['admin_color']) ? 'fresh' : $userdata['admin_color'];
+	$meta['admin_color'] = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
 
-	$meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
+	$meta['use_ssl'] = empty($userdata['use_ssl']) ? 0 : $userdata['use_ssl'];
 
-	$user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
+	$user_registered = empty($userdata['user_registered']) ? gmdate('Y-m-d H:i:s') : $userdata['user_registered'];
 
-	$meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
+	$meta['show_admin_bar_front'] = empty($userdata['show_admin_bar_front']) ? 'true' : $userdata['show_admin_bar_front'];
 
-	$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
+	$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $user_nicename, $user_login));
 
-	if ( $user_nicename_check ) {
+	if ($user_nicename_check) {
 		$suffix = 2;
 		while ($user_nicename_check) {
-			$alt_user_nicename = $user_nicename . "-$suffix";
-			$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+			$alt_user_nicename = $user_nicename."-$suffix";
+			$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $alt_user_nicename, $user_login));
 			$suffix++;
 		}
 		$user_nicename = $alt_user_nicename;
 	}
 
-	$compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
-	$data = wp_unslash( $compacted );
+	$compacted = compact('user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered');
+	$data = wp_unslash($compacted);
 
-	if ( $update ) {
-		if ( $user_email !== $old_user_data->user_email ) {
+	if ($update) {
+		if ($user_email !== $old_user_data->user_email) {
 			$data['user_activation_key'] = '';
 		}
-		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
+		$wpdb->update($wpdb->users, $data, compact('ID'));
 		$user_id = (int) $ID;
 	} else {
-		$wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
+		$wpdb->insert($wpdb->users, $data + compact('user_login'));
 		$user_id = (int) $wpdb->insert_id;
 	}
 
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 
 	// Update user meta.
-	foreach ( $meta as $key => $value ) {
-		update_user_meta( $user_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		update_user_meta($user_id, $key, $value);
 	}
 
-	foreach ( wp_get_user_contact_methods( $user ) as $key => $value ) {
-		if ( isset( $userdata[ $key ] ) ) {
-			update_user_meta( $user_id, $key, $userdata[ $key ] );
+	foreach (wp_get_user_contact_methods($user) as $key => $value) {
+		if (isset($userdata[$key])) {
+			update_user_meta($user_id, $key, $userdata[$key]);
 		}
 	}
 
-	if ( isset( $userdata['role'] ) ) {
-		$user->set_role( $userdata['role'] );
-	} elseif ( ! $update ) {
+	if (isset($userdata['role'])) {
+		$user->set_role($userdata['role']);
+	} elseif ( ! $update) {
 		$user->set_role(get_option('default_role'));
 	}
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $user_login, 'userlogins' );
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($user_login, 'userlogins');
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately after an existing user is updated.
 		 *
@@ -2091,7 +2091,7 @@ 
 		 * @param int    $user_id       User ID.
 		 * @param object $old_user_data Object containing user's data prior to update.
 		 */
-		do_action( 'profile_update', $user_id, $old_user_data );
+		do_action('profile_update', $user_id, $old_user_data);
 	} else {
 		/**
 		 * Fires immediately after a new user is registered.
@@ -2100,7 +2100,7 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'user_register', $user_id );
+		do_action('user_register', $user_id);
 	}
 
 	return $user_id;
@@ -2123,37 +2123,37 @@ 
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
 function wp_update_user($userdata) {
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 
-	$ID = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
-	if ( ! $ID ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$ID = isset($userdata['ID']) ? (int) $userdata['ID'] : 0;
+	if ( ! $ID) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	// First, get all of the original fields
-	$user_obj = get_userdata( $ID );
-	if ( ! $user_obj ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$user_obj = get_userdata($ID);
+	if ( ! $user_obj) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	$user = $user_obj->to_array();
 
 	// Add additional custom fields
-	foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
-		$user[ $key ] = get_user_meta( $ID, $key, true );
+	foreach (_get_additional_user_keys($user_obj) as $key) {
+		$user[$key] = get_user_meta($ID, $key, true);
 	}
 
 	// Escape data pulled from DB.
-	$user = add_magic_quotes( $user );
+	$user = add_magic_quotes($user);
 
-	if ( ! empty($userdata['user_pass']) ) {
+	if ( ! empty($userdata['user_pass'])) {
 		// If password is changing, hash it now
 		$plaintext_pass = $userdata['user_pass'];
-		$userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );
+		$userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
 
 		/**
 		 * Filter whether to send the password change email.
@@ -2167,10 +2167,10 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+		$send_password_change_email = apply_filters('send_password_change_email', true, $user, $userdata);
 	}
 
-	if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
+	if (isset($userdata['user_email']) && $user['user_email'] !== $userdata['user_email']) {
 		/**
 		 * Filter whether to send the email change email.
 		 *
@@ -2183,23 +2183,23 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+		$send_email_change_email = apply_filters('send_email_change_email', true, $user, $userdata);
 	}
 
-	wp_cache_delete( $user['user_email'], 'useremail' );
+	wp_cache_delete($user['user_email'], 'useremail');
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$userdata = array_merge( $user, $userdata );
-	$user_id = wp_insert_user( $userdata );
+	$userdata = array_merge($user, $userdata);
+	$user_id = wp_insert_user($userdata);
 
-	if ( ! is_wp_error( $user_id ) ) {
+	if ( ! is_wp_error($user_id)) {
 
-		$blog_name = wp_specialchars_decode( get_option( 'blogname' ) );
+		$blog_name = wp_specialchars_decode(get_option('blogname'));
 
-		if ( ! empty( $send_password_change_email ) ) {
+		if ( ! empty($send_password_change_email)) {
 
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$pass_change_text = __( 'Hi ###USERNAME###,
+			$pass_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your password was changed on ###SITENAME###.
 
@@ -2214,7 +2214,7 @@ 
 
 			$pass_change_email = array(
 				'to'      => $user['user_email'],
-				'subject' => __( '[%s] Notice of Password Change' ),
+				'subject' => __('[%s] Notice of Password Change'),
 				'message' => $pass_change_text,
 				'headers' => '',
 			);
@@ -2241,20 +2241,20 @@ 
 			 * @param array $userdata The updated user array.
 			 *
 			 */
-			$pass_change_email = apply_filters( 'password_change_email', $pass_change_email, $user, $userdata );
+			$pass_change_email = apply_filters('password_change_email', $pass_change_email, $user, $userdata);
 
-			$pass_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITEURL###', get_option( 'siteurl' ), $pass_change_email['message'] );
+			$pass_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITENAME###', get_option('blogname'), $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITEURL###', get_option('siteurl'), $pass_change_email['message']);
 
-			wp_mail( $pass_change_email['to'], sprintf( $pass_change_email['subject'], $blog_name ), $pass_change_email['message'], $pass_change_email['headers'] );
+			wp_mail($pass_change_email['to'], sprintf($pass_change_email['subject'], $blog_name), $pass_change_email['message'], $pass_change_email['headers']);
 		}
 
-		if ( ! empty( $send_email_change_email ) ) {
+		if ( ! empty($send_email_change_email)) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$email_change_text = __( 'Hi ###USERNAME###,
+			$email_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your email was changed on ###SITENAME###.
 
@@ -2269,7 +2269,7 @@ 
 
 			$email_change_email = array(
 				'to'      => $user['user_email'],
-				'subject' => __( '[%s] Notice of Email Change' ),
+				'subject' => __('[%s] Notice of Email Change'),
 				'message' => $email_change_text,
 				'headers' => '',
 			);
@@ -2295,32 +2295,32 @@ 
 			 * @param array $user The original user array.
 			 * @param array $userdata The updated user array.
 			 */
-			$email_change_email = apply_filters( 'email_change_email', $email_change_email, $user, $userdata );
+			$email_change_email = apply_filters('email_change_email', $email_change_email, $user, $userdata);
 
-			$email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITEURL###', get_option( 'siteurl' ), $email_change_email['message'] );
+			$email_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITENAME###', get_option('blogname'), $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITEURL###', get_option('siteurl'), $email_change_email['message']);
 
-			wp_mail( $email_change_email['to'], sprintf( $email_change_email['subject'], $blog_name ), $email_change_email['message'], $email_change_email['headers'] );
+			wp_mail($email_change_email['to'], sprintf($email_change_email['subject'], $blog_name), $email_change_email['message'], $email_change_email['headers']);
 		}
 	}
 
 	// Update the cookies if the password changed.
 	$current_user = wp_get_current_user();
-	if ( $current_user->ID == $ID ) {
-		if ( isset($plaintext_pass) ) {
+	if ($current_user->ID == $ID) {
+		if (isset($plaintext_pass)) {
 			wp_clear_auth_cookie();
 
 			// Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
 			// If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
-			$logged_in_cookie    = wp_parse_auth_cookie( '', 'logged_in' );
+			$logged_in_cookie    = wp_parse_auth_cookie('', 'logged_in');
 			/** This filter is documented in wp-includes/pluggable.php */
-			$default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false );
-			$remember            = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life );
+			$default_cookie_life = apply_filters('auth_cookie_expiration', (2 * DAY_IN_SECONDS), $ID, false);
+			$remember            = (($logged_in_cookie['expiration'] - time()) > $default_cookie_life);
 
-			wp_set_auth_cookie( $ID, $remember );
+			wp_set_auth_cookie($ID, $remember);
 		}
 	}
 
@@ -2342,8 +2342,8 @@ 
  * @return int|WP_Error The new user's ID.
  */
 function wp_create_user($username, $password, $email = '') {
-	$user_login = wp_slash( $username );
-	$user_email = wp_slash( $email    );
+	$user_login = wp_slash($username);
+	$user_email = wp_slash($email);
 	$user_pass = $password;
 
 	$userdata = compact('user_login', 'user_email', 'user_pass');
@@ -2359,9 +2359,9 @@ 
  * @param WP_User $user WP_User instance.
  * @return array
  */
-function _get_additional_user_keys( $user ) {
-	$keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
-	return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
+function _get_additional_user_keys($user) {
+	$keys = array('first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front');
+	return array_merge($keys, array_keys(wp_get_user_contact_methods($user)));
 }
 
 /**
@@ -2374,13 +2374,13 @@ 
  * @param WP_User $user Optional. WP_User object.
  * @return array Array of contact methods and their labels.
  */
-function wp_get_user_contact_methods( $user = null ) {
+function wp_get_user_contact_methods($user = null) {
 	$methods = array();
-	if ( get_site_option( 'initial_db_version' ) < 23588 ) {
+	if (get_site_option('initial_db_version') < 23588) {
 		$methods = array(
-			'aim'    => __( 'AIM' ),
-			'yim'    => __( 'Yahoo IM' ),
-			'jabber' => __( 'Jabber / Google Talk' )
+			'aim'    => __('AIM'),
+			'yim'    => __('Yahoo IM'),
+			'jabber' => __('Jabber / Google Talk')
 		);
 	}
 
@@ -2392,7 +2392,7 @@ 
 	 * @param array   $methods Array of contact methods and their labels.
  	 * @param WP_User $user    WP_User object.
 	 */
-	return apply_filters( 'user_contactmethods', $methods, $user );
+	return apply_filters('user_contactmethods', $methods, $user);
 }
 
 /**
@@ -2401,8 +2401,8 @@ 
  * @since 2.9.0
  * @access private
  */
-function _wp_get_user_contactmethods( $user = null ) {
-	return wp_get_user_contact_methods( $user );
+function _wp_get_user_contactmethods($user = null) {
+	return wp_get_user_contact_methods($user);
 }
 
 /**
@@ -2413,7 +2413,7 @@ 
  * @return string The password hint text.
  */
 function wp_get_password_hint() {
-	$hint = __( 'Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' );
+	$hint = __('Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).');
 
 	/**
 	 * Filter the text describing the site's password complexity policy.
@@ -2422,7 +2422,7 @@ 
 	 *
 	 * @param string $hint The password hint text.
 	 */
-	return apply_filters( 'password_hint', $hint );
+	return apply_filters('password_hint', $hint);
 }
 
 /**
@@ -2447,19 +2447,19 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
+	if (empty($key) || ! is_string($key))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty($login) || !is_string($login) )
+	if (empty($login) || ! is_string($login))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login));
+	if ( ! $row)
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$wp_hasher = new PasswordHash(8, true);
 	}
 
 	/**
@@ -2469,27 +2469,27 @@ 
 	 *
 	 * @param int $expiration The expiration time in seconds.
 	 */
-	$expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
+	$expiration_duration = apply_filters('password_reset_expiration', DAY_IN_SECONDS);
 
-	if ( false !== strpos( $row->user_activation_key, ':' ) ) {
-		list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 );
+	if (false !== strpos($row->user_activation_key, ':')) {
+		list($pass_request_time, $pass_key) = explode(':', $row->user_activation_key, 2);
 		$expiration_time = $pass_request_time + $expiration_duration;
 	} else {
 		$pass_key = $row->user_activation_key;
 		$expiration_time = false;
 	}
 
-	$hash_is_correct = $wp_hasher->CheckPassword( $key, $pass_key );
+	$hash_is_correct = $wp_hasher->CheckPassword($key, $pass_key);
 
-	if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) {
-		return get_userdata( $row->ID );
-	} elseif ( $hash_is_correct && $expiration_time ) {
+	if ($hash_is_correct && $expiration_time && time() < $expiration_time) {
+		return get_userdata($row->ID);
+	} elseif ($hash_is_correct && $expiration_time) {
 		// Key has an expiration time that's passed
-		return new WP_Error( 'expired_key', __( 'Invalid key' ) );
+		return new WP_Error('expired_key', __('Invalid key'));
 	}
 
-	if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
-		$return = new WP_Error( 'expired_key', __( 'Invalid key' ) );
+	if (hash_equals($row->user_activation_key, $key) || ($hash_is_correct && ! $expiration_time)) {
+		$return = new WP_Error('expired_key', __('Invalid key'));
 		$user_id = $row->ID;
 
 		/**
@@ -2503,10 +2503,10 @@ 
 		 *                          Return a WP_User object to validate the key.
 		 * @param int      $user_id The matched user ID.
 		 */
-		return apply_filters( 'password_reset_key_expired', $return, $user_id );
+		return apply_filters('password_reset_key_expired', $return, $user_id);
 	}
 
-	return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	return new WP_Error('invalid_key', __('Invalid key'));
 }
 
 /**
@@ -2517,7 +2517,7 @@ 
  * @param object $user     The user
  * @param string $new_pass New password for the user in plaintext
  */
-function reset_password( $user, $new_pass ) {
+function reset_password($user, $new_pass) {
 	/**
 	 * Fires before the user's password is reset.
 	 *
@@ -2526,12 +2526,12 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'password_reset', $user, $new_pass );
+	do_action('password_reset', $user, $new_pass);
 
-	wp_set_password( $new_pass, $user->ID );
-	update_user_option( $user->ID, 'default_password_nag', false, true );
+	wp_set_password($new_pass, $user->ID);
+	update_user_option($user->ID, 'default_password_nag', false, true);
 
-	wp_password_change_notification( $user );
+	wp_password_change_notification($user);
 }
 
 /**
@@ -2543,10 +2543,10 @@ 
  * @param string $user_email User's email address to send password and add
  * @return int|WP_Error Either user's ID or error on failure.
  */
-function register_new_user( $user_login, $user_email ) {
+function register_new_user($user_login, $user_email) {
 	$errors = new WP_Error();
 
-	$sanitized_user_login = sanitize_user( $user_login );
+	$sanitized_user_login = sanitize_user($user_login);
 	/**
 	 * Filter the email address of a user being registered.
 	 *
@@ -2554,26 +2554,26 @@ 
 	 *
 	 * @param string $user_email The email address of the new user.
 	 */
-	$user_email = apply_filters( 'user_registration_email', $user_email );
+	$user_email = apply_filters('user_registration_email', $user_email);
 
 	// Check the username
-	if ( $sanitized_user_login == '' ) {
-		$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
-	} elseif ( ! validate_username( $user_login ) ) {
-		$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+	if ($sanitized_user_login == '') {
+		$errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.'));
+	} elseif ( ! validate_username($user_login)) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 		$sanitized_user_login = '';
-	} elseif ( username_exists( $sanitized_user_login ) ) {
-		$errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+	} elseif (username_exists($sanitized_user_login)) {
+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'));
 	}
 
 	// Check the e-mail address
-	if ( $user_email == '' ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
-	} elseif ( ! is_email( $user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
+	if ($user_email == '') {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.'));
+	} elseif ( ! is_email($user_email)) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'));
 		$user_email = '';
-	} elseif ( email_exists( $user_email ) ) {
-		$errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
+	} elseif (email_exists($user_email)) {
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
 	}
 
 	/**
@@ -2587,7 +2587,7 @@ 
 	 *                                       e.g., an empty field, an invalid username or email,
 	 *                                       or an existing username or email.
 	 */
-	do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
+	do_action('register_post', $sanitized_user_login, $user_email, $errors);
 
 	/**
 	 * Filter the errors encountered when a new user is being registered.
@@ -2605,21 +2605,21 @@ 
 	 * @param string   $sanitized_user_login User's username after it has been sanitized.
 	 * @param string   $user_email           User's email.
 	 */
-	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
+	$errors = apply_filters('registration_errors', $errors, $sanitized_user_login, $user_email);
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
-	$user_pass = wp_generate_password( 12, false );
-	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
-	if ( ! $user_id || is_wp_error( $user_id ) ) {
-		$errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
+	$user_pass = wp_generate_password(12, false);
+	$user_id = wp_create_user($sanitized_user_login, $user_pass, $user_email);
+	if ( ! $user_id || is_wp_error($user_id)) {
+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
 		return $errors;
 	}
 
-	update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+	update_user_option($user_id, 'default_password_nag', true, true); //Set up the Password change nag.
 
-	wp_new_user_notification( $user_id, 'both' );
+	wp_new_user_notification($user_id, 'both');
 
 	return $user_id;
 }
@@ -2632,8 +2632,8 @@ 
  * @return string Token.
  */
 function wp_get_session_token() {
-	$cookie = wp_parse_auth_cookie( '', 'logged_in' );
-	return ! empty( $cookie['token'] ) ? $cookie['token'] : '';
+	$cookie = wp_parse_auth_cookie('', 'logged_in');
+	return ! empty($cookie['token']) ? $cookie['token'] : '';
 }
 
 /**
@@ -2643,7 +2643,7 @@ 
  * @return array Array of sessions.
  */
 function wp_get_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	return $manager->get_all();
 }
 
@@ -2654,9 +2654,9 @@ 
  */
 function wp_destroy_current_session() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy($token);
 	}
 }
 
@@ -2667,9 +2667,9 @@ 
  */
 function wp_destroy_other_sessions() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy_others( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy_others($token);
 	}
 }
 
@@ -2679,6 +2679,6 @@ 
  * @since 4.0.0
  */
 function wp_destroy_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	$manager->destroy_all();
 }

Braces +191 added lines, -132 removed lines

@@ -27,18 +27,22 @@ 
  */
 function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 	if ( empty($credentials) ) {
-		if ( ! empty($_POST['log']) )
-			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
-			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
-			$credentials['remember'] = $_POST['rememberme'];
+		if ( ! empty($_POST['log']) ) {
+					$credentials['user_login'] = $_POST['log'];
+		}
+		if ( ! empty($_POST['pwd']) ) {
+					$credentials['user_password'] = $_POST['pwd'];
+		}
+		if ( ! empty($_POST['rememberme']) ) {
+					$credentials['remember'] = $_POST['rememberme'];
+		}
 	}
 
-	if ( !empty($credentials['remember']) )
-		$credentials['remember'] = true;
-	else
-		$credentials['remember'] = false;
+	if ( !empty($credentials['remember']) ) {
+			$credentials['remember'] = true;
+	} else {
+			$credentials['remember'] = false;
+	}
 
 	/**
 	 * Fires before the user is authenticated.
@@ -55,8 +59,9 @@ 
 	 */
 	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
 
-	if ( '' === $secure_cookie )
-		$secure_cookie = is_ssl();
+	if ( '' === $secure_cookie ) {
+			$secure_cookie = is_ssl();
+	}
 
 	/**
 	 * Filter whether to use a secure sign-on cookie.
@@ -119,24 +124,28 @@ 
 	}
 
 	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
-			return $user;
+		if ( is_wp_error( $user ) ) {
+					return $user;
+		}
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
-			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		if ( empty($username) ) {
+					$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		}
 
-		if ( empty($password) )
-			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		if ( empty($password) ) {
+					$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		}
 
 		return $error;
 	}
 
 	$user = get_user_by('login', $username);
 
-	if ( !$user )
-		return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>' ), wp_lostpassword_url() ) );
+	if ( !$user ) {
+			return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>' ), wp_lostpassword_url() ) );
+	}
 
 	/**
 	 * Filter whether the given user can be authenticated with the provided $password.
@@ -148,12 +157,14 @@ 
 	 * @param string           $password Password to check against the user.
 	 */
 	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
-		return $user;
+	if ( is_wp_error($user) ) {
+			return $user;
+	}
 
-	if ( !wp_check_password($password, $user->user_pass, $user->ID) )
-		return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>' ),
+	if ( !wp_check_password($password, $user->user_pass, $user->ID) ) {
+			return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>' ),
 		$username, wp_lostpassword_url() ) );
+	}
 
 	return $user;
 }
@@ -177,18 +188,21 @@ 
 
 	if ( empty($username) && empty($password) ) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
-			return new WP_User($user_id);
+		if ( $user_id ) {
+					return new WP_User($user_id);
+		}
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
-			$auth_cookie = SECURE_AUTH_COOKIE;
-		else
-			$auth_cookie = AUTH_COOKIE;
+		if ( $auth_secure_cookie ) {
+					$auth_cookie = SECURE_AUTH_COOKIE;
+		} else {
+					$auth_cookie = AUTH_COOKIE;
+		}
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
-			return new WP_Error('expired_session', __('Please log in again.'));
+		if ( !empty($_COOKIE[$auth_cookie]) ) {
+					return new WP_Error('expired_session', __('Please log in again.'));
+		}
 
 		// If the cookie is not set, be silent.
 	}
@@ -217,8 +231,9 @@ 
 		 */
 		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy(), $user );
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ( $spammed ) {
+					return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		}
 	}
 	return $user;
 }
@@ -303,8 +318,9 @@ 
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
-		return $count;
+	if ( empty( $users ) || ! is_array( $users ) ) {
+			return $count;
+	}
 
 	$userlist = implode( ',', array_map( 'absint', $users ) );
 	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
@@ -315,8 +331,9 @@ 
 	}
 
 	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+		if ( ! isset( $count[ $id ] ) ) {
+					$count[ $id ] = 0;
+		}
 	}
 
 	return $count;
@@ -334,8 +351,9 @@ 
  * @return int The current user's ID
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
-		return 0;
+	if ( ! function_exists( 'wp_get_current_user' ) ) {
+			return 0;
+	}
 	$user = wp_get_current_user();
 	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
 }
@@ -362,22 +380,28 @@ 
 function get_user_option( $option, $user = 0, $deprecated = '' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
-	if ( empty( $user ) )
-		$user = get_current_user_id();
+	if ( empty( $user ) ) {
+			$user = get_current_user_id();
+	}
 
-	if ( ! $user = get_userdata( $user ) )
-		return false;
+	if ( ! $user = get_userdata( $user ) ) {
+			return false;
+	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+	if ( $user->has_prop( $prefix . $option ) ) {
+		// Blog specific
 		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
+	} elseif ( $user->has_prop( $option ) ) {
+		// User specific and cross-blog
 		$result = $user->get( $option );
-	else
-		$result = false;
+	} else {
+			$result = false;
+	}
 
 	/**
 	 * Filter a specific user option value.
@@ -417,8 +441,9 @@ 
 function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 
 	return update_user_meta( $user_id, $option_name, $newvalue );
 }
@@ -443,8 +468,9 @@ 
 function delete_user_option( $user_id, $option_name, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 	return delete_user_meta( $user_id, $option_name );
 }
 
@@ -634,8 +660,9 @@ 
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		}
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
@@ -763,42 +790,48 @@ 
 
 		// limit
 		if ( isset( $qv['number'] ) && $qv['number'] ) {
-			if ( $qv['offset'] )
-				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
-			else
-				$this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']);
+			if ( $qv['offset'] ) {
+							$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
+			} else {
+							$this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']);
+			}
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if ( isset( $qv['search'] ) ) {
+					$search = trim( $qv['search'] );
+		}
 
 		if ( $search ) {
 			$leading_wild = ( ltrim($search, '*') != $search );
 			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
-				$wild = 'both';
-			elseif ( $leading_wild )
-				$wild = 'leading';
-			elseif ( $trailing_wild )
-				$wild = 'trailing';
-			else
-				$wild = false;
-			if ( $wild )
-				$search = trim($search, '*');
+			if ( $leading_wild && $trailing_wild ) {
+							$wild = 'both';
+			} elseif ( $leading_wild ) {
+							$wild = 'leading';
+			} elseif ( $trailing_wild ) {
+							$wild = 'trailing';
+			} else {
+							$wild = false;
+			}
+			if ( $wild ) {
+							$search = trim($search, '*');
+			}
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			if ( $qv['search_columns'] ) {
+							$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			}
 			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
-					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
-					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
-					$search_columns = array('user_url');
-				else
-					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				if ( false !== strpos( $search, '@') ) {
+									$search_columns = array('user_email');
+				} elseif ( is_numeric($search) ) {
+									$search_columns = array('user_login', 'ID');
+				} elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
+									$search_columns = array('user_url');
+				} else {
+									$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				}
 			}
 
 			/**
@@ -877,18 +910,21 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		}
 
-		if ( !$this->results )
-			return;
+		if ( !$this->results ) {
+					return;
+		}
 
 		if ( 'all_with_meta' == $qv['fields'] ) {
 			cache_users( $this->results );
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ( $this->results as $userid ) {
+							$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			}
 
 			$this->results = $r;
 		} elseif ( 'all' == $qv['fields'] ) {
@@ -908,8 +944,9 @@ 
 	 * @return mixed
 	 */
 	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
-			return $this->query_vars[$query_var];
+		if ( isset( $this->query_vars[$query_var] ) ) {
+					return $this->query_vars[$query_var];
+		}
 
 		return null;
 	}
@@ -1175,12 +1212,14 @@ 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have blogs
-	if ( empty( $user_id ) )
-		return array();
+	if ( empty( $user_id ) ) {
+			return array();
+	}
 
 	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
-		return array();
+	if ( empty( $keys ) ) {
+			return array();
+	}
 
 	if ( ! is_multisite() ) {
 		$blog_id = get_current_blog_id();
@@ -1221,13 +1260,16 @@ 
 	$keys = array_keys( $keys );
 
 	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
-			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
-			continue;
+		if ( 'capabilities' !== substr( $key, -12 ) ) {
+					continue;
+		}
+		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) ) {
+					continue;
+		}
 		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $blog_id ) )
-			continue;
+		if ( ! is_numeric( $blog_id ) ) {
+					continue;
+		}
 
 		$blog_id = (int) $blog_id;
 		$blog = get_blog_details( $blog_id );
@@ -1273,11 +1315,13 @@ 
 	$user_id = (int) $user_id;
 	$blog_id = (int) $blog_id;
 
-	if ( empty( $user_id ) )
-		$user_id = get_current_user_id();
+	if ( empty( $user_id ) ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $blog_id ) )
-		$blog_id = get_current_blog_id();
+	if ( empty( $blog_id ) ) {
+			$blog_id = get_current_blog_id();
+	}
 
 	$blogs = get_blogs_of_user( $user_id );
 	return array_key_exists( $blog_id, $blogs );
@@ -1414,8 +1458,9 @@ 
 
 		foreach ( $users_of_blog as $caps_meta ) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
-				continue;
+			if ( ! is_array( $b_roles ) ) {
+							continue;
+			}
 			foreach ( $b_roles as $b_role => $val ) {
 				if ( isset($avail_roles[$b_role]) ) {
 					$avail_roles[$b_role]++;
@@ -1456,8 +1501,9 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
-		$for_user_id = get_current_user_id();
+	if ( '' == $for_user_id ) {
+			$for_user_id = get_current_user_id();
+	}
 	$user = get_userdata( $for_user_id );
 
 	if ( ! $user ) {
@@ -1628,14 +1674,17 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
-		$value = (int) $value;
+	if ( in_array($field, $int_fields) ) {
+			$value = (int) $value;
+	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
-	if ( !is_string($value) && !is_numeric($value) )
-		return $value;
+	if ( !is_string($value) && !is_numeric($value) ) {
+			return $value;
+	}
 
 	$prefixed = false !== strpos( $field, 'user_' );
 
@@ -1660,10 +1709,13 @@ 
 			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+					$value = esc_html( $value );
+		}
+		// textarea_escaped?
+		else {
+					$value = esc_attr($value);
+		}
 	} elseif ( 'db' == $context ) {
 		if ( $prefixed ) {
 			/** This filter is documented in wp-includes/post.php */
@@ -1706,8 +1758,9 @@ 
 		}
 	}
 
-	if ( 'user_url' == $field )
-		$value = esc_url($value);
+	if ( 'user_url' == $field ) {
+			$value = esc_url($value);
+	}
 
 	if ( 'attribute' == $context ) {
 		$value = esc_attr( $value );
@@ -1739,11 +1792,13 @@ 
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+	if ( is_numeric( $user ) ) {
+			$user = new WP_User( $user );
+	}
 
-	if ( ! $user->exists() )
-		return;
+	if ( ! $user->exists() ) {
+			return;
+	}
 
 	wp_cache_delete( $user->ID, 'users' );
 	wp_cache_delete( $user->user_login, 'userlogins' );
@@ -2447,15 +2502,18 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty( $key ) || !is_string( $key ) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
-	if ( empty($login) || !is_string($login) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty($login) || !is_string($login) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( ! $row ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	if ( empty( $wp_hasher ) ) {
 		require_once ABSPATH . WPINC . '/class-phpass.php';
@@ -2607,8 +2665,9 @@ 
 	 */
 	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	$user_pass = wp_generate_password( 12, false );
 	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );

src/wp-includes/widgets.php

Doc Comments +5 added lines, -5 removed lines

@@ -300,7 +300,7 @@ 
 	 *
 	 * @param array     $args        Display arguments. See {@see WP_Widget::widget()} for information
 	 *                               on accepted arguments.
-	 * @param int|array $widget_args {
+	 * @param integer $widget_args {
 	 *     Optional. Internal order number of the widget instance, or array of multi-widget arguments.
 	 *     Default 1.
 	 *
@@ -440,7 +440,7 @@ 
 	 * @since 2.8.0
 	 * @access public
 	 *
-	 * @param int|array $widget_args Widget instance number or array of widget arguments.
+	 * @param integer $widget_args Widget instance number or array of widget arguments.
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {
@@ -1131,7 +1131,7 @@ 
  *
  * @global array $wp_registered_widget_controls
  *
- * @param int|string $id
+ * @param boolean|string $id
  * @param string     $name
  * @param callable   $form_callback
  * @param array      $options
@@ -1188,7 +1188,7 @@ 
  * @global array $wp_registered_sidebars
  * @global array $wp_registered_widgets
  *
- * @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar.
+ * @param integer $index Optional, default is 1. Index, name or ID of dynamic sidebar.
  * @return bool True, if widget sidebar was found and called. False if not found or not called.
  */
 function dynamic_sidebar($index = 1) {
@@ -1425,7 +1425,7 @@ 
  *
  * @since 2.8.0
  *
- * @param string|int $index Sidebar name, id or number to check.
+ * @param string $index Sidebar name, id or number to check.
  * @return bool true if the sidebar is in use, false otherwise.
  */
 function is_active_sidebar( $index ) {

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * API for creating dynamic sidebar without hardcoding functionality into
- * themes. Includes both internal WordPress routines and theme use routines.
- *
- * This functionality was found in a plugin before WordPress 2.2 release which
- * included it in the core from that point on.
- *
- * @link https://codex.wordpress.org/Plugins/WordPress_Widgets WordPress Widgets
- * @link https://codex.wordpress.org/Plugins/WordPress_Widgets_Api Widgets API
- *
- * @package WordPress
- * @subpackage Widgets
- */
+	 * API for creating dynamic sidebar without hardcoding functionality into
+	 * themes. Includes both internal WordPress routines and theme use routines.
+	 *
+	 * This functionality was found in a plugin before WordPress 2.2 release which
+	 * included it in the core from that point on.
+	 *
+	 * @link https://codex.wordpress.org/Plugins/WordPress_Widgets WordPress Widgets
+	 * @link https://codex.wordpress.org/Plugins/WordPress_Widgets_Api Widgets API
+	 *
+	 * @package WordPress
+	 * @subpackage Widgets
+	 */
 
 /**
  * This class must be extended for each widget and WP_Widget::widget(), WP_Widget::update()

Spacing +233 added lines, -233 removed lines

@@ -103,7 +103,7 @@ 
 	 *                        before_widget, and after_widget.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		die('function WP_Widget::widget() must be over-ridden in a sub-class.');
 	}
 
@@ -122,7 +122,7 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		return $new_instance;
 	}
 
@@ -136,7 +136,7 @@ 
 	 * @return string Default return is 'noform'.
 	 */
 	public function form($instance) {
-		echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
+		echo '<p class="no-options-widget">'.__('There are no options for this widget.').'</p>';
 		return 'noform';
 	}
 
@@ -156,12 +156,12 @@ 
 	 * @param array  $control_options Optional. Widget control options. See {@see wp_register_widget_control()}
 	 *                                for information on accepted arguments. Default empty array.
 	 */
-	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		$this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
+	public function __construct($id_base, $name, $widget_options = array(), $control_options = array()) {
+		$this->id_base = empty($id_base) ? preg_replace('/(wp_)?widget_/', '', strtolower(get_class($this))) : strtolower($id_base);
 		$this->name = $name;
-		$this->option_name = 'widget_' . $this->id_base;
-		$this->widget_options = wp_parse_args( $widget_options, array('classname' => $this->option_name) );
-		$this->control_options = wp_parse_args( $control_options, array('id_base' => $this->id_base) );
+		$this->option_name = 'widget_'.$this->id_base;
+		$this->widget_options = wp_parse_args($widget_options, array('classname' => $this->option_name));
+		$this->control_options = wp_parse_args($control_options, array('id_base' => $this->id_base));
 	}
 
 	/**
@@ -172,9 +172,9 @@ 
 	 * @param array  $widget_options
 	 * @param array  $control_options
 	 */
-	public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		_deprecated_constructor( 'WP_Widget', '4.3.0' );
-		WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
+	public function WP_Widget($id_base, $name, $widget_options = array(), $control_options = array()) {
+		_deprecated_constructor('WP_Widget', '4.3.0');
+		WP_Widget::__construct($id_base, $name, $widget_options, $control_options);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @return string Name attribute for $field_name
 	 */
 	public function get_field_name($field_name) {
-		return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
+		return 'widget-'.$this->id_base.'['.$this->number.']['.$field_name.']';
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 * @param string $field_name Field name.
 	 * @return string ID attribute for `$field_name`.
 	 */
-	public function get_field_id( $field_name ) {
-		return 'widget-' . $this->id_base . '-' . $this->number . '-' . $field_name;
+	public function get_field_id($field_name) {
+		return 'widget-'.$this->id_base.'-'.$this->number.'-'.$field_name;
 	}
 
 	/**
@@ -216,23 +216,23 @@ 
 		$empty = true;
 
 		// When $settings is an array-like object, get an intrinsic array for use with array_keys().
-		if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
+		if ($settings instanceof ArrayObject || $settings instanceof ArrayIterator) {
 			$settings = $settings->getArrayCopy();
 		}
 
-		if ( is_array( $settings ) ) {
-			foreach ( array_keys( $settings ) as $number ) {
-				if ( is_numeric( $number ) ) {
-					$this->_set( $number );
-					$this->_register_one( $number );
+		if (is_array($settings)) {
+			foreach (array_keys($settings) as $number) {
+				if (is_numeric($number)) {
+					$this->_set($number);
+					$this->_register_one($number);
 					$empty = false;
 				}
 			}
 		}
 
-		if ( $empty ) {
+		if ($empty) {
 			// If there are none, we register the widget's existence with a generic template.
-			$this->_set( 1 );
+			$this->_set(1);
 			$this->_register_one();
 		}
 	}
@@ -248,7 +248,7 @@ 
 	 */
 	public function _set($number) {
 		$this->number = $number;
-		$this->id = $this->id_base . '-' . $number;
+		$this->id = $this->id_base.'-'.$number;
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function is_preview() {
 		global $wp_customize;
-		return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
+		return (isset($wp_customize) && $wp_customize->is_preview());
 	}
 
 	/**
@@ -307,17 +307,17 @@ 
 	 *     @type int $number Number increment used for multiples of the same widget.
 	 * }
 	 */
-	public function display_callback( $args, $widget_args = 1 ) {
-		if ( is_numeric( $widget_args ) ) {
-			$widget_args = array( 'number' => $widget_args );
+	public function display_callback($args, $widget_args = 1) {
+		if (is_numeric($widget_args)) {
+			$widget_args = array('number' => $widget_args);
 		}
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
-		$this->_set( $widget_args['number'] );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
+		$this->_set($widget_args['number']);
 		$instances = $this->get_settings();
 
-		if ( isset( $instances[ $this->number ] ) ) {
-			$instance = $instances[ $this->number ];
+		if (isset($instances[$this->number])) {
+			$instance = $instances[$this->number];
 
 			/**
 			 * Filter the settings for a particular widget instance.
@@ -330,21 +330,21 @@ 
 			 * @param WP_Widget $this     The current widget instance.
 			 * @param array     $args     An array of default widget arguments.
 			 */
-			$instance = apply_filters( 'widget_display_callback', $instance, $this, $args );
+			$instance = apply_filters('widget_display_callback', $instance, $this, $args);
 
-			if ( false === $instance ) {
+			if (false === $instance) {
 				return;
 			}
 
 			$was_cache_addition_suspended = wp_suspend_cache_addition();
-			if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-				wp_suspend_cache_addition( true );
+			if ($this->is_preview() && ! $was_cache_addition_suspended) {
+				wp_suspend_cache_addition(true);
 			}
 
-			$this->widget( $args, $instance );
+			$this->widget($args, $instance);
 
-			if ( $this->is_preview() ) {
-				wp_suspend_cache_addition( $was_cache_addition_suspended );
+			if ($this->is_preview()) {
+				wp_suspend_cache_addition($was_cache_addition_suspended);
 			}
 		}
 	}
@@ -359,53 +359,53 @@ 
 	 *
 	 * @param int $deprecated Not used.
 	 */
-	public function update_callback( $deprecated = 1 ) {
+	public function update_callback($deprecated = 1) {
 		global $wp_registered_widgets;
 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
+		if ($this->updated)
 			return;
 
-		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+		if (isset($_POST['delete_widget']) && $_POST['delete_widget']) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
+			if (isset($_POST['the-widget-id']))
 				$del_id = $_POST['the-widget-id'];
 			else
 				return;
 
-			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
+			if (isset($wp_registered_widgets[$del_id]['params'][0]['number'])) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
+				if ($this->id_base.'-'.$number == $del_id)
 					unset($all_instances[$number]);
 			}
 		} else {
-			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
-				$settings = $_POST['widget-' . $this->id_base];
-			} elseif ( isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base ) {
+			if (isset($_POST['widget-'.$this->id_base]) && is_array($_POST['widget-'.$this->id_base])) {
+				$settings = $_POST['widget-'.$this->id_base];
+			} elseif (isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base) {
 				$num = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
-				$settings = array( $num => array() );
+				$settings = array($num => array());
 			} else {
 				return;
 			}
 
-			foreach ( $settings as $number => $new_instance ) {
+			foreach ($settings as $number => $new_instance) {
 				$new_instance = stripslashes_deep($new_instance);
 				$this->_set($number);
 
 				$old_instance = isset($all_instances[$number]) ? $all_instances[$number] : array();
 
 				$was_cache_addition_suspended = wp_suspend_cache_addition();
-				if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-					wp_suspend_cache_addition( true );
+				if ($this->is_preview() && ! $was_cache_addition_suspended) {
+					wp_suspend_cache_addition(true);
 				}
 
-				$instance = $this->update( $new_instance, $old_instance );
+				$instance = $this->update($new_instance, $old_instance);
 
-				if ( $this->is_preview() ) {
-					wp_suspend_cache_addition( $was_cache_addition_suspended );
+				if ($this->is_preview()) {
+					wp_suspend_cache_addition($was_cache_addition_suspended);
 				}
 
 				/**
@@ -421,8 +421,8 @@ 
 				 * @param array     $old_instance Array of old widget settings.
 				 * @param WP_Widget $this         The current widget instance.
 				 */
-				$instance = apply_filters( 'widget_update_callback', $instance, $new_instance, $old_instance, $this );
-				if ( false !== $instance ) {
+				$instance = apply_filters('widget_update_callback', $instance, $new_instance, $old_instance, $this);
+				if (false !== $instance) {
 					$all_instances[$number] = $instance;
 				}
 
@@ -443,11 +443,11 @@ 
 	 * @param int|array $widget_args Widget instance number or array of widget arguments.
 	 * @return string|null
 	 */
-	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+	public function form_callback($widget_args = 1) {
+		if (is_numeric($widget_args))
+			$widget_args = array('number' => $widget_args);
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
 		$all_instances = $this->get_settings();
 
 		if ( -1 == $widget_args['number'] ) {
@@ -456,7 +456,7 @@ 
 			$instance = array();
 		} else {
 			$this->_set($widget_args['number']);
-			$instance = $all_instances[ $widget_args['number'] ];
+			$instance = $all_instances[$widget_args['number']];
 		}
 
 		/**
@@ -469,10 +469,10 @@ 
 		 * @param array     $instance The current widget instance's settings.
 		 * @param WP_Widget $this     The current widget instance.
 		 */
-		$instance = apply_filters( 'widget_form_callback', $instance, $this );
+		$instance = apply_filters('widget_form_callback', $instance, $this);
 
 		$return = null;
-		if ( false !== $instance ) {
+		if (false !== $instance) {
 			$return = $this->form($instance);
 
 			/**
@@ -491,7 +491,7 @@ 
 			 * @param null      $return   Return null if new fields are added.
 			 * @param array     $instance An array of the widget's settings.
 			 */
-			do_action_ref_array( 'in_widget_form', array( &$this, &$return, $instance ) );
+			do_action_ref_array('in_widget_form', array(&$this, &$return, $instance));
 		}
 		return $return;
 	}
@@ -505,10 +505,10 @@ 
 	 * @param integer $number Optional. The unique order number of this widget instance
 	 *                        compared to other instances of the same class. Default -1.
 	 */
-	public function _register_one( $number = -1 ) {
-		wp_register_sidebar_widget(	$this->id, $this->name,	$this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
-		_register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
-		_register_widget_form_callback(	$this->id, $this->name,	$this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
+	public function _register_one($number = -1) {
+		wp_register_sidebar_widget($this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array('number' => $number));
+		_register_widget_update_callback($this->id_base, $this->_get_update_callback(), $this->control_options, array('number' => -1));
+		_register_widget_form_callback($this->id, $this->name, $this->_get_form_callback(), $this->control_options, array('number' => $number));
 	}
 
 	/**
@@ -519,9 +519,9 @@ 
 	 *
 	 * @param array $settings Multi-dimensional array of widget instance settings.
 	 */
-	public function save_settings( $settings ) {
+	public function save_settings($settings) {
 		$settings['_multiwidget'] = 1;
-		update_option( $this->option_name, $settings );
+		update_option($this->option_name, $settings);
 	}
 
 	/**
@@ -534,22 +534,22 @@ 
 	 */
 	public function get_settings() {
 
-		$settings = get_option( $this->option_name );
+		$settings = get_option($this->option_name);
 
-		if ( false === $settings && isset( $this->alt_option_name ) ) {
-			$settings = get_option( $this->alt_option_name );
+		if (false === $settings && isset($this->alt_option_name)) {
+			$settings = get_option($this->alt_option_name);
 		}
 
-		if ( ! is_array( $settings ) && ! ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) ) {
+		if ( ! is_array($settings) && ! ($settings instanceof ArrayObject || $settings instanceof ArrayIterator)) {
 			$settings = array();
 		}
 
-		if ( ! empty( $settings ) && ! isset( $settings['_multiwidget'] ) ) {
+		if ( ! empty($settings) && ! isset($settings['_multiwidget'])) {
 			// Old format, convert if single widget.
-			$settings = wp_convert_widget_settings( $this->id_base, $this->option_name, $settings );
+			$settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings);
 		}
 
-		unset( $settings['_multiwidget'], $settings['__i__'] );
+		unset($settings['_multiwidget'], $settings['__i__']);
 		return $settings;
 	}
 }
@@ -568,14 +568,14 @@ 
 	 * PHP5 constructor.
 	 */
 	public function __construct() {
-		add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
+		add_action('widgets_init', array($this, '_register_widgets'), 100);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
 	public function WP_Widget_Factory() {
-		_deprecated_constructor( 'WP_Widget_Factory', '4.2.0' );
+		_deprecated_constructor('WP_Widget_Factory', '4.2.0');
 		self::__construct();
 	}
 
@@ -587,7 +587,7 @@ 
 	 *
 	 * @param string $widget_class The name of a {@see WP_Widget} subclass.
 	 */
-	public function register( $widget_class ) {
+	public function register($widget_class) {
 		$this->widgets[$widget_class] = new $widget_class();
 	}
 
@@ -599,8 +599,8 @@ 
 	 *
 	 * @param string $widget_class The name of a {@see WP_Widget} subclass.
 	 */
-	public function unregister( $widget_class ) {
-		unset( $this->widgets[ $widget_class ] );
+	public function unregister($widget_class) {
+		unset($this->widgets[$widget_class]);
 	}
 
 	/**
@@ -617,9 +617,9 @@ 
 		$registered = array_keys($wp_registered_widgets);
 		$registered = array_map('_get_widget_id_base', $registered);
 
-		foreach ( $keys as $key ) {
+		foreach ($keys as $key) {
 			// don't register new widget if old widget with the same id is already registered
-			if ( in_array($this->widgets[$key]->id_base, $registered, true) ) {
+			if (in_array($this->widgets[$key]->id_base, $registered, true)) {
 				unset($this->widgets[$key]);
 				continue;
 			}
@@ -766,33 +766,33 @@ 
  *                        Default 'Sidebar' for the first sidebar, otherwise 'Sidebar %d'.
  * }
  */
-function register_sidebars( $number = 1, $args = array() ) {
+function register_sidebars($number = 1, $args = array()) {
 	global $wp_registered_sidebars;
 	$number = (int) $number;
 
-	if ( is_string($args) )
+	if (is_string($args))
 		parse_str($args, $args);
 
-	for ( $i = 1; $i <= $number; $i++ ) {
+	for ($i = 1; $i <= $number; $i++) {
 		$_args = $args;
 
-		if ( $number > 1 )
+		if ($number > 1)
 			$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
 		else
 			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
 
 		// Custom specified ID's are suffixed if they exist already.
 		// Automatically generated sidebar names need to be suffixed regardless starting at -0
-		if ( isset($args['id']) ) {
+		if (isset($args['id'])) {
 			$_args['id'] = $args['id'];
 			$n = 2; // Start at -2 for conflicting custom ID's
-			while ( isset($wp_registered_sidebars[$_args['id']]) )
-				$_args['id'] = $args['id'] . '-' . $n++;
+			while (isset($wp_registered_sidebars[$_args['id']]))
+				$_args['id'] = $args['id'].'-'.$n++;
 		} else {
 			$n = count($wp_registered_sidebars);
 			do {
-				$_args['id'] = 'sidebar-' . ++$n;
-			} while ( isset($wp_registered_sidebars[$_args['id']]) );
+				$_args['id'] = 'sidebar-'.++$n;
+			} while (isset($wp_registered_sidebars[$_args['id']]));
 		}
 		register_sidebar($_args);
 	}
@@ -844,10 +844,10 @@ 
 
 	$i = count($wp_registered_sidebars) + 1;
 
-	$id_is_empty = empty( $args['id'] );
+	$id_is_empty = empty($args['id']);
 
 	$defaults = array(
-		'name' => sprintf(__('Sidebar %d'), $i ),
+		'name' => sprintf(__('Sidebar %d'), $i),
 		'id' => "sidebar-$i",
 		'description' => '',
 		'class' => '',
@@ -857,11 +857,11 @@ 
 		'after_title' => "</h2>\n",
 	);
 
-	$sidebar = wp_parse_args( $args, $defaults );
+	$sidebar = wp_parse_args($args, $defaults);
 
-	if ( $id_is_empty ) {
+	if ($id_is_empty) {
 		/* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
-		_doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
+		_doing_it_wrong(__FUNCTION__, sprintf(__('No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.'), '<code>id</code>', $sidebar['name'], $sidebar['id']), '4.2.0');
 	}
 
 	$wp_registered_sidebars[$sidebar['id']] = $sidebar;
@@ -875,7 +875,7 @@ 
 	 *
 	 * @param array $sidebar Parsed arguments for the registered sidebar.
 	 */
-	do_action( 'register_sidebar', $sidebar );
+	do_action('register_sidebar', $sidebar);
 
 	return $sidebar['id'];
 }
@@ -889,10 +889,10 @@ 
  *
  * @param string $name The ID of the sidebar when it was added.
  */
-function unregister_sidebar( $name ) {
+function unregister_sidebar($name) {
 	global $wp_registered_sidebars;
 
-	unset( $wp_registered_sidebars[ $name ] );
+	unset($wp_registered_sidebars[$name]);
 }
 
 /**
@@ -922,20 +922,20 @@ 
  *                               panel and/or theme.
  * }
  */
-function wp_register_sidebar_widget( $id, $name, $output_callback, $options = array() ) {
+function wp_register_sidebar_widget($id, $name, $output_callback, $options = array()) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates, $_wp_deprecated_widgets_callbacks;
 
 	$id = strtolower($id);
 
-	if ( empty($output_callback) ) {
+	if (empty($output_callback)) {
 		unset($wp_registered_widgets[$id]);
 		return;
 	}
 
 	$id_base = _get_widget_id_base($id);
-	if ( in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($output_callback) ) {
-		unset( $wp_registered_widget_controls[ $id ] );
-		unset( $wp_registered_widget_updates[ $id_base ] );
+	if (in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && ! is_callable($output_callback)) {
+		unset($wp_registered_widget_controls[$id]);
+		unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
 
@@ -949,7 +949,7 @@ 
 	);
 	$widget = array_merge($widget, $options);
 
-	if ( is_callable($output_callback) && ( !isset($wp_registered_widgets[$id]) || did_action( 'widgets_init' ) ) ) {
+	if (is_callable($output_callback) && ( ! isset($wp_registered_widgets[$id]) || did_action('widgets_init'))) {
 
 		/**
 		 * Fires once for each registered widget.
@@ -958,7 +958,7 @@ 
 		 *
 		 * @param array $widget An array of default widget arguments.
 		 */
-		do_action( 'wp_register_sidebar_widget', $widget );
+		do_action('wp_register_sidebar_widget', $widget);
 		$wp_registered_widgets[$id] = $widget;
 	}
 }
@@ -977,14 +977,14 @@ 
  * @param int|string $id Widget ID.
  * @return string|void Widget description, if available.
  */
-function wp_widget_description( $id ) {
-	if ( !is_scalar($id) )
+function wp_widget_description($id) {
+	if ( ! is_scalar($id))
 		return;
 
 	global $wp_registered_widgets;
 
-	if ( isset($wp_registered_widgets[$id]['description']) )
-		return esc_html( $wp_registered_widgets[$id]['description'] );
+	if (isset($wp_registered_widgets[$id]['description']))
+		return esc_html($wp_registered_widgets[$id]['description']);
 }
 
 /**
@@ -1000,14 +1000,14 @@ 
  * @param string $id sidebar ID.
  * @return string|void Sidebar description, if available.
  */
-function wp_sidebar_description( $id ) {
-	if ( !is_scalar($id) )
+function wp_sidebar_description($id) {
+	if ( ! is_scalar($id))
 		return;
 
 	global $wp_registered_sidebars;
 
-	if ( isset($wp_registered_sidebars[$id]['description']) )
-		return esc_html( $wp_registered_sidebars[$id]['description'] );
+	if (isset($wp_registered_sidebars[$id]['description']))
+		return esc_html($wp_registered_sidebars[$id]['description']);
 }
 
 /**
@@ -1026,7 +1026,7 @@ 
 	 *
 	 * @param int $id The widget ID.
 	 */
-	do_action( 'wp_unregister_sidebar_widget', $id );
+	do_action('wp_unregister_sidebar_widget', $id);
 
 	wp_register_sidebar_widget($id, '', '');
 	wp_unregister_widget_control($id);
@@ -1057,27 +1057,27 @@ 
  * @param callback     $control_callback Run when sidebar is displayed.
  * @param array|string $options          Optional. Widget options. See description above. Default empty array.
  */
-function wp_register_widget_control( $id, $name, $control_callback, $options = array() ) {
+function wp_register_widget_control($id, $name, $control_callback, $options = array()) {
 	global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks;
 
 	$id = strtolower($id);
 	$id_base = _get_widget_id_base($id);
 
-	if ( empty($control_callback) ) {
+	if (empty($control_callback)) {
 		unset($wp_registered_widget_controls[$id]);
 		unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
 
-	if ( in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($control_callback) ) {
-		unset( $wp_registered_widgets[ $id ] );
+	if (in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && ! is_callable($control_callback)) {
+		unset($wp_registered_widgets[$id]);
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if (isset($wp_registered_widget_controls[$id]) && ! did_action('widgets_init'))
 		return;
 
-	$defaults = array('width' => 250, 'height' => 200 ); // height is never used
+	$defaults = array('width' => 250, 'height' => 200); // height is never used
 	$options = wp_parse_args($options, $defaults);
 	$options['width'] = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
@@ -1092,10 +1092,10 @@ 
 
 	$wp_registered_widget_controls[$id] = $widget;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) )
+	if (isset($wp_registered_widget_updates[$id_base]))
 		return;
 
-	if ( isset($widget['params'][0]['number']) )
+	if (isset($widget['params'][0]['number']))
 		$widget['params'][0]['number'] = -1;
 
 	unset($widget['width'], $widget['height'], $widget['name'], $widget['id']);
@@ -1112,8 +1112,8 @@ 
 function _register_widget_update_callback($id_base, $update_callback, $options = array()) {
 	global $wp_registered_widget_updates;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) ) {
-		if ( empty($update_callback) )
+	if (isset($wp_registered_widget_updates[$id_base])) {
+		if (empty($update_callback))
 			unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
@@ -1141,15 +1141,15 @@ 
 
 	$id = strtolower($id);
 
-	if ( empty($form_callback) ) {
+	if (empty($form_callback)) {
 		unset($wp_registered_widget_controls[$id]);
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if (isset($wp_registered_widget_controls[$id]) && ! did_action('widgets_init'))
 		return;
 
-	$defaults = array('width' => 250, 'height' => 200 );
+	$defaults = array('width' => 250, 'height' => 200);
 	$options = wp_parse_args($options, $defaults);
 	$options['width'] = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
@@ -1173,7 +1173,7 @@ 
  * @param int|string $id Widget ID.
  */
 function wp_unregister_widget_control($id) {
-	wp_register_widget_control( $id, '', '' );
+	wp_register_widget_control($id, '', '');
 }
 
 /**
@@ -1194,12 +1194,12 @@ 
 function dynamic_sidebar($index = 1) {
 	global $wp_registered_sidebars, $wp_registered_widgets;
 
-	if ( is_int($index) ) {
+	if (is_int($index)) {
 		$index = "sidebar-$index";
 	} else {
 		$index = sanitize_title($index);
-		foreach ( (array) $wp_registered_sidebars as $key => $value ) {
-			if ( sanitize_title($value['name']) == $index ) {
+		foreach ((array) $wp_registered_sidebars as $key => $value) {
+			if (sanitize_title($value['name']) == $index) {
 				$index = $key;
 				break;
 			}
@@ -1207,13 +1207,13 @@ 
 	}
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
-	if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
+	if (empty($wp_registered_sidebars[$index]) || empty($sidebars_widgets[$index]) || ! is_array($sidebars_widgets[$index])) {
 		/** This action is documented in wp-includes/widgets.php */
-		do_action( 'dynamic_sidebar_before', $index, false );
+		do_action('dynamic_sidebar_before', $index, false);
 		/** This action is documented in wp-includes/widgets.php */
-		do_action( 'dynamic_sidebar_after',  $index, false );
+		do_action('dynamic_sidebar_after', $index, false);
 		/** This filter is documented in wp-includes/widgets.php */
-		return apply_filters( 'dynamic_sidebar_has_widgets', false, $index );
+		return apply_filters('dynamic_sidebar_has_widgets', false, $index);
 	}
 
 	/**
@@ -1228,26 +1228,26 @@ 
 	 * @param bool       $has_widgets Whether the sidebar is populated with widgets.
 	 *                                Default true.
 	 */
-	do_action( 'dynamic_sidebar_before', $index, true );
+	do_action('dynamic_sidebar_before', $index, true);
 	$sidebar = $wp_registered_sidebars[$index];
 
 	$did_one = false;
-	foreach ( (array) $sidebars_widgets[$index] as $id ) {
+	foreach ((array) $sidebars_widgets[$index] as $id) {
 
-		if ( !isset($wp_registered_widgets[$id]) ) continue;
+		if ( ! isset($wp_registered_widgets[$id])) continue;
 
 		$params = array_merge(
-			array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
+			array(array_merge($sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']))),
 			(array) $wp_registered_widgets[$id]['params']
 		);
 
 		// Substitute HTML id and class attributes into before_widget
 		$classname_ = '';
-		foreach ( (array) $wp_registered_widgets[$id]['classname'] as $cn ) {
-			if ( is_string($cn) )
-				$classname_ .= '_' . $cn;
-			elseif ( is_object($cn) )
-				$classname_ .= '_' . get_class($cn);
+		foreach ((array) $wp_registered_widgets[$id]['classname'] as $cn) {
+			if (is_string($cn))
+				$classname_ .= '_'.$cn;
+			elseif (is_object($cn))
+				$classname_ .= '_'.get_class($cn);
 		}
 		$classname_ = ltrim($classname_, '_');
 		$params[0]['before_widget'] = sprintf($params[0]['before_widget'], $id, $classname_);
@@ -1284,7 +1284,7 @@ 
 		 *     }
 		 * }
 		 */
-		$params = apply_filters( 'dynamic_sidebar_params', $params );
+		$params = apply_filters('dynamic_sidebar_params', $params);
 
 		$callback = $wp_registered_widgets[$id]['callback'];
 
@@ -1313,9 +1313,9 @@ 
 		 *                                       with an array containing the widget object, see $callback.
 		 * }
 		 */
-		do_action( 'dynamic_sidebar', $wp_registered_widgets[ $id ] );
+		do_action('dynamic_sidebar', $wp_registered_widgets[$id]);
 
-		if ( is_callable($callback) ) {
+		if (is_callable($callback)) {
 			call_user_func_array($callback, $params);
 			$did_one = true;
 		}
@@ -1333,7 +1333,7 @@ 
 	 * @param bool       $has_widgets Whether the sidebar is populated with widgets.
 	 *                                Default true.
 	 */
-	do_action( 'dynamic_sidebar_after', $index, true );
+	do_action('dynamic_sidebar_after', $index, true);
 
 	/**
 	 * Filter whether a sidebar has widgets.
@@ -1347,7 +1347,7 @@ 
 	 *                            Default false.
 	 * @param int|string $index   Index, name, or ID of the dynamic sidebar.
 	 */
-	return apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index );
+	return apply_filters('dynamic_sidebar_has_widgets', $did_one, $index);
 }
 
 /**
@@ -1378,16 +1378,16 @@ 
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
 
-	if ( is_array($sidebars_widgets) ) {
-		foreach ( $sidebars_widgets as $sidebar => $widgets ) {
-			if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) ) {
+	if (is_array($sidebars_widgets)) {
+		foreach ($sidebars_widgets as $sidebar => $widgets) {
+			if ($skip_inactive && ('wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr($sidebar, 0, 16))) {
 				continue;
 			}
 
-			if ( is_array($widgets) ) {
-				foreach ( $widgets as $widget ) {
-					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && _get_widget_id_base($widget) == $id_base ) ) {
-						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
+			if (is_array($widgets)) {
+				foreach ($widgets as $widget) {
+					if (($callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback) || ($id_base && _get_widget_id_base($widget) == $id_base)) {
+						if ( ! $widget_id || $widget_id == $wp_registered_widgets[$widget]['id'])
 							return $sidebar;
 					}
 				}
@@ -1410,10 +1410,10 @@ 
 function is_dynamic_sidebar() {
 	global $wp_registered_widgets, $wp_registered_sidebars;
 	$sidebars_widgets = get_option('sidebars_widgets');
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
-		if ( count($sidebars_widgets[$index]) ) {
-			foreach ( (array) $sidebars_widgets[$index] as $widget )
-				if ( array_key_exists($widget, $wp_registered_widgets) )
+	foreach ((array) $wp_registered_sidebars as $index => $sidebar) {
+		if (count($sidebars_widgets[$index])) {
+			foreach ((array) $sidebars_widgets[$index] as $widget)
+				if (array_key_exists($widget, $wp_registered_widgets))
 					return true;
 		}
 	}
@@ -1428,10 +1428,10 @@ 
  * @param string|int $index Sidebar name, id or number to check.
  * @return bool true if the sidebar is in use, false otherwise.
  */
-function is_active_sidebar( $index ) {
-	$index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
+function is_active_sidebar($index) {
+	$index = (is_int($index)) ? "sidebar-$index" : sanitize_title($index);
 	$sidebars_widgets = wp_get_sidebars_widgets();
-	$is_active_sidebar = ! empty( $sidebars_widgets[$index] );
+	$is_active_sidebar = ! empty($sidebars_widgets[$index]);
 
 	/**
 	 * Filter whether a dynamic sidebar is considered "active".
@@ -1442,7 +1442,7 @@ 
 	 *                                      In other words, whether the sidebar contains any widgets.
 	 * @param int|string $index             Index, name, or ID of the dynamic sidebar.
 	 */
-	return apply_filters( 'is_active_sidebar', $is_active_sidebar, $index );
+	return apply_filters('is_active_sidebar', $is_active_sidebar, $index);
 }
 
 /* Internal Functions */
@@ -1462,16 +1462,16 @@ 
  * @param bool $deprecated Not used (argument deprecated).
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
-function wp_get_sidebars_widgets( $deprecated = true ) {
-	if ( $deprecated !== true )
-		_deprecated_argument( __FUNCTION__, '2.8.1' );
+function wp_get_sidebars_widgets($deprecated = true) {
+	if ($deprecated !== true)
+		_deprecated_argument(__FUNCTION__, '2.8.1');
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
-	if ( !is_admin() ) {
-		if ( empty($_wp_sidebars_widgets) )
+	if ( ! is_admin()) {
+		if (empty($_wp_sidebars_widgets))
 			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
 
 		$sidebars_widgets = $_wp_sidebars_widgets;
@@ -1479,7 +1479,7 @@ 
 		$sidebars_widgets = get_option('sidebars_widgets', array());
 	}
 
-	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) )
+	if (is_array($sidebars_widgets) && isset($sidebars_widgets['array_version']))
 		unset($sidebars_widgets['array_version']);
 
 	/**
@@ -1489,7 +1489,7 @@ 
 	 *
 	 * @param array $sidebars_widgets An associative array of sidebars and their widgets.
 	 */
-	return apply_filters( 'sidebars_widgets', $sidebars_widgets );
+	return apply_filters('sidebars_widgets', $sidebars_widgets);
 }
 
 /**
@@ -1500,10 +1500,10 @@ 
  *
  * @param array $sidebars_widgets Sidebar widgets and their settings.
  */
-function wp_set_sidebars_widgets( $sidebars_widgets ) {
-	if ( !isset( $sidebars_widgets['array_version'] ) )
+function wp_set_sidebars_widgets($sidebars_widgets) {
+	if ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 3;
-	update_option( 'sidebars_widgets', $sidebars_widgets );
+	update_option('sidebars_widgets', $sidebars_widgets);
 }
 
 /**
@@ -1521,7 +1521,7 @@ 
 
 	$defaults = array();
 
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
+	foreach ((array) $wp_registered_sidebars as $index => $sidebar)
 		$defaults[$index] = array();
 
 	return $defaults;
@@ -1542,35 +1542,35 @@ 
 function wp_convert_widget_settings($base_name, $option_name, $settings) {
 	// This test may need expanding.
 	$single = $changed = false;
-	if ( empty($settings) ) {
+	if (empty($settings)) {
 		$single = true;
 	} else {
-		foreach ( array_keys($settings) as $number ) {
-			if ( 'number' == $number )
+		foreach (array_keys($settings) as $number) {
+			if ('number' == $number)
 				continue;
-			if ( !is_numeric($number) ) {
+			if ( ! is_numeric($number)) {
 				$single = true;
 				break;
 			}
 		}
 	}
 
-	if ( $single ) {
-		$settings = array( 2 => $settings );
+	if ($single) {
+		$settings = array(2 => $settings);
 
 		// If loading from the front page, update sidebar in memory but don't save to options
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$sidebars_widgets = get_option('sidebars_widgets');
 		} else {
-			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
+			if (empty($GLOBALS['_wp_sidebars_widgets']))
 				$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
 			$sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
 		}
 
-		foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
-			if ( is_array($sidebar) ) {
-				foreach ( $sidebar as $i => $name ) {
-					if ( $base_name == $name ) {
+		foreach ((array) $sidebars_widgets as $index => $sidebar) {
+			if (is_array($sidebar)) {
+				foreach ($sidebar as $i => $name) {
+					if ($base_name == $name) {
 						$sidebars_widgets[$index][$i] = "$name-2";
 						$changed = true;
 						break 2;
@@ -1579,13 +1579,13 @@ 
 			}
 		}
 
-		if ( is_admin() && $changed )
+		if (is_admin() && $changed)
 			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
-		update_option( $option_name, $settings );
+	if (is_admin())
+		update_option($option_name, $settings);
 
 	return $settings;
 }
@@ -1612,16 +1612,16 @@ 
  *                                 Default `</h2>`.
  * }
  */
-function the_widget( $widget, $instance = array(), $args = array() ) {
+function the_widget($widget, $instance = array(), $args = array()) {
 	global $wp_widget_factory;
 
 	$widget_obj = $wp_widget_factory->widgets[$widget];
-	if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+	if ( ! ($widget_obj instanceof WP_Widget)) {
 		return;
 	}
 
-	$before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname'] );
-	$default_args = array( 'before_widget' => $before_widget, 'after_widget' => "</div>", 'before_title' => '<h2 class="widgettitle">', 'after_title' => '</h2>' );
+	$before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname']);
+	$default_args = array('before_widget' => $before_widget, 'after_widget' => "</div>", 'before_title' => '<h2 class="widgettitle">', 'after_title' => '</h2>');
 
 	$args = wp_parse_args($args, $default_args);
 	$instance = wp_parse_args($instance);
@@ -1635,7 +1635,7 @@ 
 	 * @param array  $instance The current widget instance's settings.
 	 * @param array  $args     An array of the widget's sidebar arguments.
 	 */
-	do_action( 'the_widget', $widget, $instance, $args );
+	do_action('the_widget', $widget, $instance, $args);
 
 	$widget_obj->_set(-1);
 	$widget_obj->widget($args, $instance);
@@ -1647,7 +1647,7 @@ 
  * @return string
  */
 function _get_widget_id_base($id) {
-	return preg_replace( '/-[0-9]+$/', '', $id );
+	return preg_replace('/-[0-9]+$/', '', $id);
 }
 
 /**
@@ -1661,7 +1661,7 @@ 
 function _wp_sidebars_changed() {
 	global $sidebars_widgets;
 
-	if ( ! is_array( $sidebars_widgets ) )
+	if ( ! is_array($sidebars_widgets))
 		$sidebars_widgets = wp_get_sidebars_widgets();
 
 	retrieve_widgets(true);
@@ -1680,78 +1680,78 @@ 
  *                                   of 'customize' defers updates for the Customizer.
  * @return array|void
  */
-function retrieve_widgets( $theme_changed = false ) {
+function retrieve_widgets($theme_changed = false) {
 	global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
-	$registered_sidebar_keys = array_keys( $wp_registered_sidebars );
+	$registered_sidebar_keys = array_keys($wp_registered_sidebars);
 	$orphaned = 0;
 
-	$old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
-	if ( is_array( $old_sidebars_widgets ) ) {
+	$old_sidebars_widgets = get_theme_mod('sidebars_widgets');
+	if (is_array($old_sidebars_widgets)) {
 		// time() that sidebars were stored is in $old_sidebars_widgets['time']
 		$_sidebars_widgets = $old_sidebars_widgets['data'];
 
-		if ( 'customize' !== $theme_changed ) {
-			remove_theme_mod( 'sidebars_widgets' );
+		if ('customize' !== $theme_changed) {
+			remove_theme_mod('sidebars_widgets');
 		}
 
-		foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-			if ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+		foreach ($_sidebars_widgets as $sidebar => $widgets) {
+			if ('wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr($sidebar, 0, 16)) {
 				continue;
 			}
 
-			if ( !in_array( $sidebar, $registered_sidebar_keys ) ) {
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $widgets;
-				unset( $_sidebars_widgets[$sidebar] );
+			if ( ! in_array($sidebar, $registered_sidebar_keys)) {
+				$_sidebars_widgets['orphaned_widgets_'.++$orphaned] = $widgets;
+				unset($_sidebars_widgets[$sidebar]);
 			}
 		}
 	} else {
-		if ( empty( $sidebars_widgets ) )
+		if (empty($sidebars_widgets))
 			return;
 
-		unset( $sidebars_widgets['array_version'] );
+		unset($sidebars_widgets['array_version']);
 
 		$old = array_keys($sidebars_widgets);
 		sort($old);
 		sort($registered_sidebar_keys);
 
-		if ( $old == $registered_sidebar_keys )
+		if ($old == $registered_sidebar_keys)
 			return;
 
 		$_sidebars_widgets = array(
-			'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
+			'wp_inactive_widgets' => ! empty($sidebars_widgets['wp_inactive_widgets']) ? $sidebars_widgets['wp_inactive_widgets'] : array()
 		);
 
-		unset( $sidebars_widgets['wp_inactive_widgets'] );
+		unset($sidebars_widgets['wp_inactive_widgets']);
 
-		foreach ( $wp_registered_sidebars as $id => $settings ) {
-			if ( $theme_changed ) {
-				$_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+		foreach ($wp_registered_sidebars as $id => $settings) {
+			if ($theme_changed) {
+				$_sidebars_widgets[$id] = array_shift($sidebars_widgets);
 			} else {
 				// no theme change, grab only sidebars that are currently registered
-				if ( isset( $sidebars_widgets[$id] ) ) {
+				if (isset($sidebars_widgets[$id])) {
 					$_sidebars_widgets[$id] = $sidebars_widgets[$id];
-					unset( $sidebars_widgets[$id] );
+					unset($sidebars_widgets[$id]);
 				}
 			}
 		}
 
-		foreach ( $sidebars_widgets as $val ) {
-			if ( is_array($val) && ! empty( $val ) )
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+		foreach ($sidebars_widgets as $val) {
+			if (is_array($val) && ! empty($val))
+				$_sidebars_widgets['orphaned_widgets_'.++$orphaned] = $val;
 		}
 	}
 
 	// discard invalid, theme-specific widgets from sidebars
 	$shown_widgets = array();
 
-	foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-		if ( !is_array($widgets) )
+	foreach ($_sidebars_widgets as $sidebar => $widgets) {
+		if ( ! is_array($widgets))
 			continue;
 
 		$_widgets = array();
-		foreach ( $widgets as $widget ) {
-			if ( isset($wp_registered_widgets[$widget]) )
+		foreach ($widgets as $widget) {
+			if (isset($wp_registered_widgets[$widget]))
 				$_widgets[] = $widget;
 		}
 
@@ -1764,21 +1764,21 @@ 
 
 	// find hidden/lost multi-widget instances
 	$lost_widgets = array();
-	foreach ( $wp_registered_widgets as $key => $val ) {
-		if ( in_array($key, $shown_widgets, true) )
+	foreach ($wp_registered_widgets as $key => $val) {
+		if (in_array($key, $shown_widgets, true))
 			continue;
 
 		$number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
 
-		if ( 2 > (int) $number )
+		if (2 > (int) $number)
 			continue;
 
 		$lost_widgets[] = $key;
 	}
 
 	$sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
-	if ( 'customize' !== $theme_changed ) {
-		wp_set_sidebars_widgets( $sidebars_widgets );
+	if ('customize' !== $theme_changed) {
+		wp_set_sidebars_widgets($sidebars_widgets);
 	}
 
 	return $sidebars_widgets;

Braces +119 added lines, -81 removed lines

@@ -365,21 +365,24 @@ 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
-			return;
+		if ( $this->updated ) {
+					return;
+		}
 
 		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
-				$del_id = $_POST['the-widget-id'];
-			else
-				return;
+			if ( isset($_POST['the-widget-id']) ) {
+							$del_id = $_POST['the-widget-id'];
+			} else {
+							return;
+			}
 
 			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
-					unset($all_instances[$number]);
+				if ( $this->id_base . '-' . $number == $del_id ) {
+									unset($all_instances[$number]);
+				}
 			}
 		} else {
 			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
@@ -444,8 +447,9 @@ 
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+		if ( is_numeric($widget_args) ) {
+					$widget_args = array( 'number' => $widget_args );
+		}
 
 		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
 		$all_instances = $this->get_settings();
@@ -770,24 +774,27 @@ 
 	global $wp_registered_sidebars;
 	$number = (int) $number;
 
-	if ( is_string($args) )
-		parse_str($args, $args);
+	if ( is_string($args) ) {
+			parse_str($args, $args);
+	}
 
 	for ( $i = 1; $i <= $number; $i++ ) {
 		$_args = $args;
 
-		if ( $number > 1 )
-			$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
-		else
-			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
+		if ( $number > 1 ) {
+					$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
+		} else {
+					$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
+		}
 
 		// Custom specified ID's are suffixed if they exist already.
 		// Automatically generated sidebar names need to be suffixed regardless starting at -0
 		if ( isset($args['id']) ) {
 			$_args['id'] = $args['id'];
 			$n = 2; // Start at -2 for conflicting custom ID's
-			while ( isset($wp_registered_sidebars[$_args['id']]) )
-				$_args['id'] = $args['id'] . '-' . $n++;
+			while ( isset($wp_registered_sidebars[$_args['id']]) ) {
+							$_args['id'] = $args['id'] . '-' . $n++;
+			}
 		} else {
 			$n = count($wp_registered_sidebars);
 			do {
@@ -978,14 +985,16 @@ 
  * @return string|void Widget description, if available.
  */
 function wp_widget_description( $id ) {
-	if ( !is_scalar($id) )
-		return;
+	if ( !is_scalar($id) ) {
+			return;
+	}
 
 	global $wp_registered_widgets;
 
-	if ( isset($wp_registered_widgets[$id]['description']) )
-		return esc_html( $wp_registered_widgets[$id]['description'] );
-}
+	if ( isset($wp_registered_widgets[$id]['description']) ) {
+			return esc_html( $wp_registered_widgets[$id]['description'] );
+	}
+	}
 
 /**
  * Retrieve description for a sidebar.
@@ -1001,14 +1010,16 @@ 
  * @return string|void Sidebar description, if available.
  */
 function wp_sidebar_description( $id ) {
-	if ( !is_scalar($id) )
-		return;
+	if ( !is_scalar($id) ) {
+			return;
+	}
 
 	global $wp_registered_sidebars;
 
-	if ( isset($wp_registered_sidebars[$id]['description']) )
-		return esc_html( $wp_registered_sidebars[$id]['description'] );
-}
+	if ( isset($wp_registered_sidebars[$id]['description']) ) {
+			return esc_html( $wp_registered_sidebars[$id]['description'] );
+	}
+	}
 
 /**
  * Remove widget from sidebar.
@@ -1074,8 +1085,9 @@ 
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
-		return;
+	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) ) {
+			return;
+	}
 
 	$defaults = array('width' => 250, 'height' => 200 ); // height is never used
 	$options = wp_parse_args($options, $defaults);
@@ -1092,11 +1104,13 @@ 
 
 	$wp_registered_widget_controls[$id] = $widget;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) )
-		return;
+	if ( isset($wp_registered_widget_updates[$id_base]) ) {
+			return;
+	}
 
-	if ( isset($widget['params'][0]['number']) )
-		$widget['params'][0]['number'] = -1;
+	if ( isset($widget['params'][0]['number']) ) {
+			$widget['params'][0]['number'] = -1;
+	}
 
 	unset($widget['width'], $widget['height'], $widget['name'], $widget['id']);
 	$wp_registered_widget_updates[$id_base] = $widget;
@@ -1113,8 +1127,9 @@ 
 	global $wp_registered_widget_updates;
 
 	if ( isset($wp_registered_widget_updates[$id_base]) ) {
-		if ( empty($update_callback) )
-			unset($wp_registered_widget_updates[$id_base]);
+		if ( empty($update_callback) ) {
+					unset($wp_registered_widget_updates[$id_base]);
+		}
 		return;
 	}
 
@@ -1146,8 +1161,9 @@ 
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
-		return;
+	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) ) {
+			return;
+	}
 
 	$defaults = array('width' => 250, 'height' => 200 );
 	$options = wp_parse_args($options, $defaults);
@@ -1234,7 +1250,9 @@ 
 	$did_one = false;
 	foreach ( (array) $sidebars_widgets[$index] as $id ) {
 
-		if ( !isset($wp_registered_widgets[$id]) ) continue;
+		if ( !isset($wp_registered_widgets[$id]) ) {
+			continue;
+		}
 
 		$params = array_merge(
 			array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
@@ -1244,10 +1262,11 @@ 
 		// Substitute HTML id and class attributes into before_widget
 		$classname_ = '';
 		foreach ( (array) $wp_registered_widgets[$id]['classname'] as $cn ) {
-			if ( is_string($cn) )
-				$classname_ .= '_' . $cn;
-			elseif ( is_object($cn) )
-				$classname_ .= '_' . get_class($cn);
+			if ( is_string($cn) ) {
+							$classname_ .= '_' . $cn;
+			} elseif ( is_object($cn) ) {
+							$classname_ .= '_' . get_class($cn);
+			}
 		}
 		$classname_ = ltrim($classname_, '_');
 		$params[0]['before_widget'] = sprintf($params[0]['before_widget'], $id, $classname_);
@@ -1387,8 +1406,9 @@ 
 			if ( is_array($widgets) ) {
 				foreach ( $widgets as $widget ) {
 					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && _get_widget_id_base($widget) == $id_base ) ) {
-						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
-							return $sidebar;
+						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] ) {
+													return $sidebar;
+						}
 					}
 				}
 			}
@@ -1412,9 +1432,10 @@ 
 	$sidebars_widgets = get_option('sidebars_widgets');
 	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
 		if ( count($sidebars_widgets[$index]) ) {
-			foreach ( (array) $sidebars_widgets[$index] as $widget )
-				if ( array_key_exists($widget, $wp_registered_widgets) )
+			foreach ( (array) $sidebars_widgets[$index] as $widget ) {
+							if ( array_key_exists($widget, $wp_registered_widgets) )
 					return true;
+			}
 		}
 	}
 	return false;
@@ -1463,24 +1484,27 @@ 
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
 function wp_get_sidebars_widgets( $deprecated = true ) {
-	if ( $deprecated !== true )
-		_deprecated_argument( __FUNCTION__, '2.8.1' );
+	if ( $deprecated !== true ) {
+			_deprecated_argument( __FUNCTION__, '2.8.1' );
+	}
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
 	if ( !is_admin() ) {
-		if ( empty($_wp_sidebars_widgets) )
-			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
+		if ( empty($_wp_sidebars_widgets) ) {
+					$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
+		}
 
 		$sidebars_widgets = $_wp_sidebars_widgets;
 	} else {
 		$sidebars_widgets = get_option('sidebars_widgets', array());
 	}
 
-	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) )
-		unset($sidebars_widgets['array_version']);
+	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) ) {
+			unset($sidebars_widgets['array_version']);
+	}
 
 	/**
 	 * Filter the list of sidebars and their widgets.
@@ -1501,8 +1525,9 @@ 
  * @param array $sidebars_widgets Sidebar widgets and their settings.
  */
 function wp_set_sidebars_widgets( $sidebars_widgets ) {
-	if ( !isset( $sidebars_widgets['array_version'] ) )
-		$sidebars_widgets['array_version'] = 3;
+	if ( !isset( $sidebars_widgets['array_version'] ) ) {
+			$sidebars_widgets['array_version'] = 3;
+	}
 	update_option( 'sidebars_widgets', $sidebars_widgets );
 }
 
@@ -1521,8 +1546,9 @@ 
 
 	$defaults = array();
 
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
-		$defaults[$index] = array();
+	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
+			$defaults[$index] = array();
+	}
 
 	return $defaults;
 }
@@ -1546,8 +1572,9 @@ 
 		$single = true;
 	} else {
 		foreach ( array_keys($settings) as $number ) {
-			if ( 'number' == $number )
-				continue;
+			if ( 'number' == $number ) {
+							continue;
+			}
 			if ( !is_numeric($number) ) {
 				$single = true;
 				break;
@@ -1562,8 +1589,9 @@ 
 		if ( is_admin() ) {
 			$sidebars_widgets = get_option('sidebars_widgets');
 		} else {
-			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
-				$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+			if ( empty($GLOBALS['_wp_sidebars_widgets']) ) {
+							$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+			}
 			$sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
 		}
 
@@ -1579,13 +1607,15 @@ 
 			}
 		}
 
-		if ( is_admin() && $changed )
-			update_option('sidebars_widgets', $sidebars_widgets);
+		if ( is_admin() && $changed ) {
+					update_option('sidebars_widgets', $sidebars_widgets);
+		}
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
-		update_option( $option_name, $settings );
+	if ( is_admin() ) {
+			update_option( $option_name, $settings );
+	}
 
 	return $settings;
 }
@@ -1661,8 +1691,9 @@ 
 function _wp_sidebars_changed() {
 	global $sidebars_widgets;
 
-	if ( ! is_array( $sidebars_widgets ) )
-		$sidebars_widgets = wp_get_sidebars_widgets();
+	if ( ! is_array( $sidebars_widgets ) ) {
+			$sidebars_widgets = wp_get_sidebars_widgets();
+	}
 
 	retrieve_widgets(true);
 }
@@ -1706,8 +1737,9 @@ 
 			}
 		}
 	} else {
-		if ( empty( $sidebars_widgets ) )
-			return;
+		if ( empty( $sidebars_widgets ) ) {
+					return;
+		}
 
 		unset( $sidebars_widgets['array_version'] );
 
@@ -1715,8 +1747,9 @@ 
 		sort($old);
 		sort($registered_sidebar_keys);
 
-		if ( $old == $registered_sidebar_keys )
-			return;
+		if ( $old == $registered_sidebar_keys ) {
+					return;
+		}
 
 		$_sidebars_widgets = array(
 			'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
@@ -1737,8 +1770,9 @@ 
 		}
 
 		foreach ( $sidebars_widgets as $val ) {
-			if ( is_array($val) && ! empty( $val ) )
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+			if ( is_array($val) && ! empty( $val ) ) {
+							$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+			}
 		}
 	}
 
@@ -1746,13 +1780,15 @@ 
 	$shown_widgets = array();
 
 	foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-		if ( !is_array($widgets) )
-			continue;
+		if ( !is_array($widgets) ) {
+					continue;
+		}
 
 		$_widgets = array();
 		foreach ( $widgets as $widget ) {
-			if ( isset($wp_registered_widgets[$widget]) )
-				$_widgets[] = $widget;
+			if ( isset($wp_registered_widgets[$widget]) ) {
+							$_widgets[] = $widget;
+			}
 		}
 
 		$_sidebars_widgets[$sidebar] = $_widgets;
@@ -1765,13 +1801,15 @@ 
 	// find hidden/lost multi-widget instances
 	$lost_widgets = array();
 	foreach ( $wp_registered_widgets as $key => $val ) {
-		if ( in_array($key, $shown_widgets, true) )
-			continue;
+		if ( in_array($key, $shown_widgets, true) ) {
+					continue;
+		}
 
 		$number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
 
-		if ( 2 > (int) $number )
-			continue;
+		if ( 2 > (int) $number ) {
+					continue;
+		}
 
 		$lost_widgets[] = $key;
 	}

src/wp-includes/wp-db.php

Doc Comments +5 added lines, -7 removed lines

@@ -654,7 +654,7 @@ 
 	 *
 	 * @see wpdb::__construct()
 	 * @since 2.0.8
-	 * @return true
+	 * @return boolean
 	 */
 	public function __destruct() {
 		return true;
@@ -1203,8 +1203,6 @@ 
 	 * @param array|mixed $args     The array of variables to substitute into the query's placeholders if being called like
 	 *                              {@link http://php.net/vsprintf vsprintf()}, or the first variable to substitute into the query's placeholders if
 	 *                              being called like {@link http://php.net/sprintf sprintf()}.
-	 * @param mixed       $args,... further variables to substitute into the query's placeholders if being called like
-	 *                              {@link http://php.net/sprintf sprintf()}.
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
 	public function prepare( $query, $args ) {
@@ -1413,7 +1411,7 @@ 
 	 * @since 3.9.0 $allow_bail parameter added.
 	 *
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
-	 * @return bool True with a successful connection, false on failure.
+	 * @return null|boolean True with a successful connection, false on failure.
 	 */
 	public function db_connect( $allow_bail = true ) {
 		$this->is_mysql = true;
@@ -2960,7 +2958,7 @@ 
 	 *
 	 * @since 1.5.0
 	 *
-	 * @return true
+	 * @return boolean
 	 */
 	public function timer_start() {
 		$this->time_start = microtime( true );
@@ -3062,7 +3060,7 @@ 
 	 * @param string $db_cap The feature to check for. Accepts 'collation',
 	 *                       'group_concat', 'subqueries', 'set_charset',
 	 *                       or 'utf8mb4'.
-	 * @return int|false Whether the database feature is supported, false otherwise.
+	 * @return boolean Whether the database feature is supported, false otherwise.
 	 */
 	public function has_cap( $db_cap ) {
 		$version = $this->db_version();
@@ -3118,7 +3116,7 @@ 
 	 *
 	 * @since 2.7.0
 	 *
-	 * @return null|string Null on failure, version number on success.
+	 * @return string Null on failure, version number on success.
 	 */
 	public function db_version() {
 		if ( $this->use_mysqli ) {

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress DB Class
- *
- * Original code from {@link http://php.justinvincent.com Justin Vincent (justin@visunet.ie)}
- *
- * @package WordPress
- * @subpackage Database
- * @since 0.71
- */
+	 * WordPress DB Class
+	 *
+	 * Original code from {@link http://php.justinvincent.com Justin Vincent (justin@visunet.ie)}
+	 *
+	 * @package WordPress
+	 * @subpackage Database
+	 * @since 0.71
+	 */
 
 /**
  * @since 0.71

Spacing +579 added lines, -579 removed lines

@@ -12,28 +12,28 @@ 
 /**
  * @since 0.71
  */
-define( 'EZSQL_VERSION', 'WP1.25' );
+define('EZSQL_VERSION', 'WP1.25');
 
 /**
  * @since 0.71
  */
-define( 'OBJECT', 'OBJECT' );
-define( 'object', 'OBJECT' ); // Back compat.
+define('OBJECT', 'OBJECT');
+define('object', 'OBJECT'); // Back compat.
 
 /**
  * @since 2.5.0
  */
-define( 'OBJECT_K', 'OBJECT_K' );
+define('OBJECT_K', 'OBJECT_K');
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_A', 'ARRAY_A' );
+define('ARRAY_A', 'ARRAY_A');
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_N', 'ARRAY_N' );
+define('ARRAY_N', 'ARRAY_N');
 
 /**
  * WordPress Database Access Abstraction Object
@@ -265,8 +265,8 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $tables = array( 'posts', 'comments', 'links', 'options', 'postmeta',
-		'terms', 'term_taxonomy', 'term_relationships', 'commentmeta' );
+	var $tables = array('posts', 'comments', 'links', 'options', 'postmeta',
+		'terms', 'term_taxonomy', 'term_relationships', 'commentmeta');
 
 	/**
 	 * List of deprecated WordPress tables
@@ -278,7 +278,7 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $old_tables = array( 'categories', 'post2cat', 'link2cat' );
+	var $old_tables = array('categories', 'post2cat', 'link2cat');
 
 	/**
 	 * List of WordPress global tables
@@ -288,7 +288,7 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $global_tables = array( 'users', 'usermeta' );
+	var $global_tables = array('users', 'usermeta');
 
 	/**
 	 * List of Multisite global tables
@@ -298,8 +298,8 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $ms_global_tables = array( 'blogs', 'signups', 'site', 'sitemeta',
-		'sitecategories', 'registration_log', 'blog_versions' );
+	var $ms_global_tables = array('blogs', 'signups', 'site', 'sitemeta',
+		'sitecategories', 'registration_log', 'blog_versions');
 
 	/**
 	 * WordPress Comments table
@@ -576,8 +576,8 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $incompatible_modes = array( 'NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
-		'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL' );
+	protected $incompatible_modes = array('NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
+		'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL');
 
 	/**
 	 * Whether to use mysqli over mysql.
@@ -614,10 +614,10 @@ 
 	 * @param string $dbname     MySQL database name
 	 * @param string $dbhost     MySQL database host
 	 */
-	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-		register_shutdown_function( array( $this, '__destruct' ) );
+	public function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
+		register_shutdown_function(array($this, '__destruct'));
 
-		if ( WP_DEBUG && WP_DEBUG_DISPLAY )
+		if (WP_DEBUG && WP_DEBUG_DISPLAY)
 			$this->show_errors();
 
 		/* Use ext/mysqli if it exists and:
@@ -626,12 +626,12 @@ 
 		 *  - We are running PHP 5.5 or greater, or
 		 *  - ext/mysql is not loaded.
 		 */
-		if ( function_exists( 'mysqli_connect' ) ) {
-			if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
+		if (function_exists('mysqli_connect')) {
+			if (defined('WP_USE_EXT_MYSQL')) {
 				$this->use_mysqli = ! WP_USE_EXT_MYSQL;
-			} elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
+			} elseif (version_compare(phpversion(), '5.5', '>=') || ! function_exists('mysql_connect')) {
 				$this->use_mysqli = true;
-			} elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+			} elseif (false !== strpos($GLOBALS['wp_version'], '-')) {
 				$this->use_mysqli = true;
 			}
 		}
@@ -642,7 +642,7 @@ 
 		$this->dbhost = $dbhost;
 
 		// wp-config.php creation will manually connect when ready.
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return;
 		}
 
@@ -668,8 +668,8 @@ 
 	 * @param string $name The private member to get, and optionally process
 	 * @return mixed The private member
 	 */
-	public function __get( $name ) {
-		if ( 'col_info' === $name )
+	public function __get($name) {
+		if ('col_info' === $name)
 			$this->load_col_info();
 
 		return $this->$name;
@@ -683,13 +683,13 @@ 
 	 * @param string $name  The private member to set
 	 * @param mixed  $value The value to set
 	 */
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		$protected_members = array(
 			'col_meta',
 			'table_charset',
 			'check_current_query',
 		);
-		if (  in_array( $name, $protected_members, true ) ) {
+		if (in_array($name, $protected_members, true)) {
 			return;
 		}
 		$this->$name = $value;
@@ -704,8 +704,8 @@ 
 	 *
 	 * @return bool If the member is set or not
 	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
+	public function __isset($name) {
+		return isset($this->$name);
 	}
 
 	/**
@@ -715,8 +715,8 @@ 
 	 *
 	 * @param string $name  The private member to unset
 	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+	public function __unset($name) {
+		unset($this->$name);
 	}
 
 	/**
@@ -725,30 +725,30 @@ 
 	 * @since 3.1.0
 	 */
 	public function init_charset() {
-		if ( function_exists('is_multisite') && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 			$this->charset = 'utf8';
-			if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) {
+			if (defined('DB_COLLATE') && DB_COLLATE) {
 				$this->collate = DB_COLLATE;
 			} else {
 				$this->collate = 'utf8_general_ci';
 			}
-		} elseif ( defined( 'DB_COLLATE' ) ) {
+		} elseif (defined('DB_COLLATE')) {
 			$this->collate = DB_COLLATE;
 		}
 
-		if ( defined( 'DB_CHARSET' ) ) {
+		if (defined('DB_CHARSET')) {
 			$this->charset = DB_CHARSET;
 		}
 
-		if ( ( $this->use_mysqli && ! ( $this->dbh instanceof mysqli ) ) || empty( $this->dbh ) ) {
+		if (($this->use_mysqli && ! ($this->dbh instanceof mysqli)) || empty($this->dbh)) {
 			return;
 		}
 
-		if ( 'utf8' === $this->charset && $this->has_cap( 'utf8mb4' ) ) {
+		if ('utf8' === $this->charset && $this->has_cap('utf8mb4')) {
 			$this->charset = 'utf8mb4';
 		}
 
-		if ( 'utf8mb4' === $this->charset && ( ! $this->collate || stripos( $this->collate, 'utf8_' ) === 0 ) ) {
+		if ('utf8mb4' === $this->charset && ( ! $this->collate || stripos($this->collate, 'utf8_') === 0)) {
 			$this->collate = 'utf8mb4_unicode_ci';
 		}
 	}
@@ -762,29 +762,29 @@ 
 	 * @param string   $charset Optional. The character set. Default null.
 	 * @param string   $collate Optional. The collation. Default null.
 	 */
-	public function set_charset( $dbh, $charset = null, $collate = null ) {
-		if ( ! isset( $charset ) )
+	public function set_charset($dbh, $charset = null, $collate = null) {
+		if ( ! isset($charset))
 			$charset = $this->charset;
-		if ( ! isset( $collate ) )
+		if ( ! isset($collate))
 			$collate = $this->collate;
-		if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
-			if ( $this->use_mysqli ) {
-				if ( function_exists( 'mysqli_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
-					mysqli_set_charset( $dbh, $charset );
+		if ($this->has_cap('collation') && ! empty($charset)) {
+			if ($this->use_mysqli) {
+				if (function_exists('mysqli_set_charset') && $this->has_cap('set_charset')) {
+					mysqli_set_charset($dbh, $charset);
 				} else {
-					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
-					mysqli_query( $dbh, $query );
+					$query = $this->prepare('SET NAMES %s', $charset);
+					if ( ! empty($collate))
+						$query .= $this->prepare(' COLLATE %s', $collate);
+					mysqli_query($dbh, $query);
 				}
 			} else {
-				if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
-					mysql_set_charset( $charset, $dbh );
+				if (function_exists('mysql_set_charset') && $this->has_cap('set_charset')) {
+					mysql_set_charset($charset, $dbh);
 				} else {
-					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
-					mysql_query( $query, $dbh );
+					$query = $this->prepare('SET NAMES %s', $charset);
+					if ( ! empty($collate))
+						$query .= $this->prepare(' COLLATE %s', $collate);
+					mysql_query($query, $dbh);
 				}
 			}
 		}
@@ -800,36 +800,36 @@ 
 	 *
 	 * @param array $modes Optional. A list of SQL modes to set.
 	 */
-	public function set_sql_mode( $modes = array() ) {
-		if ( empty( $modes ) ) {
-			if ( $this->use_mysqli ) {
-				$res = mysqli_query( $this->dbh, 'SELECT @@SESSION.sql_mode' );
+	public function set_sql_mode($modes = array()) {
+		if (empty($modes)) {
+			if ($this->use_mysqli) {
+				$res = mysqli_query($this->dbh, 'SELECT @@SESSION.sql_mode');
 			} else {
-				$res = mysql_query( 'SELECT @@SESSION.sql_mode', $this->dbh );
+				$res = mysql_query('SELECT @@SESSION.sql_mode', $this->dbh);
 			}
 
-			if ( empty( $res ) ) {
+			if (empty($res)) {
 				return;
 			}
 
-			if ( $this->use_mysqli ) {
-				$modes_array = mysqli_fetch_array( $res );
-				if ( empty( $modes_array[0] ) ) {
+			if ($this->use_mysqli) {
+				$modes_array = mysqli_fetch_array($res);
+				if (empty($modes_array[0])) {
 					return;
 				}
 				$modes_str = $modes_array[0];
 			} else {
-				$modes_str = mysql_result( $res, 0 );
+				$modes_str = mysql_result($res, 0);
 			}
 
-			if ( empty( $modes_str ) ) {
+			if (empty($modes_str)) {
 				return;
 			}
 
-			$modes = explode( ',', $modes_str );
+			$modes = explode(',', $modes_str);
 		}
 
-		$modes = array_change_key_case( $modes, CASE_UPPER );
+		$modes = array_change_key_case($modes, CASE_UPPER);
 
 		/**
 		 * Filter the list of incompatible SQL modes to exclude.
@@ -838,20 +838,20 @@ 
 		 *
 		 * @param array $incompatible_modes An array of incompatible modes.
 		 */
-		$incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes );
+		$incompatible_modes = (array) apply_filters('incompatible_sql_modes', $this->incompatible_modes);
 
-		foreach( $modes as $i => $mode ) {
-			if ( in_array( $mode, $incompatible_modes ) ) {
-				unset( $modes[ $i ] );
+		foreach ($modes as $i => $mode) {
+			if (in_array($mode, $incompatible_modes)) {
+				unset($modes[$i]);
 			}
 		}
 
-		$modes_str = implode( ',', $modes );
+		$modes_str = implode(',', $modes);
 
-		if ( $this->use_mysqli ) {
-			mysqli_query( $this->dbh, "SET SESSION sql_mode='$modes_str'" );
+		if ($this->use_mysqli) {
+			mysqli_query($this->dbh, "SET SESSION sql_mode='$modes_str'");
 		} else {
-			mysql_query( "SET SESSION sql_mode='$modes_str'", $this->dbh );
+			mysql_query("SET SESSION sql_mode='$modes_str'", $this->dbh);
 		}
 	}
 
@@ -864,31 +864,31 @@ 
 	 * @param bool   $set_table_names Optional. Whether the table names, e.g. wpdb::$posts, should be updated or not.
 	 * @return string|WP_Error Old prefix or WP_Error on error
 	 */
-	public function set_prefix( $prefix, $set_table_names = true ) {
+	public function set_prefix($prefix, $set_table_names = true) {
 
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-			return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		if (preg_match('|[^a-z0-9_]|i', $prefix))
+			return new WP_Error('invalid_db_prefix', 'Invalid database prefix');
 
 		$old_prefix = is_multisite() ? '' : $prefix;
 
-		if ( isset( $this->base_prefix ) )
+		if (isset($this->base_prefix))
 			$old_prefix = $this->base_prefix;
 
 		$this->base_prefix = $prefix;
 
-		if ( $set_table_names ) {
-			foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
+		if ($set_table_names) {
+			foreach ($this->tables('global') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 
-			if ( is_multisite() && empty( $this->blogid ) )
+			if (is_multisite() && empty($this->blogid))
 				return $old_prefix;
 
 			$this->prefix = $this->get_blog_prefix();
 
-			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+			foreach ($this->tables('blog') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 
-			foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+			foreach ($this->tables('old') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 		}
 		return $old_prefix;
@@ -904,8 +904,8 @@ 
 	 * @param int $site_id Optional.
 	 * @return int previous blog id
 	 */
-	public function set_blog_id( $blog_id, $site_id = 0 ) {
-		if ( ! empty( $site_id ) )
+	public function set_blog_id($blog_id, $site_id = 0) {
+		if ( ! empty($site_id))
 			$this->siteid = $site_id;
 
 		$old_blog_id  = $this->blogid;
@@ -913,10 +913,10 @@ 
 
 		$this->prefix = $this->get_blog_prefix();
 
-		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+		foreach ($this->tables('blog') as $table => $prefixed_table)
 			$this->$table = $prefixed_table;
 
-		foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+		foreach ($this->tables('old') as $table => $prefixed_table)
 			$this->$table = $prefixed_table;
 
 		return $old_blog_id;
@@ -929,15 +929,15 @@ 
 	 * @param int $blog_id Optional.
 	 * @return string Blog prefix.
 	 */
-	public function get_blog_prefix( $blog_id = null ) {
-		if ( is_multisite() ) {
-			if ( null === $blog_id )
+	public function get_blog_prefix($blog_id = null) {
+		if (is_multisite()) {
+			if (null === $blog_id)
 				$blog_id = $this->blogid;
 			$blog_id = (int) $blog_id;
-			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
+			if (defined('MULTISITE') && (0 == $blog_id || 1 == $blog_id))
 				return $this->base_prefix;
 			else
-				return $this->base_prefix . $blog_id . '_';
+				return $this->base_prefix.$blog_id.'_';
 		} else {
 			return $this->base_prefix;
 		}
@@ -970,20 +970,20 @@ 
 	 * @param int    $blog_id Optional. The blog_id to prefix. Defaults to wpdb::$blogid. Used only when prefix is requested.
 	 * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
 	 */
-	public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
-		switch ( $scope ) {
+	public function tables($scope = 'all', $prefix = true, $blog_id = 0) {
+		switch ($scope) {
 			case 'all' :
-				$tables = array_merge( $this->global_tables, $this->tables );
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				$tables = array_merge($this->global_tables, $this->tables);
+				if (is_multisite())
+					$tables = array_merge($tables, $this->ms_global_tables);
 				break;
 			case 'blog' :
 				$tables = $this->tables;
 				break;
 			case 'global' :
 				$tables = $this->global_tables;
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if (is_multisite())
+					$tables = array_merge($tables, $this->ms_global_tables);
 				break;
 			case 'ms_global' :
 				$tables = $this->ms_global_tables;
@@ -995,24 +995,24 @@ 
 				return array();
 		}
 
-		if ( $prefix ) {
-			if ( ! $blog_id )
+		if ($prefix) {
+			if ( ! $blog_id)
 				$blog_id = $this->blogid;
-			$blog_prefix = $this->get_blog_prefix( $blog_id );
+			$blog_prefix = $this->get_blog_prefix($blog_id);
 			$base_prefix = $this->base_prefix;
-			$global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
-			foreach ( $tables as $k => $table ) {
-				if ( in_array( $table, $global_tables ) )
-					$tables[ $table ] = $base_prefix . $table;
+			$global_tables = array_merge($this->global_tables, $this->ms_global_tables);
+			foreach ($tables as $k => $table) {
+				if (in_array($table, $global_tables))
+					$tables[$table] = $base_prefix.$table;
 				else
-					$tables[ $table ] = $blog_prefix . $table;
-				unset( $tables[ $k ] );
+					$tables[$table] = $blog_prefix.$table;
+				unset($tables[$k]);
 			}
 
-			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) )
+			if (isset($tables['users']) && defined('CUSTOM_USER_TABLE'))
 				$tables['users'] = CUSTOM_USER_TABLE;
 
-			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) )
+			if (isset($tables['usermeta']) && defined('CUSTOM_USER_META_TABLE'))
 				$tables['usermeta'] = CUSTOM_USER_META_TABLE;
 		}
 
@@ -1030,27 +1030,27 @@ 
 	 * @param string        $db  MySQL database name
 	 * @param resource|null $dbh Optional link identifier.
 	 */
-	public function select( $db, $dbh = null ) {
-		if ( is_null($dbh) )
+	public function select($db, $dbh = null) {
+		if (is_null($dbh))
 			$dbh = $this->dbh;
 
-		if ( $this->use_mysqli ) {
-			$success = @mysqli_select_db( $dbh, $db );
+		if ($this->use_mysqli) {
+			$success = @mysqli_select_db($dbh, $db);
 		} else {
-			$success = @mysql_select_db( $db, $dbh );
+			$success = @mysql_select_db($db, $dbh);
 		}
-		if ( ! $success ) {
+		if ( ! $success) {
 			$this->ready = false;
-			if ( ! did_action( 'template_redirect' ) ) {
+			if ( ! did_action('template_redirect')) {
 				wp_load_translations_early();
-				$this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
+				$this->bail(sprintf(__('<h1>Can&#8217;t select database</h1>
 <p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
 <ul>
 <li>Are you sure it exists?</li>
 <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
 <li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
 </ul>
-<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="https://wordpress.org/support/">WordPress Support Forums</a>.</p>' ), htmlspecialchars( $db, ENT_QUOTES ), htmlspecialchars( $this->dbuser, ENT_QUOTES ) ), 'db_select_fail' );
+<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="https://wordpress.org/support/">WordPress Support Forums</a>.</p>' ), htmlspecialchars($db, ENT_QUOTES), htmlspecialchars($this->dbuser, ENT_QUOTES)), 'db_select_fail');
 			}
 		}
 	}
@@ -1069,10 +1069,10 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	function _weak_escape( $string ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
-		return addslashes( $string );
+	function _weak_escape($string) {
+		if (func_num_args() === 1 && function_exists('_deprecated_function'))
+			_deprecated_function(__METHOD__, '3.6', 'wpdb::prepare() or esc_sql()');
+		return addslashes($string);
 	}
 
 	/**
@@ -1086,22 +1086,22 @@ 
 	 * @param  string $string to escape
 	 * @return string escaped
 	 */
-	function _real_escape( $string ) {
-		if ( $this->dbh ) {
-			if ( $this->use_mysqli ) {
-				return mysqli_real_escape_string( $this->dbh, $string );
+	function _real_escape($string) {
+		if ($this->dbh) {
+			if ($this->use_mysqli) {
+				return mysqli_real_escape_string($this->dbh, $string);
 			} else {
-				return mysql_real_escape_string( $string, $this->dbh );
+				return mysql_real_escape_string($string, $this->dbh);
 			}
 		}
 
-		$class = get_class( $this );
-		if ( function_exists( '__' ) ) {
-			_doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), E_USER_NOTICE );
+		$class = get_class($this);
+		if (function_exists('__')) {
+			_doing_it_wrong($class, sprintf(__('%s must set a database connection for use with escaping.'), $class), E_USER_NOTICE);
 		} else {
-			_doing_it_wrong( $class, sprintf( '%s must set a database connection for use with escaping.', $class ), E_USER_NOTICE );
+			_doing_it_wrong($class, sprintf('%s must set a database connection for use with escaping.', $class), E_USER_NOTICE);
 		}
-		return addslashes( $string );
+		return addslashes($string);
 	}
 
 	/**
@@ -1114,16 +1114,16 @@ 
 	 * @param  string|array $data
 	 * @return string|array escaped
 	 */
-	function _escape( $data ) {
-		if ( is_array( $data ) ) {
-			foreach ( $data as $k => $v ) {
-				if ( is_array($v) )
-					$data[$k] = $this->_escape( $v );
+	function _escape($data) {
+		if (is_array($data)) {
+			foreach ($data as $k => $v) {
+				if (is_array($v))
+					$data[$k] = $this->_escape($v);
 				else
-					$data[$k] = $this->_real_escape( $v );
+					$data[$k] = $this->_real_escape($v);
 			}
 		} else {
-			$data = $this->_real_escape( $data );
+			$data = $this->_real_escape($data);
 		}
 
 		return $data;
@@ -1142,18 +1142,18 @@ 
 	 * @param mixed $data
 	 * @return mixed
 	 */
-	public function escape( $data ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
-		if ( is_array( $data ) ) {
-			foreach ( $data as $k => $v ) {
-				if ( is_array( $v ) )
-					$data[$k] = $this->escape( $v, 'recursive' );
+	public function escape($data) {
+		if (func_num_args() === 1 && function_exists('_deprecated_function'))
+			_deprecated_function(__METHOD__, '3.6', 'wpdb::prepare() or esc_sql()');
+		if (is_array($data)) {
+			foreach ($data as $k => $v) {
+				if (is_array($v))
+					$data[$k] = $this->escape($v, 'recursive');
 				else
-					$data[$k] = $this->_weak_escape( $v, 'internal' );
+					$data[$k] = $this->_weak_escape($v, 'internal');
 			}
 		} else {
-			$data = $this->_weak_escape( $data, 'internal' );
+			$data = $this->_weak_escape($data, 'internal');
 		}
 
 		return $data;
@@ -1168,9 +1168,9 @@ 
 	 *
 	 * @param string $string to escape
 	 */
-	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) )
-			$string = $this->_real_escape( $string );
+	public function escape_by_ref(&$string) {
+		if ( ! is_float($string))
+			$string = $this->_real_escape($string);
 	}
 
 	/**
@@ -1207,26 +1207,26 @@ 
 	 *                              {@link http://php.net/sprintf sprintf()}.
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
-	public function prepare( $query, $args ) {
-		if ( is_null( $query ) )
+	public function prepare($query, $args) {
+		if (is_null($query))
 			return;
 
 		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
-		if ( strpos( $query, '%' ) === false ) {
-			_doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9' );
+		if (strpos($query, '%') === false) {
+			_doing_it_wrong('wpdb::prepare', sprintf(__('The query argument of %s must have a placeholder.'), 'wpdb::prepare()'), '3.9');
 		}
 
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		// If args were passed as an array (as in vsprintf), move them up
-		if ( isset( $args[0] ) && is_array($args[0]) )
+		if (isset($args[0]) && is_array($args[0]))
 			$args = $args[0];
-		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
-		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-		$query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
-		$query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
-		array_walk( $args, array( $this, 'escape_by_ref' ) );
-		return @vsprintf( $query, $args );
+		$query = str_replace("'%s'", '%s', $query); // in case someone mistakenly already singlequoted it
+		$query = str_replace('"%s"', '%s', $query); // doublequote unquoting
+		$query = preg_replace('|(?<!%)%f|', '%F', $query); // Force floats to be locale unaware
+		$query = preg_replace('|(?<!%)%s|', "'%s'", $query); // quote the strings, avoiding escaped strings like %%s
+		array_walk($args, array($this, 'escape_by_ref'));
+		return @vsprintf($query, $args);
 	}
 
 	/**
@@ -1251,8 +1251,8 @@ 
 	 * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare()
 	 *                or real_escape next.
 	 */
-	public function esc_like( $text ) {
-		return addcslashes( $text, '_%\\' );
+	public function esc_like($text) {
+		return addcslashes($text, '_%\\');
 	}
 
 	/**
@@ -1264,56 +1264,56 @@ 
 	 * @param string $str The error to display
 	 * @return false|void False if the showing of errors is disabled.
 	 */
-	public function print_error( $str = '' ) {
+	public function print_error($str = '') {
 		global $EZSQL_ERROR;
 
-		if ( !$str ) {
-			if ( $this->use_mysqli ) {
-				$str = mysqli_error( $this->dbh );
+		if ( ! $str) {
+			if ($this->use_mysqli) {
+				$str = mysqli_error($this->dbh);
 			} else {
-				$str = mysql_error( $this->dbh );
+				$str = mysql_error($this->dbh);
 			}
 		}
-		$EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
+		$EZSQL_ERROR[] = array('query' => $this->last_query, 'error_str' => $str);
 
-		if ( $this->suppress_errors )
+		if ($this->suppress_errors)
 			return false;
 
 		wp_load_translations_early();
 
-		if ( $caller = $this->get_caller() )
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
+		if ($caller = $this->get_caller())
+			$error_str = sprintf(__('WordPress database error %1$s for query %2$s made by %3$s'), $str, $this->last_query, $caller);
 		else
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+			$error_str = sprintf(__('WordPress database error %1$s for query %2$s'), $str, $this->last_query);
 
-		error_log( $error_str );
+		error_log($error_str);
 
 		// Are we showing errors?
-		if ( ! $this->show_errors )
+		if ( ! $this->show_errors)
 			return false;
 
 		// If there is an error then take note of it
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$msg = sprintf(
 				"%s [%s]\n%s\n",
-				__( 'WordPress database error:' ),
+				__('WordPress database error:'),
 				$str,
 				$this->last_query
 			);
 
-			if ( defined( 'ERRORLOGFILE' ) ) {
-				error_log( $msg, 3, ERRORLOGFILE );
+			if (defined('ERRORLOGFILE')) {
+				error_log($msg, 3, ERRORLOGFILE);
 			}
-			if ( defined( 'DIEONDBERROR' ) ) {
-				wp_die( $msg );
+			if (defined('DIEONDBERROR')) {
+				wp_die($msg);
 			}
 		} else {
-			$str   = htmlspecialchars( $str, ENT_QUOTES );
-			$query = htmlspecialchars( $this->last_query, ENT_QUOTES );
+			$str   = htmlspecialchars($str, ENT_QUOTES);
+			$query = htmlspecialchars($this->last_query, ENT_QUOTES);
 
 			printf(
 				'<div id="error"><p class="wpdberror"><strong>%s</strong> [%s]<br /><code>%s</code></p></div>',
-				__( 'WordPress database error:' ),
+				__('WordPress database error:'),
 				$str,
 				$query
 			);
@@ -1334,7 +1334,7 @@ 
 	 * @param bool $show Whether to show or hide errors
 	 * @return bool Old value for showing errors.
 	 */
-	public function show_errors( $show = true ) {
+	public function show_errors($show = true) {
 		$errors = $this->show_errors;
 		$this->show_errors = $show;
 		return $errors;
@@ -1367,7 +1367,7 @@ 
 	 * @param bool $suppress Optional. New value. Defaults to true.
 	 * @return bool Old value
 	 */
-	public function suppress_errors( $suppress = true ) {
+	public function suppress_errors($suppress = true) {
 		$errors = $this->suppress_errors;
 		$this->suppress_errors = (bool) $suppress;
 		return $errors;
@@ -1385,21 +1385,21 @@ 
 		$this->rows_affected = $this->num_rows = 0;
 		$this->last_error  = '';
 
-		if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
-			mysqli_free_result( $this->result );
+		if ($this->use_mysqli && $this->result instanceof mysqli_result) {
+			mysqli_free_result($this->result);
 			$this->result = null;
 
 			// Sanity check before using the handle
-			if ( empty( $this->dbh ) || !( $this->dbh instanceof mysqli ) ) {
+			if (empty($this->dbh) || ! ($this->dbh instanceof mysqli)) {
 				return;
 			}
 
 			// Clear out any results from a multi-query
-			while ( mysqli_more_results( $this->dbh ) ) {
-				mysqli_next_result( $this->dbh );
+			while (mysqli_more_results($this->dbh)) {
+				mysqli_next_result($this->dbh);
 			}
-		} elseif ( is_resource( $this->result ) ) {
-			mysql_free_result( $this->result );
+		} elseif (is_resource($this->result)) {
+			mysql_free_result($this->result);
 		}
 	}
 
@@ -1415,17 +1415,17 @@ 
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 	 * @return bool True with a successful connection, false on failure.
 	 */
-	public function db_connect( $allow_bail = true ) {
+	public function db_connect($allow_bail = true) {
 		$this->is_mysql = true;
 
 		/*
 		 * Deprecated in 3.9+ when using MySQLi. No equivalent
 		 * $new_link parameter exists for mysqli_* functions.
 		 */
-		$new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
-		$client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
+		$new_link = defined('MYSQL_NEW_LINK') ? MYSQL_NEW_LINK : true;
+		$client_flags = defined('MYSQL_CLIENT_FLAGS') ? MYSQL_CLIENT_FLAGS : 0;
 
-		if ( $this->use_mysqli ) {
+		if ($this->use_mysqli) {
 			$this->dbh = mysqli_init();
 
 			// mysqli_real_connect doesn't support the host param including a port or socket
@@ -1433,28 +1433,28 @@ 
 			$port = null;
 			$socket = null;
 			$host = $this->dbhost;
-			$port_or_socket = strstr( $host, ':' );
-			if ( ! empty( $port_or_socket ) ) {
-				$host = substr( $host, 0, strpos( $host, ':' ) );
-				$port_or_socket = substr( $port_or_socket, 1 );
-				if ( 0 !== strpos( $port_or_socket, '/' ) ) {
-					$port = intval( $port_or_socket );
-					$maybe_socket = strstr( $port_or_socket, ':' );
-					if ( ! empty( $maybe_socket ) ) {
-						$socket = substr( $maybe_socket, 1 );
+			$port_or_socket = strstr($host, ':');
+			if ( ! empty($port_or_socket)) {
+				$host = substr($host, 0, strpos($host, ':'));
+				$port_or_socket = substr($port_or_socket, 1);
+				if (0 !== strpos($port_or_socket, '/')) {
+					$port = intval($port_or_socket);
+					$maybe_socket = strstr($port_or_socket, ':');
+					if ( ! empty($maybe_socket)) {
+						$socket = substr($maybe_socket, 1);
 					}
 				} else {
 					$socket = $port_or_socket;
 				}
 			}
 
-			if ( WP_DEBUG ) {
-				mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
+			if (WP_DEBUG) {
+				mysqli_real_connect($this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags);
 			} else {
-				@mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
+				@mysqli_real_connect($this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags);
 			}
 
-			if ( $this->dbh->connect_errno ) {
+			if ($this->dbh->connect_errno) {
 				$this->dbh = null;
 
 				/* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
@@ -1464,37 +1464,37 @@ 
 		 		 */
 				$attempt_fallback = true;
 
-				if ( $this->has_connected ) {
+				if ($this->has_connected) {
 					$attempt_fallback = false;
-				} elseif ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
+				} elseif (defined('WP_USE_EXT_MYSQL') && ! WP_USE_EXT_MYSQL) {
 					$attempt_fallback = false;
-				} elseif ( ! function_exists( 'mysql_connect' ) ) {
+				} elseif ( ! function_exists('mysql_connect')) {
 					$attempt_fallback = false;
 				}
 
-				if ( $attempt_fallback ) {
+				if ($attempt_fallback) {
 					$this->use_mysqli = false;
 					$this->db_connect();
 				}
 			}
 		} else {
-			if ( WP_DEBUG ) {
-				$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
+			if (WP_DEBUG) {
+				$this->dbh = mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags);
 			} else {
-				$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
+				$this->dbh = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags);
 			}
 		}
 
-		if ( ! $this->dbh && $allow_bail ) {
+		if ( ! $this->dbh && $allow_bail) {
 			wp_load_translations_early();
 
 			// Load custom DB error template, if present.
-			if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
-				require_once( WP_CONTENT_DIR . '/db-error.php' );
+			if (file_exists(WP_CONTENT_DIR.'/db-error.php')) {
+				require_once(WP_CONTENT_DIR.'/db-error.php');
 				die();
 			}
 
-			$this->bail( sprintf( __( "
+			$this->bail(sprintf(__("
 <h1>Error establishing a database connection</h1>
 <p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
 <ul>
@@ -1503,21 +1503,21 @@ 
 	<li>Are you sure that the database server is running?</li>
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='https://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-" ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' );
+" ), htmlspecialchars($this->dbhost, ENT_QUOTES)), 'db_connect_fail');
 
 			return false;
-		} elseif ( $this->dbh ) {
-			if ( ! $this->has_connected ) {
+		} elseif ($this->dbh) {
+			if ( ! $this->has_connected) {
 				$this->init_charset();
 			}
 
 			$this->has_connected = true;
 
-			$this->set_charset( $this->dbh );
+			$this->set_charset($this->dbh);
 
 			$this->ready = true;
 			$this->set_sql_mode();
-			$this->select( $this->dbname, $this->dbh );
+			$this->select($this->dbname, $this->dbh);
 
 			return true;
 		}
@@ -1539,13 +1539,13 @@ 
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 	 * @return bool|void True if the connection is up.
 	 */
-	public function check_connection( $allow_bail = true ) {
-		if ( $this->use_mysqli ) {
-			if ( @mysqli_ping( $this->dbh ) ) {
+	public function check_connection($allow_bail = true) {
+		if ($this->use_mysqli) {
+			if (@mysqli_ping($this->dbh)) {
 				return true;
 			}
 		} else {
-			if ( @mysql_ping( $this->dbh ) ) {
+			if (@mysql_ping($this->dbh)) {
 				return true;
 			}
 		}
@@ -1553,41 +1553,41 @@ 
 		$error_reporting = false;
 
 		// Disable warnings, as we don't want to see a multitude of "unable to connect" messages
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$error_reporting = error_reporting();
-			error_reporting( $error_reporting & ~E_WARNING );
+			error_reporting($error_reporting & ~E_WARNING);
 		}
 
-		for ( $tries = 1; $tries <= $this->reconnect_retries; $tries++ ) {
+		for ($tries = 1; $tries <= $this->reconnect_retries; $tries++) {
 			// On the last try, re-enable warnings. We want to see a single instance of the
 			// "unable to connect" message on the bail() screen, if it appears.
-			if ( $this->reconnect_retries === $tries && WP_DEBUG ) {
-				error_reporting( $error_reporting );
+			if ($this->reconnect_retries === $tries && WP_DEBUG) {
+				error_reporting($error_reporting);
 			}
 
-			if ( $this->db_connect( false ) ) {
-				if ( $error_reporting ) {
-					error_reporting( $error_reporting );
+			if ($this->db_connect(false)) {
+				if ($error_reporting) {
+					error_reporting($error_reporting);
 				}
 
 				return true;
 			}
 
-			sleep( 1 );
+			sleep(1);
 		}
 
 		// If template_redirect has already happened, it's too late for wp_die()/dead_db().
 		// Let's just return and hope for the best.
-		if ( did_action( 'template_redirect' ) ) {
+		if (did_action('template_redirect')) {
 			return false;
 		}
 
-		if ( ! $allow_bail ) {
+		if ( ! $allow_bail) {
 			return false;
 		}
 
 		// We weren't able to reconnect, so we better bail.
-		$this->bail( sprintf( ( "
+		$this->bail(sprintf(("
 <h1>Error reconnecting to the database</h1>
 <p>This means that we lost contact with the database server at <code>%s</code>. This could mean your host's database server is down.</p>
 <ul>
@@ -1595,7 +1595,7 @@ 
 	<li>Are you sure that the database server is not under particularly heavy load?</li>
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='https://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-" ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' );
+" ), htmlspecialchars($this->dbhost, ENT_QUOTES)), 'db_connect_fail');
 
 		// Call dead_db() if bail didn't die, because this database is no more. It has ceased to be (at least temporarily).
 		dead_db();
@@ -1611,8 +1611,8 @@ 
 	 * @param string $query Database query
 	 * @return int|false Number of rows affected/selected or false on error
 	 */
-	public function query( $query ) {
-		if ( ! $this->ready ) {
+	public function query($query) {
+		if ( ! $this->ready) {
 			$this->check_current_query = true;
 			return false;
 		}
@@ -1627,7 +1627,7 @@ 
 		 *
 		 * @param string $query Database query.
 		 */
-		$query = apply_filters( 'query', $query );
+		$query = apply_filters('query', $query);
 
 		$this->flush();
 
@@ -1635,12 +1635,12 @@ 
 		$this->func_call = "\$db->query(\"$query\")";
 
 		// If we're writing to the database, make sure the query will write safely.
-		if ( $this->check_current_query && ! $this->check_ascii( $query ) ) {
-			$stripped_query = $this->strip_invalid_text_from_query( $query );
+		if ($this->check_current_query && ! $this->check_ascii($query)) {
+			$stripped_query = $this->strip_invalid_text_from_query($query);
 			// strip_invalid_text_from_query() can perform queries, so we need
 			// to flush again, just to make sure everything is clear.
 			$this->flush();
-			if ( $stripped_query !== $query ) {
+			if ($stripped_query !== $query) {
 				$this->insert_id = 0;
 				return false;
 			}
@@ -1651,21 +1651,21 @@ 
 		// Keep track of the last query for debug..
 		$this->last_query = $query;
 
-		$this->_do_query( $query );
+		$this->_do_query($query);
 
 		// MySQL server has gone away, try to reconnect
 		$mysql_errno = 0;
-		if ( ! empty( $this->dbh ) ) {
-			if ( $this->use_mysqli ) {
-				$mysql_errno = mysqli_errno( $this->dbh );
+		if ( ! empty($this->dbh)) {
+			if ($this->use_mysqli) {
+				$mysql_errno = mysqli_errno($this->dbh);
 			} else {
-				$mysql_errno = mysql_errno( $this->dbh );
+				$mysql_errno = mysql_errno($this->dbh);
 			}
 		}
 
-		if ( empty( $this->dbh ) || 2006 == $mysql_errno ) {
-			if ( $this->check_connection() ) {
-				$this->_do_query( $query );
+		if (empty($this->dbh) || 2006 == $mysql_errno) {
+			if ($this->check_connection()) {
+				$this->_do_query($query);
 			} else {
 				$this->insert_id = 0;
 				return false;
@@ -1673,48 +1673,48 @@ 
 		}
 
 		// If there is an error then take note of it..
-		if ( $this->use_mysqli ) {
-			$this->last_error = mysqli_error( $this->dbh );
+		if ($this->use_mysqli) {
+			$this->last_error = mysqli_error($this->dbh);
 		} else {
-			$this->last_error = mysql_error( $this->dbh );
+			$this->last_error = mysql_error($this->dbh);
 		}
 
-		if ( $this->last_error ) {
+		if ($this->last_error) {
 			// Clear insert_id on a subsequent failed insert.
-			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
+			if ($this->insert_id && preg_match('/^\s*(insert|replace)\s/i', $query))
 				$this->insert_id = 0;
 
 			$this->print_error();
 			return false;
 		}
 
-		if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
+		if (preg_match('/^\s*(create|alter|truncate|drop)\s/i', $query)) {
 			$return_val = $this->result;
-		} elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
-			if ( $this->use_mysqli ) {
-				$this->rows_affected = mysqli_affected_rows( $this->dbh );
+		} elseif (preg_match('/^\s*(insert|delete|update|replace)\s/i', $query)) {
+			if ($this->use_mysqli) {
+				$this->rows_affected = mysqli_affected_rows($this->dbh);
 			} else {
-				$this->rows_affected = mysql_affected_rows( $this->dbh );
+				$this->rows_affected = mysql_affected_rows($this->dbh);
 			}
 			// Take note of the insert_id
-			if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
-				if ( $this->use_mysqli ) {
-					$this->insert_id = mysqli_insert_id( $this->dbh );
+			if (preg_match('/^\s*(insert|replace)\s/i', $query)) {
+				if ($this->use_mysqli) {
+					$this->insert_id = mysqli_insert_id($this->dbh);
 				} else {
-					$this->insert_id = mysql_insert_id( $this->dbh );
+					$this->insert_id = mysql_insert_id($this->dbh);
 				}
 			}
 			// Return number of rows affected
 			$return_val = $this->rows_affected;
 		} else {
 			$num_rows = 0;
-			if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
-				while ( $row = @mysqli_fetch_object( $this->result ) ) {
+			if ($this->use_mysqli && $this->result instanceof mysqli_result) {
+				while ($row = @mysqli_fetch_object($this->result)) {
 					$this->last_result[$num_rows] = $row;
 					$num_rows++;
 				}
-			} elseif ( is_resource( $this->result ) ) {
-				while ( $row = @mysql_fetch_object( $this->result ) ) {
+			} elseif (is_resource($this->result)) {
+				while ($row = @mysql_fetch_object($this->result)) {
 					$this->last_result[$num_rows] = $row;
 					$num_rows++;
 				}
@@ -1739,20 +1739,20 @@ 
 	 *
 	 * @param string $query The query to run.
 	 */
-	private function _do_query( $query ) {
-		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+	private function _do_query($query) {
+		if (defined('SAVEQUERIES') && SAVEQUERIES) {
 			$this->timer_start();
 		}
 
-		if ( $this->use_mysqli ) {
-			$this->result = @mysqli_query( $this->dbh, $query );
+		if ($this->use_mysqli) {
+			$this->result = @mysqli_query($this->dbh, $query);
 		} else {
-			$this->result = @mysql_query( $query, $this->dbh );
+			$this->result = @mysql_query($query, $this->dbh);
 		}
 		$this->num_queries++;
 
-		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
-			$this->queries[] = array( $query, $this->timer_stop(), $this->get_caller() );
+		if (defined('SAVEQUERIES') && SAVEQUERIES) {
+			$this->queries[] = array($query, $this->timer_stop(), $this->get_caller());
 		}
 	}
 
@@ -1776,8 +1776,8 @@ 
 	 *                             If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows inserted, or false on error.
 	 */
-	public function insert( $table, $data, $format = null ) {
-		return $this->_insert_replace_helper( $table, $data, $format, 'INSERT' );
+	public function insert($table, $data, $format = null) {
+		return $this->_insert_replace_helper($table, $data, $format, 'INSERT');
 	}
 
 	/**
@@ -1800,8 +1800,8 @@ 
 	 *                             If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
-	public function replace( $table, $data, $format = null ) {
-		return $this->_insert_replace_helper( $table, $data, $format, 'REPLACE' );
+	public function replace($table, $data, $format = null) {
+		return $this->_insert_replace_helper($table, $data, $format, 'REPLACE');
 	}
 
 	/**
@@ -1825,31 +1825,31 @@ 
 	 * @param string $type         Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
-	function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
+	function _insert_replace_helper($table, $data, $format = null, $type = 'INSERT') {
 		$this->insert_id = 0;
 
-		if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) {
+		if ( ! in_array(strtoupper($type), array('REPLACE', 'INSERT'))) {
 			return false;
 		}
 
-		$data = $this->process_fields( $table, $data, $format );
-		if ( false === $data ) {
+		$data = $this->process_fields($table, $data, $format);
+		if (false === $data) {
 			return false;
 		}
 
 		$formats = $values = array();
-		foreach ( $data as $value ) {
+		foreach ($data as $value) {
 			$formats[] = $value['format'];
 			$values[]  = $value['value'];
 		}
 
-		$fields  = '`' . implode( '`, `', array_keys( $data ) ) . '`';
-		$formats = implode( ', ', $formats );
+		$fields  = '`'.implode('`, `', array_keys($data)).'`';
+		$formats = implode(', ', $formats);
 
 		$sql = "$type INTO `$table` ($fields) VALUES ($formats)";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -1879,37 +1879,37 @@ 
 	 *                                   If omitted, all values in $where will be treated as strings.
 	 * @return int|false The number of rows updated, or false on error.
 	 */
-	public function update( $table, $data, $where, $format = null, $where_format = null ) {
-		if ( ! is_array( $data ) || ! is_array( $where ) ) {
+	public function update($table, $data, $where, $format = null, $where_format = null) {
+		if ( ! is_array($data) || ! is_array($where)) {
 			return false;
 		}
 
-		$data = $this->process_fields( $table, $data, $format );
-		if ( false === $data ) {
+		$data = $this->process_fields($table, $data, $format);
+		if (false === $data) {
 			return false;
 		}
-		$where = $this->process_fields( $table, $where, $where_format );
-		if ( false === $where ) {
+		$where = $this->process_fields($table, $where, $where_format);
+		if (false === $where) {
 			return false;
 		}
 
 		$fields = $conditions = $values = array();
-		foreach ( $data as $field => $value ) {
-			$fields[] = "`$field` = " . $value['format'];
+		foreach ($data as $field => $value) {
+			$fields[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
-		foreach ( $where as $field => $value ) {
-			$conditions[] = "`$field` = " . $value['format'];
+		foreach ($where as $field => $value) {
+			$conditions[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
 
-		$fields = implode( ', ', $fields );
-		$conditions = implode( ' AND ', $conditions );
+		$fields = implode(', ', $fields);
+		$conditions = implode(' AND ', $conditions);
 
 		$sql = "UPDATE `$table` SET $fields WHERE $conditions";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -1933,28 +1933,28 @@ 
 	 *                                   If omitted, all values in $where will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows updated, or false on error.
 	 */
-	public function delete( $table, $where, $where_format = null ) {
-		if ( ! is_array( $where ) ) {
+	public function delete($table, $where, $where_format = null) {
+		if ( ! is_array($where)) {
 			return false;
 		}
 
-		$where = $this->process_fields( $table, $where, $where_format );
-		if ( false === $where ) {
+		$where = $this->process_fields($table, $where, $where_format);
+		if (false === $where) {
 			return false;
 		}
 
 		$conditions = $values = array();
-		foreach ( $where as $field => $value ) {
-			$conditions[] = "`$field` = " . $value['format'];
+		foreach ($where as $field => $value) {
+			$conditions[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
 
-		$conditions = implode( ' AND ', $conditions );
+		$conditions = implode(' AND ', $conditions);
 
 		$sql = "DELETE FROM `$table` WHERE $conditions";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -1975,25 +1975,25 @@ 
 	 * @return array|false Returns an array of fields that contain paired values
 	 *                    and formats. Returns false for invalid values.
 	 */
-	protected function process_fields( $table, $data, $format ) {
-		$data = $this->process_field_formats( $data, $format );
-		if ( false === $data ) {
+	protected function process_fields($table, $data, $format) {
+		$data = $this->process_field_formats($data, $format);
+		if (false === $data) {
 			return false;
 		}
 
-		$data = $this->process_field_charsets( $data, $table );
-		if ( false === $data ) {
+		$data = $this->process_field_charsets($data, $table);
+		if (false === $data) {
 			return false;
 		}
 
-		$data = $this->process_field_lengths( $data, $table );
-		if ( false === $data ) {
+		$data = $this->process_field_lengths($data, $table);
+		if (false === $data) {
 			return false;
 		}
 
-		$converted_data = $this->strip_invalid_text( $data );
+		$converted_data = $this->strip_invalid_text($data);
 
-		if ( $data !== $converted_data ) {
+		if ($data !== $converted_data) {
 			return false;
 		}
 
@@ -2011,25 +2011,25 @@ 
 	 * @return array Array, keyed by field names with values being an array
 	 *               of 'value' and 'format' keys.
 	 */
-	protected function process_field_formats( $data, $format ) {
+	protected function process_field_formats($data, $format) {
 		$formats = $original_formats = (array) $format;
 
-		foreach ( $data as $field => $value ) {
+		foreach ($data as $field => $value) {
 			$value = array(
 				'value'  => $value,
 				'format' => '%s',
 			);
 
-			if ( ! empty( $format ) ) {
-				$value['format'] = array_shift( $formats );
-				if ( ! $value['format'] ) {
-					$value['format'] = reset( $original_formats );
+			if ( ! empty($format)) {
+				$value['format'] = array_shift($formats);
+				if ( ! $value['format']) {
+					$value['format'] = reset($original_formats);
 				}
-			} elseif ( isset( $this->field_types[ $field ] ) ) {
-				$value['format'] = $this->field_types[ $field ];
+			} elseif (isset($this->field_types[$field])) {
+				$value['format'] = $this->field_types[$field];
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2046,20 +2046,20 @@ 
 	 * @param string $table Table name.
 	 * @return array|false The same array as $data with additional 'charset' keys.
 	 */
-	protected function process_field_charsets( $data, $table ) {
-		foreach ( $data as $field => $value ) {
-			if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
+	protected function process_field_charsets($data, $table) {
+		foreach ($data as $field => $value) {
+			if ('%d' === $value['format'] || '%f' === $value['format']) {
 				// We can skip this field if we know it isn't a string.
 				// This checks %d/%f versus ! %s because it's sprintf() could take more.
 				$value['charset'] = false;
 			} else {
-				$value['charset'] = $this->get_col_charset( $table, $field );
-				if ( is_wp_error( $value['charset'] ) ) {
+				$value['charset'] = $this->get_col_charset($table, $field);
+				if (is_wp_error($value['charset'])) {
 					return false;
 				}
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2076,20 +2076,20 @@ 
 	 * @return array|false The same array as $data with additional 'length' keys, or false if
 	 *                     any of the values were too long for their corresponding field.
 	 */
-	protected function process_field_lengths( $data, $table ) {
-		foreach ( $data as $field => $value ) {
-			if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
+	protected function process_field_lengths($data, $table) {
+		foreach ($data as $field => $value) {
+			if ('%d' === $value['format'] || '%f' === $value['format']) {
 				// We can skip this field if we know it isn't a string.
 				// This checks %d/%f versus ! %s because it's sprintf() could take more.
 				$value['length'] = false;
 			} else {
-				$value['length'] = $this->get_col_length( $table, $field );
-				if ( is_wp_error( $value['length'] ) ) {
+				$value['length'] = $this->get_col_length($table, $field);
+				if (is_wp_error($value['length'])) {
 					return false;
 				}
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2109,24 +2109,24 @@ 
 	 * @param int         $y     Optional. Row of value to return. Indexed from 0.
 	 * @return string|null Database query result (as string), or null on failure
 	 */
-	public function get_var( $query = null, $x = 0, $y = 0 ) {
+	public function get_var($query = null, $x = 0, $y = 0) {
 		$this->func_call = "\$db->get_var(\"$query\", $x, $y)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		}
 
 		// Extract var out of cached results based x,y vals
-		if ( !empty( $this->last_result[$y] ) ) {
-			$values = array_values( get_object_vars( $this->last_result[$y] ) );
+		if ( ! empty($this->last_result[$y])) {
+			$values = array_values(get_object_vars($this->last_result[$y]));
 		}
 
 		// If there is a value return it else return null
-		return ( isset( $values[$x] ) && $values[$x] !== '' ) ? $values[$x] : null;
+		return (isset($values[$x]) && $values[$x] !== '') ? $values[$x] : null;
 	}
 
 	/**
@@ -2144,33 +2144,33 @@ 
 	 * @param int         $y      Optional. Row to return. Indexed from 0.
 	 * @return array|object|null|void Database query result in format specified by $output or null on failure
 	 */
-	public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
+	public function get_row($query = null, $output = OBJECT, $y = 0) {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		} else {
 			return null;
 		}
 
-		if ( !isset( $this->last_result[$y] ) )
+		if ( ! isset($this->last_result[$y]))
 			return null;
 
-		if ( $output == OBJECT ) {
+		if ($output == OBJECT) {
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
-		} elseif ( $output == ARRAY_A ) {
-			return $this->last_result[$y] ? get_object_vars( $this->last_result[$y] ) : null;
-		} elseif ( $output == ARRAY_N ) {
-			return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
-		} elseif ( strtoupper( $output ) === OBJECT ) {
+		} elseif ($output == ARRAY_A) {
+			return $this->last_result[$y] ? get_object_vars($this->last_result[$y]) : null;
+		} elseif ($output == ARRAY_N) {
+			return $this->last_result[$y] ? array_values(get_object_vars($this->last_result[$y])) : null;
+		} elseif (strtoupper($output) === OBJECT) {
 			// Back compat for OBJECT being previously case insensitive.
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
 		} else {
-			$this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" );
+			$this->print_error(" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N");
 		}
 	}
 
@@ -2187,19 +2187,19 @@ 
 	 * @param int         $x     Optional. Column to return. Indexed from 0.
 	 * @return array Database query result. Array indexed from 0 by SQL result row number.
 	 */
-	public function get_col( $query = null , $x = 0 ) {
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+	public function get_col($query = null, $x = 0) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		}
 
 		$new_array = array();
 		// Extract the column values
-		for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
-			$new_array[$i] = $this->get_var( null, $x, $i );
+		for ($i = 0, $j = count($this->last_result); $i < $j; $i++) {
+			$new_array[$i] = $this->get_var(null, $x, $i);
 		}
 		return $new_array;
 	}
@@ -2219,48 +2219,48 @@ 
 	 *                       Duplicate keys are discarded.
 	 * @return array|object|null Database query results
 	 */
-	public function get_results( $query = null, $output = OBJECT ) {
+	public function get_results($query = null, $output = OBJECT) {
 		$this->func_call = "\$db->get_results(\"$query\", $output)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		} else {
 			return null;
 		}
 
 		$new_array = array();
-		if ( $output == OBJECT ) {
+		if ($output == OBJECT) {
 			// Return an integer-keyed array of row objects
 			return $this->last_result;
-		} elseif ( $output == OBJECT_K ) {
+		} elseif ($output == OBJECT_K) {
 			// Return an array of row objects with keys from column 1
 			// (Duplicates are discarded)
-			foreach ( $this->last_result as $row ) {
-				$var_by_ref = get_object_vars( $row );
-				$key = array_shift( $var_by_ref );
-				if ( ! isset( $new_array[ $key ] ) )
-					$new_array[ $key ] = $row;
+			foreach ($this->last_result as $row) {
+				$var_by_ref = get_object_vars($row);
+				$key = array_shift($var_by_ref);
+				if ( ! isset($new_array[$key]))
+					$new_array[$key] = $row;
 			}
 			return $new_array;
-		} elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
+		} elseif ($output == ARRAY_A || $output == ARRAY_N) {
 			// Return an integer-keyed array of...
-			if ( $this->last_result ) {
-				foreach( (array) $this->last_result as $row ) {
-					if ( $output == ARRAY_N ) {
+			if ($this->last_result) {
+				foreach ((array) $this->last_result as $row) {
+					if ($output == ARRAY_N) {
 						// ...integer-keyed row arrays
-						$new_array[] = array_values( get_object_vars( $row ) );
+						$new_array[] = array_values(get_object_vars($row));
 					} else {
 						// ...column name-keyed row arrays
-						$new_array[] = get_object_vars( $row );
+						$new_array[] = get_object_vars($row);
 					}
 				}
 			}
 			return $new_array;
-		} elseif ( strtoupper( $output ) === OBJECT ) {
+		} elseif (strtoupper($output) === OBJECT) {
 			// Back compat for OBJECT being previously case insensitive.
 			return $this->last_result;
 		}
@@ -2276,8 +2276,8 @@ 
 	 * @param string $table Table name.
 	 * @return string|WP_Error Table character set, WP_Error object if it couldn't be found.
 	 */
-	protected function get_table_charset( $table ) {
-		$tablekey = strtolower( $table );
+	protected function get_table_charset($table) {
+		$tablekey = strtolower($table);
 
 		/**
 		 * Filter the table charset value before the DB is checked.
@@ -2290,72 +2290,72 @@ 
 		 * @param string $charset The character set to use. Default null.
 		 * @param string $table   The name of the table being checked.
 		 */
-		$charset = apply_filters( 'pre_get_table_charset', null, $table );
-		if ( null !== $charset ) {
+		$charset = apply_filters('pre_get_table_charset', null, $table);
+		if (null !== $charset) {
 			return $charset;
 		}
 
-		if ( isset( $this->table_charset[ $tablekey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (isset($this->table_charset[$tablekey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		$charsets = $columns = array();
 
-		$table_parts = explode( '.', $table );
-		$table = '`' . implode( '`.`', $table_parts ) . '`';
-		$results = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
-		if ( ! $results ) {
-			return new WP_Error( 'wpdb_get_table_charset_failure' );
+		$table_parts = explode('.', $table);
+		$table = '`'.implode('`.`', $table_parts).'`';
+		$results = $this->get_results("SHOW FULL COLUMNS FROM $table");
+		if ( ! $results) {
+			return new WP_Error('wpdb_get_table_charset_failure');
 		}
 
-		foreach ( $results as $column ) {
-			$columns[ strtolower( $column->Field ) ] = $column;
+		foreach ($results as $column) {
+			$columns[strtolower($column->Field)] = $column;
 		}
 
-		$this->col_meta[ $tablekey ] = $columns;
+		$this->col_meta[$tablekey] = $columns;
 
-		foreach ( $columns as $column ) {
-			if ( ! empty( $column->Collation ) ) {
-				list( $charset ) = explode( '_', $column->Collation );
+		foreach ($columns as $column) {
+			if ( ! empty($column->Collation)) {
+				list($charset) = explode('_', $column->Collation);
 
 				// If the current connection can't support utf8mb4 characters, let's only send 3-byte utf8 characters.
-				if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
+				if ('utf8mb4' === $charset && ! $this->has_cap('utf8mb4')) {
 					$charset = 'utf8';
 				}
 
-				$charsets[ strtolower( $charset ) ] = true;
+				$charsets[strtolower($charset)] = true;
 			}
 
-			list( $type ) = explode( '(', $column->Type );
+			list($type) = explode('(', $column->Type);
 
 			// A binary/blob means the whole query gets treated like this.
-			if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
-				$this->table_charset[ $tablekey ] = 'binary';
+			if (in_array(strtoupper($type), array('BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB'))) {
+				$this->table_charset[$tablekey] = 'binary';
 				return 'binary';
 			}
 		}
 
 		// utf8mb3 is an alias for utf8.
-		if ( isset( $charsets['utf8mb3'] ) ) {
+		if (isset($charsets['utf8mb3'])) {
 			$charsets['utf8'] = true;
-			unset( $charsets['utf8mb3'] );
+			unset($charsets['utf8mb3']);
 		}
 
 		// Check if we have more than one charset in play.
-		$count = count( $charsets );
-		if ( 1 === $count ) {
-			$charset = key( $charsets );
-		} elseif ( 0 === $count ) {
+		$count = count($charsets);
+		if (1 === $count) {
+			$charset = key($charsets);
+		} elseif (0 === $count) {
 			// No charsets, assume this table can store whatever.
 			$charset = false;
 		} else {
 			// More than one charset. Remove latin1 if present and recalculate.
-			unset( $charsets['latin1'] );
-			$count = count( $charsets );
-			if ( 1 === $count ) {
+			unset($charsets['latin1']);
+			$count = count($charsets);
+			if (1 === $count) {
 				// Only one charset (besides latin1).
-				$charset = key( $charsets );
-			} elseif ( 2 === $count && isset( $charsets['utf8'], $charsets['utf8mb4'] ) ) {
+				$charset = key($charsets);
+			} elseif (2 === $count && isset($charsets['utf8'], $charsets['utf8mb4'])) {
 				// Two charsets, but they're utf8 and utf8mb4, use utf8.
 				$charset = 'utf8';
 			} else {
@@ -2364,7 +2364,7 @@ 
 			}
 		}
 
-		$this->table_charset[ $tablekey ] = $charset;
+		$this->table_charset[$tablekey] = $charset;
 		return $charset;
 	}
 
@@ -2379,9 +2379,9 @@ 
 	 * @return string|false|WP_Error Column character set as a string. False if the column has no
 	 *                               character set. WP_Error object if there was an error.
 	 */
-	public function get_col_charset( $table, $column ) {
-		$tablekey = strtolower( $table );
-		$columnkey = strtolower( $column );
+	public function get_col_charset($table, $column) {
+		$tablekey = strtolower($table);
+		$columnkey = strtolower($column);
 
 		/**
 		 * Filter the column charset value before the DB is checked.
@@ -2395,40 +2395,40 @@ 
 		 * @param string $table   The name of the table being checked.
 		 * @param string $column  The name of the column being checked.
 		 */
-		$charset = apply_filters( 'pre_get_col_charset', null, $table, $column );
-		if ( null !== $charset ) {
+		$charset = apply_filters('pre_get_col_charset', null, $table, $column);
+		if (null !== $charset) {
 			return $charset;
 		}
 
 		// Skip this entirely if this isn't a MySQL database.
-		if ( false === $this->is_mysql ) {
+		if (false === $this->is_mysql) {
 			return false;
 		}
 
-		if ( empty( $this->table_charset[ $tablekey ] ) ) {
+		if (empty($this->table_charset[$tablekey])) {
 			// This primes column information for us.
-			$table_charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $table_charset ) ) {
+			$table_charset = $this->get_table_charset($table);
+			if (is_wp_error($table_charset)) {
 				return $table_charset;
 			}
 		}
 
 		// If still no column information, return the table charset.
-		if ( empty( $this->col_meta[ $tablekey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (empty($this->col_meta[$tablekey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		// If this column doesn't exist, return the table charset.
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (empty($this->col_meta[$tablekey][$columnkey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		// Return false when it's not a string column.
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ]->Collation ) ) {
+		if (empty($this->col_meta[$tablekey][$columnkey]->Collation)) {
 			return false;
 		}
 
-		list( $charset ) = explode( '_', $this->col_meta[ $tablekey ][ $columnkey ]->Collation );
+		list($charset) = explode('_', $this->col_meta[$tablekey][$columnkey]->Collation);
 		return $charset;
 	}
 
@@ -2445,37 +2445,37 @@ 
 	 *                              false if the column has no length (for example, numeric column)
 	 *                              WP_Error object if there was an error.
 	 */
-	public function get_col_length( $table, $column ) {
-		$tablekey = strtolower( $table );
-		$columnkey = strtolower( $column );
+	public function get_col_length($table, $column) {
+		$tablekey = strtolower($table);
+		$columnkey = strtolower($column);
 
 		// Skip this entirely if this isn't a MySQL database.
-		if ( false === $this->is_mysql ) {
+		if (false === $this->is_mysql) {
 			return false;
 		}
 
-		if ( empty( $this->col_meta[ $tablekey ] ) ) {
+		if (empty($this->col_meta[$tablekey])) {
 			// This primes column information for us.
-			$table_charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $table_charset ) ) {
+			$table_charset = $this->get_table_charset($table);
+			if (is_wp_error($table_charset)) {
 				return $table_charset;
 			}
 		}
 
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
+		if (empty($this->col_meta[$tablekey][$columnkey])) {
 			return false;
 		}
 
-		$typeinfo = explode( '(', $this->col_meta[ $tablekey ][ $columnkey ]->Type );
+		$typeinfo = explode('(', $this->col_meta[$tablekey][$columnkey]->Type);
 
-		$type = strtolower( $typeinfo[0] );
-		if ( ! empty( $typeinfo[1] ) ) {
-			$length = trim( $typeinfo[1], ')' );
+		$type = strtolower($typeinfo[0]);
+		if ( ! empty($typeinfo[1])) {
+			$length = trim($typeinfo[1], ')');
 		} else {
 			$length = false;
 		}
 
-		switch( $type ) {
+		switch ($type) {
 			case 'char':
 			case 'varchar':
 				return array(
@@ -2494,21 +2494,21 @@ 
 			case 'tinytext':
 				return array(
 					'type'   => 'byte',
-					'length' => 255,        // 2^8 - 1
+					'length' => 255, // 2^8 - 1
 				);
 				break;
 			case 'blob':
 			case 'text':
 				return array(
 					'type'   => 'byte',
-					'length' => 65535,      // 2^16 - 1
+					'length' => 65535, // 2^16 - 1
 				);
 				break;
 			case 'mediumblob':
 			case 'mediumtext':
 				return array(
 					'type'   => 'byte',
-					'length' => 16777215,   // 2^24 - 1
+					'length' => 16777215, // 2^24 - 1
 				);
 				break;
 			case 'longblob':
@@ -2537,12 +2537,12 @@ 
 	 * @param string $string String to check.
 	 * @return bool True if ASCII, false if not.
 	 */
-	protected function check_ascii( $string ) {
-		if ( function_exists( 'mb_check_encoding' ) ) {
-			if ( mb_check_encoding( $string, 'ASCII' ) ) {
+	protected function check_ascii($string) {
+		if (function_exists('mb_check_encoding')) {
+			if (mb_check_encoding($string, 'ASCII')) {
 				return true;
 			}
-		} elseif ( ! preg_match( '/[^\x00-\x7F]/', $string ) ) {
+		} elseif ( ! preg_match('/[^\x00-\x7F]/', $string)) {
 			return true;
 		}
 
@@ -2558,48 +2558,48 @@ 
 	 * @param string $query The query to check.
 	 * @return bool True if the collation is safe, false if it isn't.
 	 */
-	protected function check_safe_collation( $query ) {
-		if ( $this->checking_collation ) {
+	protected function check_safe_collation($query) {
+		if ($this->checking_collation) {
 			return true;
 		}
 
 		// We don't need to check the collation for queries that don't read data.
-		$query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query ) ) {
+		$query = ltrim($query, "\r\n\t (");
+		if (preg_match('/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query)) {
 			return true;
 		}
 
 		// All-ASCII queries don't need extra checking.
-		if ( $this->check_ascii( $query ) ) {
+		if ($this->check_ascii($query)) {
 			return true;
 		}
 
-		$table = $this->get_table_from_query( $query );
-		if ( ! $table ) {
+		$table = $this->get_table_from_query($query);
+		if ( ! $table) {
 			return false;
 		}
 
 		$this->checking_collation = true;
-		$collation = $this->get_table_charset( $table );
+		$collation = $this->get_table_charset($table);
 		$this->checking_collation = false;
 
 		// Tables with no collation, or latin1 only, don't need extra checking.
-		if ( false === $collation || 'latin1' === $collation ) {
+		if (false === $collation || 'latin1' === $collation) {
 			return true;
 		}
 
-		$table = strtolower( $table );
-		if ( empty( $this->col_meta[ $table ] ) ) {
+		$table = strtolower($table);
+		if (empty($this->col_meta[$table])) {
 			return false;
 		}
 
 		// If any of the columns don't have one of these collations, it needs more sanity checking.
-		foreach( $this->col_meta[ $table ] as $col ) {
-			if ( empty( $col->Collation ) ) {
+		foreach ($this->col_meta[$table] as $col) {
+			if (empty($col->Collation)) {
 				continue;
 			}
 
-			if ( ! in_array( $col->Collation, array( 'utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin' ), true ) ) {
+			if ( ! in_array($col->Collation, array('utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin'), true)) {
 				return false;
 			}
 		}
@@ -2621,13 +2621,13 @@ 
 	 *                        such as 'field' are retained in each value array. If we cannot
 	 *                        remove invalid characters, a WP_Error object is returned.
 	 */
-	protected function strip_invalid_text( $data ) {
+	protected function strip_invalid_text($data) {
 		$db_check_string = false;
 
-		foreach ( $data as &$value ) {
+		foreach ($data as &$value) {
 			$charset = $value['charset'];
 
-			if ( is_array( $value['length'] ) ) {
+			if (is_array($value['length'])) {
 				$length = $value['length']['length'];
 				$truncate_by_byte_length = 'byte' === $value['length']['type'];
 			} else {
@@ -2639,12 +2639,12 @@ 
 			}
 
 			// There's no charset to work with.
-			if ( false === $charset ) {
+			if (false === $charset) {
 				continue;
 			}
 
 			// Column isn't a string.
-			if ( ! is_string( $value['value'] ) ) {
+			if ( ! is_string($value['value'])) {
 				continue;
 			}
 
@@ -2654,26 +2654,26 @@ 
 				'latin1' === $charset
 			||
 				// ASCII is always OK.
-				( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) )
+				( ! isset($value['ascii']) && $this->check_ascii($value['value']))
 			) {
 				$truncate_by_byte_length = true;
 				$needs_validation = false;
 			}
 
-			if ( $truncate_by_byte_length ) {
+			if ($truncate_by_byte_length) {
 				mbstring_binary_safe_encoding();
-				if ( false !== $length && strlen( $value['value'] ) > $length ) {
-					$value['value'] = substr( $value['value'], 0, $length );
+				if (false !== $length && strlen($value['value']) > $length) {
+					$value['value'] = substr($value['value'], 0, $length);
 				}
 				reset_mbstring_encoding();
 
-				if ( ! $needs_validation ) {
+				if ( ! $needs_validation) {
 					continue;
 				}
 			}
 
 			// utf8 can be handled by regex, which is a bunch faster than a DB lookup.
-			if ( ( 'utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset ) && function_exists( 'mb_strlen' ) ) {
+			if (('utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset) && function_exists('mb_strlen')) {
 				$regex = '/
 					(
 						(?: [\x00-\x7F]                  # single-byte sequences   0xxxxxxx
@@ -2683,7 +2683,7 @@ 
 						|   \xED[\x80-\x9F][\x80-\xBF]
 						|   [\xEE-\xEF][\x80-\xBF]{2}';
 
-				if ( 'utf8mb4' === $charset ) {
+				if ('utf8mb4' === $charset) {
 					$regex .= '
 						|    \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
 						|    [\xF1-\xF3][\x80-\xBF]{3}
@@ -2695,11 +2695,11 @@ 
 					)
 					| .                                  # anything else
 					/x';
-				$value['value'] = preg_replace( $regex, '$1', $value['value'] );
+				$value['value'] = preg_replace($regex, '$1', $value['value']);
 
 
-				if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) {
-					$value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' );
+				if (false !== $length && mb_strlen($value['value'], 'UTF-8') > $length) {
+					$value['value'] = mb_substr($value['value'], 0, $length, 'UTF-8');
 				}
 				continue;
 			}
@@ -2707,49 +2707,49 @@ 
 			// We couldn't use any local conversions, send it to the DB.
 			$value['db'] = $db_check_string = true;
 		}
-		unset( $value ); // Remove by reference.
+		unset($value); // Remove by reference.
 
-		if ( $db_check_string ) {
+		if ($db_check_string) {
 			$queries = array();
-			foreach ( $data as $col => $value ) {
-				if ( ! empty( $value['db'] ) ) {
+			foreach ($data as $col => $value) {
+				if ( ! empty($value['db'])) {
 					// We're going to need to truncate by characters or bytes, depending on the length value we have.
-					if ( 'byte' === $value['length']['type'] ) {
+					if ('byte' === $value['length']['type']) {
 						// Using binary causes LEFT() to truncate by bytes.
 						$charset = 'binary';
 					} else {
 						$charset = $value['charset'];
 					}
 
-					if ( is_array( $value['length'] ) ) {
-						$queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING {$this->charset} )", $value['value'], $value['length']['length'] );
-					} else if ( 'binary' !== $charset ) {
+					if (is_array($value['length'])) {
+						$queries[$col] = $this->prepare("CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING {$this->charset} )", $value['value'], $value['length']['length']);
+					} else if ('binary' !== $charset) {
 						// If we don't have a length, there's no need to convert binary - it will always return the same result.
-						$queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING {$this->charset} )", $value['value'] );
+						$queries[$col] = $this->prepare("CONVERT( CONVERT( %s USING $charset ) USING {$this->charset} )", $value['value']);
 					}
 
-					unset( $data[ $col ]['db'] );
+					unset($data[$col]['db']);
 				}
 			}
 
 			$sql = array();
-			foreach ( $queries as $column => $query ) {
-				if ( ! $query ) {
+			foreach ($queries as $column => $query) {
+				if ( ! $query) {
 					continue;
 				}
 
-				$sql[] = $query . " AS x_$column";
+				$sql[] = $query." AS x_$column";
 			}
 
 			$this->check_current_query = false;
-			$row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A );
-			if ( ! $row ) {
-				return new WP_Error( 'wpdb_strip_invalid_text_failure' );
+			$row = $this->get_row("SELECT ".implode(', ', $sql), ARRAY_A);
+			if ( ! $row) {
+				return new WP_Error('wpdb_strip_invalid_text_failure');
 			}
 
-			foreach ( array_keys( $data ) as $column ) {
-				if ( isset( $row["x_$column"] ) ) {
-					$data[ $column ]['value'] = $row["x_$column"];
+			foreach (array_keys($data) as $column) {
+				if (isset($row["x_$column"])) {
+					$data[$column]['value'] = $row["x_$column"];
 				}
 			}
 		}
@@ -2766,22 +2766,22 @@ 
 	 * @param string $query Query to convert.
 	 * @return string|WP_Error The converted query, or a WP_Error object if the conversion fails.
 	 */
-	protected function strip_invalid_text_from_query( $query ) {
+	protected function strip_invalid_text_from_query($query) {
 		// We don't need to check the collation for queries that don't read data.
-		$trimmed_query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query ) ) {
+		$trimmed_query = ltrim($query, "\r\n\t (");
+		if (preg_match('/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query)) {
 			return $query;
 		}
 
-		$table = $this->get_table_from_query( $query );
-		if ( $table ) {
-			$charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $charset ) ) {
+		$table = $this->get_table_from_query($query);
+		if ($table) {
+			$charset = $this->get_table_charset($table);
+			if (is_wp_error($charset)) {
 				return $charset;
 			}
 
 			// We can't reliably strip text from tables containing binary/blob columns
-			if ( 'binary' === $charset ) {
+			if ('binary' === $charset) {
 				return $query;
 			}
 		} else {
@@ -2795,8 +2795,8 @@ 
 			'length'  => false,
 		);
 
-		$data = $this->strip_invalid_text( array( $data ) );
-		if ( is_wp_error( $data ) ) {
+		$data = $this->strip_invalid_text(array($data));
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
@@ -2814,16 +2814,16 @@ 
 	 * @param string $value  The text to check.
 	 * @return string|WP_Error The converted string, or a WP_Error object if the conversion fails.
 	 */
-	public function strip_invalid_text_for_column( $table, $column, $value ) {
-		if ( ! is_string( $value ) ) {
+	public function strip_invalid_text_for_column($table, $column, $value) {
+		if ( ! is_string($value)) {
 			return $value;
 		}
 
-		$charset = $this->get_col_charset( $table, $column );
-		if ( ! $charset ) {
+		$charset = $this->get_col_charset($table, $column);
+		if ( ! $charset) {
 			// Not a string column.
 			return $value;
-		} elseif ( is_wp_error( $charset ) ) {
+		} elseif (is_wp_error($charset)) {
 			// Bail on real errors.
 			return $charset;
 		}
@@ -2832,16 +2832,16 @@ 
 			$column => array(
 				'value'   => $value,
 				'charset' => $charset,
-				'length'  => $this->get_col_length( $table, $column ),
+				'length'  => $this->get_col_length($table, $column),
 			)
 		);
 
-		$data = $this->strip_invalid_text( $data );
-		if ( is_wp_error( $data ) ) {
+		$data = $this->strip_invalid_text($data);
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
-		return $data[ $column ]['value'];
+		return $data[$column]['value'];
 	}
 
 	/**
@@ -2853,37 +2853,37 @@ 
 	 * @param string $query The query to search.
 	 * @return string|false $table The table name found, or false if a table couldn't be found.
 	 */
-	protected function get_table_from_query( $query ) {
+	protected function get_table_from_query($query) {
 		// Remove characters that can legally trail the table name.
-		$query = rtrim( $query, ';/-#' );
+		$query = rtrim($query, ';/-#');
 
 		// Allow (select...) union [...] style queries. Use the first query's table name.
-		$query = ltrim( $query, "\r\n\t (" );
+		$query = ltrim($query, "\r\n\t (");
 
 		// Strip everything between parentheses except nested selects.
-		$query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', $query );
+		$query = preg_replace('/\((?!\s*select)[^(]*?\)/is', '()', $query);
 
 		// Quickly match most common queries.
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. 'SELECT.*?\s+FROM'
 				. '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?'
 				. '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
 				. '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
 				. '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-				. ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		// SHOW TABLE STATUS and SHOW TABLES
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
 				. '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-				. ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		// Big pattern for the rest of the table-related queries.
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM'
 				. '|DESCRIBE|DESC|EXPLAIN|HANDLER'
 				. '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?'
@@ -2897,8 +2897,8 @@ 
 				. '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
 				. '|(?:GRANT|REVOKE).*ON\s+TABLE'
 				. '|SHOW\s+(?:.*FROM|.*TABLE)'
-				. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		return false;
@@ -2912,18 +2912,18 @@ 
 	 * @access protected
 	 */
 	protected function load_col_info() {
-		if ( $this->col_info )
+		if ($this->col_info)
 			return;
 
-		if ( $this->use_mysqli ) {
-			$num_fields = @mysqli_num_fields( $this->result );
-			for ( $i = 0; $i < $num_fields; $i++ ) {
-				$this->col_info[ $i ] = @mysqli_fetch_field( $this->result );
+		if ($this->use_mysqli) {
+			$num_fields = @mysqli_num_fields($this->result);
+			for ($i = 0; $i < $num_fields; $i++) {
+				$this->col_info[$i] = @mysqli_fetch_field($this->result);
 			}
 		} else {
-			$num_fields = @mysql_num_fields( $this->result );
-			for ( $i = 0; $i < $num_fields; $i++ ) {
-				$this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i );
+			$num_fields = @mysql_num_fields($this->result);
+			for ($i = 0; $i < $num_fields; $i++) {
+				$this->col_info[$i] = @mysql_fetch_field($this->result, $i);
 			}
 		}
 	}
@@ -2937,14 +2937,14 @@ 
 	 * @param int    $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type
 	 * @return mixed Column Results
 	 */
-	public function get_col_info( $info_type = 'name', $col_offset = -1 ) {
+	public function get_col_info($info_type = 'name', $col_offset = -1) {
 		$this->load_col_info();
 
-		if ( $this->col_info ) {
-			if ( $col_offset == -1 ) {
+		if ($this->col_info) {
+			if ($col_offset == -1) {
 				$i = 0;
 				$new_array = array();
-				foreach( (array) $this->col_info as $col ) {
+				foreach ((array) $this->col_info as $col) {
 					$new_array[$i] = $col->{$info_type};
 					$i++;
 				}
@@ -2963,7 +2963,7 @@ 
 	 * @return true
 	 */
 	public function timer_start() {
-		$this->time_start = microtime( true );
+		$this->time_start = microtime(true);
 		return true;
 	}
 
@@ -2975,7 +2975,7 @@ 
 	 * @return float Total time spent on the query, in seconds
 	 */
 	public function timer_stop() {
-		return ( microtime( true ) - $this->time_start );
+		return (microtime(true) - $this->time_start);
 	}
 
 	/**
@@ -2989,9 +2989,9 @@ 
 	 * @param string $error_code Optional. A Computer readable string to identify the error.
 	 * @return false|void
 	 */
-	public function bail( $message, $error_code = '500' ) {
-		if ( !$this->show_errors ) {
-			if ( class_exists( 'WP_Error' ) )
+	public function bail($message, $error_code = '500') {
+		if ( ! $this->show_errors) {
+			if (class_exists('WP_Error'))
 				$this->error = new WP_Error($error_code, $message);
 			else
 				$this->error = $message;
@@ -3013,8 +3013,8 @@ 
 	public function check_database_version() {
 		global $wp_version, $required_mysql_version;
 		// Make sure the server has the required MySQL version
-		if ( version_compare($this->db_version(), $required_mysql_version, '<') )
-			return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		if (version_compare($this->db_version(), $required_mysql_version, '<'))
+			return new WP_Error('database_version', sprintf(__('<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher'), $wp_version, $required_mysql_version));
 	}
 
 	/**
@@ -3029,8 +3029,8 @@ 
 	 * @return bool True if collation is supported, false if version does not
 	 */
 	public function supports_collation() {
-		_deprecated_function( __FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )' );
-		return $this->has_cap( 'collation' );
+		_deprecated_function(__FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )');
+		return $this->has_cap('collation');
 	}
 
 	/**
@@ -3043,9 +3043,9 @@ 
 	public function get_charset_collate() {
 		$charset_collate = '';
 
-		if ( ! empty( $this->charset ) )
+		if ( ! empty($this->charset))
 			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
-		if ( ! empty( $this->collate ) )
+		if ( ! empty($this->collate))
 			$charset_collate .= " COLLATE $this->collate";
 
 		return $charset_collate;
@@ -3064,21 +3064,21 @@ 
 	 *                       or 'utf8mb4'.
 	 * @return int|false Whether the database feature is supported, false otherwise.
 	 */
-	public function has_cap( $db_cap ) {
+	public function has_cap($db_cap) {
 		$version = $this->db_version();
 
-		switch ( strtolower( $db_cap ) ) {
+		switch (strtolower($db_cap)) {
 			case 'collation' :    // @since 2.5.0
 			case 'group_concat' : // @since 2.7.0
 			case 'subqueries' :   // @since 2.7.0
-				return version_compare( $version, '4.1', '>=' );
+				return version_compare($version, '4.1', '>=');
 			case 'set_charset' :
-				return version_compare( $version, '5.0.7', '>=' );
+				return version_compare($version, '5.0.7', '>=');
 			case 'utf8mb4' :      // @since 4.1.0
-				if ( version_compare( $version, '5.5.3', '<' ) ) {
+				if (version_compare($version, '5.5.3', '<')) {
 					return false;
 				}
-				if ( $this->use_mysqli ) {
+				if ($this->use_mysqli) {
 					$client_version = mysqli_get_client_info();
 				} else {
 					$client_version = mysql_get_client_info();
@@ -3088,11 +3088,11 @@ 
 				 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
 				 * mysqlnd has supported utf8mb4 since 5.0.9.
 				 */
-				if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
-					$client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
-					return version_compare( $client_version, '5.0.9', '>=' );
+				if (false !== strpos($client_version, 'mysqlnd')) {
+					$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+					return version_compare($client_version, '5.0.9', '>=');
 				} else {
-					return version_compare( $client_version, '5.5.3', '>=' );
+					return version_compare($client_version, '5.5.3', '>=');
 				}
 		}
 
@@ -3110,7 +3110,7 @@ 
 	 * @return string|array The name of the calling function
 	 */
 	public function get_caller() {
-		return wp_debug_backtrace_summary( __CLASS__ );
+		return wp_debug_backtrace_summary(__CLASS__);
 	}
 
 	/**
@@ -3121,11 +3121,11 @@ 
 	 * @return null|string Null on failure, version number on success.
 	 */
 	public function db_version() {
-		if ( $this->use_mysqli ) {
-			$server_info = mysqli_get_server_info( $this->dbh );
+		if ($this->use_mysqli) {
+			$server_info = mysqli_get_server_info($this->dbh);
 		} else {
-			$server_info = mysql_get_server_info( $this->dbh );
+			$server_info = mysql_get_server_info($this->dbh);
 		}
-		return preg_replace( '/[^0-9.].*/', '', $server_info );
+		return preg_replace('/[^0-9.].*/', '', $server_info);
 	}
 }

Braces +138 added lines, -96 removed lines

@@ -617,8 +617,9 @@ 
 	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
 		register_shutdown_function( array( $this, '__destruct' ) );
 
-		if ( WP_DEBUG && WP_DEBUG_DISPLAY )
-			$this->show_errors();
+		if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
+					$this->show_errors();
+		}
 
 		/* Use ext/mysqli if it exists and:
 		 *  - WP_USE_EXT_MYSQL is defined as false, or
@@ -669,8 +670,9 @@ 
 	 * @return mixed The private member
 	 */
 	public function __get( $name ) {
-		if ( 'col_info' === $name )
-			$this->load_col_info();
+		if ( 'col_info' === $name ) {
+					$this->load_col_info();
+		}
 
 		return $this->$name;
 	}
@@ -763,18 +765,21 @@ 
 	 * @param string   $collate Optional. The collation. Default null.
 	 */
 	public function set_charset( $dbh, $charset = null, $collate = null ) {
-		if ( ! isset( $charset ) )
-			$charset = $this->charset;
-		if ( ! isset( $collate ) )
-			$collate = $this->collate;
+		if ( ! isset( $charset ) ) {
+					$charset = $this->charset;
+		}
+		if ( ! isset( $collate ) ) {
+					$collate = $this->collate;
+		}
 		if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
 			if ( $this->use_mysqli ) {
 				if ( function_exists( 'mysqli_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
 					mysqli_set_charset( $dbh, $charset );
 				} else {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
+					if ( ! empty( $collate ) ) {
+											$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysqli_query( $dbh, $query );
 				}
 			} else {
@@ -782,8 +787,9 @@ 
 					mysql_set_charset( $charset, $dbh );
 				} else {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
+					if ( ! empty( $collate ) ) {
+											$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysql_query( $query, $dbh );
 				}
 			}
@@ -866,30 +872,36 @@ 
 	 */
 	public function set_prefix( $prefix, $set_table_names = true ) {
 
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-			return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+					return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		}
 
 		$old_prefix = is_multisite() ? '' : $prefix;
 
-		if ( isset( $this->base_prefix ) )
-			$old_prefix = $this->base_prefix;
+		if ( isset( $this->base_prefix ) ) {
+					$old_prefix = $this->base_prefix;
+		}
 
 		$this->base_prefix = $prefix;
 
 		if ( $set_table_names ) {
-			foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'global' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 
-			if ( is_multisite() && empty( $this->blogid ) )
-				return $old_prefix;
+			if ( is_multisite() && empty( $this->blogid ) ) {
+							return $old_prefix;
+			}
 
 			$this->prefix = $this->get_blog_prefix();
 
-			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 
-			foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 		}
 		return $old_prefix;
 	}
@@ -905,19 +917,22 @@ 
 	 * @return int previous blog id
 	 */
 	public function set_blog_id( $blog_id, $site_id = 0 ) {
-		if ( ! empty( $site_id ) )
-			$this->siteid = $site_id;
+		if ( ! empty( $site_id ) ) {
+					$this->siteid = $site_id;
+		}
 
 		$old_blog_id  = $this->blogid;
 		$this->blogid = $blog_id;
 
 		$this->prefix = $this->get_blog_prefix();
 
-		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
-			$this->$table = $prefixed_table;
+		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
+					$this->$table = $prefixed_table;
+		}
 
-		foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
-			$this->$table = $prefixed_table;
+		foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
+					$this->$table = $prefixed_table;
+		}
 
 		return $old_blog_id;
 	}
@@ -931,13 +946,15 @@ 
 	 */
 	public function get_blog_prefix( $blog_id = null ) {
 		if ( is_multisite() ) {
-			if ( null === $blog_id )
-				$blog_id = $this->blogid;
+			if ( null === $blog_id ) {
+							$blog_id = $this->blogid;
+			}
 			$blog_id = (int) $blog_id;
-			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
-				return $this->base_prefix;
-			else
-				return $this->base_prefix . $blog_id . '_';
+			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) ) {
+							return $this->base_prefix;
+			} else {
+							return $this->base_prefix . $blog_id . '_';
+			}
 		} else {
 			return $this->base_prefix;
 		}
@@ -974,16 +991,18 @@ 
 		switch ( $scope ) {
 			case 'all' :
 				$tables = array_merge( $this->global_tables, $this->tables );
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if ( is_multisite() ) {
+									$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
 			case 'blog' :
 				$tables = $this->tables;
 				break;
 			case 'global' :
 				$tables = $this->global_tables;
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if ( is_multisite() ) {
+									$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
 			case 'ms_global' :
 				$tables = $this->ms_global_tables;
@@ -996,24 +1015,28 @@ 
 		}
 
 		if ( $prefix ) {
-			if ( ! $blog_id )
-				$blog_id = $this->blogid;
+			if ( ! $blog_id ) {
+							$blog_id = $this->blogid;
+			}
 			$blog_prefix = $this->get_blog_prefix( $blog_id );
 			$base_prefix = $this->base_prefix;
 			$global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
 			foreach ( $tables as $k => $table ) {
-				if ( in_array( $table, $global_tables ) )
-					$tables[ $table ] = $base_prefix . $table;
-				else
-					$tables[ $table ] = $blog_prefix . $table;
+				if ( in_array( $table, $global_tables ) ) {
+									$tables[ $table ] = $base_prefix . $table;
+				} else {
+									$tables[ $table ] = $blog_prefix . $table;
+				}
 				unset( $tables[ $k ] );
 			}
 
-			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) )
-				$tables['users'] = CUSTOM_USER_TABLE;
+			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) ) {
+							$tables['users'] = CUSTOM_USER_TABLE;
+			}
 
-			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) )
-				$tables['usermeta'] = CUSTOM_USER_META_TABLE;
+			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) ) {
+							$tables['usermeta'] = CUSTOM_USER_META_TABLE;
+			}
 		}
 
 		return $tables;
@@ -1031,8 +1054,9 @@ 
 	 * @param resource|null $dbh Optional link identifier.
 	 */
 	public function select( $db, $dbh = null ) {
-		if ( is_null($dbh) )
-			$dbh = $this->dbh;
+		if ( is_null($dbh) ) {
+					$dbh = $this->dbh;
+		}
 
 		if ( $this->use_mysqli ) {
 			$success = @mysqli_select_db( $dbh, $db );
@@ -1070,8 +1094,9 @@ 
 	 * @return string
 	 */
 	function _weak_escape( $string ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
+					_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		}
 		return addslashes( $string );
 	}
 
@@ -1117,10 +1142,11 @@ 
 	function _escape( $data ) {
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
-				if ( is_array($v) )
-					$data[$k] = $this->_escape( $v );
-				else
-					$data[$k] = $this->_real_escape( $v );
+				if ( is_array($v) ) {
+									$data[$k] = $this->_escape( $v );
+				} else {
+									$data[$k] = $this->_real_escape( $v );
+				}
 			}
 		} else {
 			$data = $this->_real_escape( $data );
@@ -1143,14 +1169,16 @@ 
 	 * @return mixed
 	 */
 	public function escape( $data ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
+					_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		}
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
-				if ( is_array( $v ) )
-					$data[$k] = $this->escape( $v, 'recursive' );
-				else
-					$data[$k] = $this->_weak_escape( $v, 'internal' );
+				if ( is_array( $v ) ) {
+									$data[$k] = $this->escape( $v, 'recursive' );
+				} else {
+									$data[$k] = $this->_weak_escape( $v, 'internal' );
+				}
 			}
 		} else {
 			$data = $this->_weak_escape( $data, 'internal' );
@@ -1169,8 +1197,9 @@ 
 	 * @param string $string to escape
 	 */
 	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) )
-			$string = $this->_real_escape( $string );
+		if ( ! is_float( $string ) ) {
+					$string = $this->_real_escape( $string );
+		}
 	}
 
 	/**
@@ -1208,8 +1237,9 @@ 
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
 	public function prepare( $query, $args ) {
-		if ( is_null( $query ) )
-			return;
+		if ( is_null( $query ) ) {
+					return;
+		}
 
 		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
 		if ( strpos( $query, '%' ) === false ) {
@@ -1219,8 +1249,9 @@ 
 		$args = func_get_args();
 		array_shift( $args );
 		// If args were passed as an array (as in vsprintf), move them up
-		if ( isset( $args[0] ) && is_array($args[0]) )
-			$args = $args[0];
+		if ( isset( $args[0] ) && is_array($args[0]) ) {
+					$args = $args[0];
+		}
 		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
 		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
 		$query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
@@ -1276,21 +1307,24 @@ 
 		}
 		$EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
 
-		if ( $this->suppress_errors )
-			return false;
+		if ( $this->suppress_errors ) {
+					return false;
+		}
 
 		wp_load_translations_early();
 
-		if ( $caller = $this->get_caller() )
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
-		else
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+		if ( $caller = $this->get_caller() ) {
+					$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
+		} else {
+					$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+		}
 
 		error_log( $error_str );
 
 		// Are we showing errors?
-		if ( ! $this->show_errors )
-			return false;
+		if ( ! $this->show_errors ) {
+					return false;
+		}
 
 		// If there is an error then take note of it
 		if ( is_multisite() ) {
@@ -1681,8 +1715,9 @@ 
 
 		if ( $this->last_error ) {
 			// Clear insert_id on a subsequent failed insert.
-			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
-				$this->insert_id = 0;
+			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
+							$this->insert_id = 0;
+			}
 
 			$this->print_error();
 			return false;
@@ -2157,8 +2192,9 @@ 
 			return null;
 		}
 
-		if ( !isset( $this->last_result[$y] ) )
-			return null;
+		if ( !isset( $this->last_result[$y] ) ) {
+					return null;
+		}
 
 		if ( $output == OBJECT ) {
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
@@ -2242,8 +2278,9 @@ 
 			foreach ( $this->last_result as $row ) {
 				$var_by_ref = get_object_vars( $row );
 				$key = array_shift( $var_by_ref );
-				if ( ! isset( $new_array[ $key ] ) )
-					$new_array[ $key ] = $row;
+				if ( ! isset( $new_array[ $key ] ) ) {
+									$new_array[ $key ] = $row;
+				}
 			}
 			return $new_array;
 		} elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
@@ -2912,8 +2949,9 @@ 
 	 * @access protected
 	 */
 	protected function load_col_info() {
-		if ( $this->col_info )
-			return;
+		if ( $this->col_info ) {
+					return;
+		}
 
 		if ( $this->use_mysqli ) {
 			$num_fields = @mysqli_num_fields( $this->result );
@@ -2991,10 +3029,11 @@ 
 	 */
 	public function bail( $message, $error_code = '500' ) {
 		if ( !$this->show_errors ) {
-			if ( class_exists( 'WP_Error' ) )
-				$this->error = new WP_Error($error_code, $message);
-			else
-				$this->error = $message;
+			if ( class_exists( 'WP_Error' ) ) {
+							$this->error = new WP_Error($error_code, $message);
+			} else {
+							$this->error = $message;
+			}
 			return false;
 		}
 		wp_die($message);
@@ -3013,8 +3052,9 @@ 
 	public function check_database_version() {
 		global $wp_version, $required_mysql_version;
 		// Make sure the server has the required MySQL version
-		if ( version_compare($this->db_version(), $required_mysql_version, '<') )
-			return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		if ( version_compare($this->db_version(), $required_mysql_version, '<') ) {
+					return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		}
 	}
 
 	/**
@@ -3043,10 +3083,12 @@ 
 	public function get_charset_collate() {
 		$charset_collate = '';
 
-		if ( ! empty( $this->charset ) )
-			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
-		if ( ! empty( $this->collate ) )
-			$charset_collate .= " COLLATE $this->collate";
+		if ( ! empty( $this->charset ) ) {
+					$charset_collate = "DEFAULT CHARACTER SET $this->charset";
+		}
+		if ( ! empty( $this->collate ) ) {
+					$charset_collate .= " COLLATE $this->collate";
+		}
 
 		return $charset_collate;
 	}

src/wp-includes/wp-diff.php

Doc Comments +2 added lines, -2 removed lines

@@ -495,7 +495,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -532,7 +532,7 @@ 
 	 *
 	 * @param string $string
 	 * @param string $newlineEscape
-	 * @return string
+	 * @return string[]
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * WordPress Diff bastard child of old MediaWiki Diff Formatter.
- *
- * Basically all that remains is the table structure and some method names.
- *
- * @package WordPress
- * @subpackage Diff
- */
+	 * WordPress Diff bastard child of old MediaWiki Diff Formatter.
+	 *
+	 * Basically all that remains is the table structure and some method names.
+	 *
+	 * @package WordPress
+	 * @subpackage Diff
+	 */
 
 if ( !class_exists( 'Text_Diff' ) ) {
 	/** Text_Diff class */
@@ -169,7 +169,7 @@ 
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}

Spacing +100 added lines, -100 removed lines

@@ -8,13 +8,13 @@ 
  * @subpackage Diff
  */
 
-if ( !class_exists( 'Text_Diff' ) ) {
+if ( ! class_exists('Text_Diff')) {
 	/** Text_Diff class */
-	require( dirname(__FILE__).'/Text/Diff.php' );
+	require(dirname(__FILE__).'/Text/Diff.php');
 	/** Text_Diff_Renderer class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer.php');
 	/** Text_Diff_Renderer_inline class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer/inline.php');
 }
 
 /**
@@ -31,7 +31,7 @@ 
 	 * @access public
 	 * @since 2.6.0
 	 */
-	public $_leading_context_lines  = 10000;
+	public $_leading_context_lines = 10000;
 
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
@@ -68,7 +68,7 @@ 
 	 */
 	protected $_show_split_view = true;
 
-	protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' );
+	protected $compat_fields = array('_show_split_view', 'inline_diff_renderer', '_diff_threshold');
 
 	/**
 	 * Constructor - Call parent constructor with params array.
@@ -79,10 +79,10 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function __construct( $params = array() ) {
-		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+	public function __construct($params = array()) {
+		parent::__construct($params);
+		if (isset($params['show_split_view']))
+			$this->_show_split_view = $params['show_split_view'];
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @param string $header
 	 * @return string
 	 */
-	public function _startBlock( $header ) {
+	public function _startBlock($header) {
 		return '';
 	}
 
@@ -101,7 +101,7 @@ 
 	 * @param array $lines
 	 * @param string $prefix
 	 */
-	public function _lines( $lines, $prefix=' ' ) {
+	public function _lines($lines, $prefix = ' ') {
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function addedLine( $line ) {
+	public function addedLine($line) {
 		return "<td class='diff-addedline'>{$line}</td>";
 
 	}
@@ -121,7 +121,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function deletedLine( $line ) {
+	public function deletedLine($line) {
 		return "<td class='diff-deletedline'>{$line}</td>";
 	}
 
@@ -131,7 +131,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function contextLine( $line ) {
+	public function contextLine($line) {
 		return "<td class='diff-context'>{$line}</td>";
 	}
 
@@ -152,11 +152,11 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _added( $lines, $encode = true ) {
+	public function _added($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/**
 				 * Contextually filter a diffed line.
@@ -171,13 +171,13 @@ 
 				 * @param String $line           The unprocessed diffed line.
 		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'added');
 			}
 
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->emptyLine().$this->emptyLine().$this->addedLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->addedLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -191,19 +191,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _deleted( $lines, $encode = true ) {
+	public function _deleted($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'deleted');
 			}
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->deletedLine($line).$this->emptyLine().$this->emptyLine()."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->deletedLine($line)."</tr>\n";
 			}
 
 		}
@@ -218,19 +218,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _context( $lines, $encode = true ) {
+	public function _context($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'unchanged');
 			}
-			if (  $this->_show_split_view ) {
-				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->contextLine($line).$this->emptyLine().$this->contextLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->contextLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -249,7 +249,7 @@ 
 	 * @param array $final
 	 * @return string
 	 */
-	public function _changed( $orig, $final ) {
+	public function _changed($orig, $final) {
 		$r = '';
 
 		// Does the aforementioned additional processing
@@ -259,66 +259,66 @@ 
 		// *_rows are column vectors for the orig column and the final column.
 		//	row >= 0: an indix of the $orig or $final array
 		//	row  < 0: a blank row for that column
-		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
+		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines($orig, $final);
 
 		// These will hold the word changes as determined by an inline diff
 		$orig_diffs  = array();
 		$final_diffs = array();
 
 		// Compute word diffs for each matched pair using the inline diff
-		foreach ( $orig_matches as $o => $f ) {
-			if ( is_numeric($o) && is_numeric($f) ) {
-				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
+		foreach ($orig_matches as $o => $f) {
+			if (is_numeric($o) && is_numeric($f)) {
+				$text_diff = new Text_Diff('auto', array(array($orig[$o]), array($final[$f])));
 				$renderer = new $this->inline_diff_renderer;
-				$diff = $renderer->render( $text_diff );
+				$diff = $renderer->render($text_diff);
 
 				// If they're too different, don't include any <ins> or <dels>
-				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
+				if (preg_match_all('!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches)) {
 					// length of all text between <ins> or <del>
-					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
+					$stripped_matches = strlen(strip_tags(join(' ', $diff_matches[0])));
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
-					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
+					$stripped_diff = strlen(strip_tags($diff)) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
+					if ($diff_ratio > $this->_diff_threshold)
 						continue; // Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
-				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
-				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
+				$orig_diffs[$o]  = preg_replace('|<ins>.*?</ins>|', '', $diff);
+				$final_diffs[$f] = preg_replace('|<del>.*?</del>|', '', $diff);
 			}
 		}
 
-		foreach ( array_keys($orig_rows) as $row ) {
+		foreach (array_keys($orig_rows) as $row) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
+			if ($orig_rows[$row] < 0 && $final_rows[$row] < 0)
 				continue;
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
+			if (isset($orig_diffs[$orig_rows[$row]]))
 				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
+			elseif (isset($orig[$orig_rows[$row]]))
 				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
 			else
 				$orig_line = '';
 
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
+			if (isset($final_diffs[$final_rows[$row]]))
 				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
+			elseif (isset($final[$final_rows[$row]]))
 				$final_line = htmlspecialchars($final[$final_rows[$row]]);
 			else
 				$final_line = '';
 
-			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
-				$r .= $this->_added( array($final_line), false );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
-				$r .= $this->_deleted( array($orig_line), false );
+			if ($orig_rows[$row] < 0) { // Orig is blank. This is really an added row.
+				$r .= $this->_added(array($final_line), false);
+			} elseif ($final_rows[$row] < 0) { // Final is blank. This is really a deleted row.
+				$r .= $this->_deleted(array($orig_line), false);
 			} else { // A true changed row.
-				if ( $this->_show_split_view ) {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+				if ($this->_show_split_view) {
+					$r .= '<tr>'.$this->deletedLine($orig_line).$this->emptyLine().$this->addedLine($final_line)."</tr>\n";
 				} else {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+					$r .= '<tr>'.$this->deletedLine($orig_line)."</tr><tr>".$this->addedLine($final_line)."</tr>\n";
 				}
 			}
 		}
@@ -340,13 +340,13 @@ 
 	 * @param array $final
 	 * @return array
 	 */
-	public function interleave_changed_lines( $orig, $final ) {
+	public function interleave_changed_lines($orig, $final) {
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
-		foreach ( array_keys($orig) as $o ) {
-			foreach ( array_keys($final) as $f ) {
-				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
+		foreach (array_keys($orig) as $o) {
+			foreach (array_keys($final) as $f) {
+				$matches["$o,$f"] = $this->compute_string_distance($orig[$o], $final[$f]);
 			}
 		}
 		asort($matches); // Order by string distance.
@@ -354,28 +354,28 @@ 
 		$orig_matches  = array();
 		$final_matches = array();
 
-		foreach ( $matches as $keys => $difference ) {
+		foreach ($matches as $keys => $difference) {
 			list($o, $f) = explode(',', $keys);
 			$o = (int) $o;
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
+			if (isset($orig_matches[$o]) && isset($final_matches[$f]))
 				continue;
 
 			// First match for these guys. Must be best match
-			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
+			if ( ! isset($orig_matches[$o]) && ! isset($final_matches[$f])) {
 				$orig_matches[$o] = $f;
 				$final_matches[$f] = $o;
 				continue;
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
+			if (isset($orig_matches[$o]))
 				$final_matches[$f] = 'x';
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
+			elseif (isset($final_matches[$f]))
 				$orig_matches[$o] = 'x';
 		}
 
@@ -389,31 +389,31 @@ 
 
 		// Interleaves rows with blanks to keep matches aligned.
 		// We may end up with some extraneous blank rows, but we'll just ignore them later.
-		foreach ( $orig_rows_copy as $orig_row ) {
+		foreach ($orig_rows_copy as $orig_row) {
 			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
 			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
 
-			if ( false === $final_pos ) { // This orig is paired with a blank final.
-				array_splice( $final_rows, $orig_pos, 0, -1 );
-			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
+			if (false === $final_pos) { // This orig is paired with a blank final.
+				array_splice($final_rows, $orig_pos, 0, -1);
+			} elseif ($final_pos < $orig_pos) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
-			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
+				while ($diff_pos < 0)
+					array_splice($final_rows, $orig_pos, 0, $diff_pos++);
+			} elseif ($final_pos > $orig_pos) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ($diff_pos < 0)
+					array_splice($orig_rows, $orig_pos, 0, $diff_pos++);
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
-		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
+		if ($diff_count < 0) {
+			while ($diff_count < 0)
 				array_push($orig_rows, $diff_count++);
-		} elseif ( $diff_count > 0 ) {
+		} elseif ($diff_count > 0) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
+			while ($diff_count < 0)
 				array_push($final_rows, $diff_count++);
 		}
 
@@ -429,16 +429,16 @@ 
 	 * @param string $string2
 	 * @return int
 	 */
-	public function compute_string_distance( $string1, $string2 ) {
+	public function compute_string_distance($string1, $string2) {
 		// Vectors containing character frequency for all chars in each string
 		$chars1 = count_chars($string1);
 		$chars2 = count_chars($string2);
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum(array_map(array($this, 'difference'), $chars1, $chars2));
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
+		if ( ! $string1)
 			return $difference;
 
 		// Return distance per character (of string1).
@@ -453,8 +453,8 @@ 
 	 * @param int $b
 	 * @return int
 	 */
-	public function difference( $a, $b ) {
-		return abs( $a - $b );
+	public function difference($a, $b) {
+		return abs($a - $b);
 	}
 
 	/**
@@ -466,8 +466,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -482,8 +482,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -497,9 +497,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -511,9 +511,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 }
@@ -536,8 +536,8 @@ 
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);
-		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$words  = str_replace( "\n", $newlineEscape, $words );
+		$words  = preg_split('/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$words  = str_replace("\n", $newlineEscape, $words);
 		return $words;
 	}
 

Braces +49 added lines, -35 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function __construct( $params = array() ) {
 		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+		if ( isset( $params[ 'show_split_view' ] ) ) {
+					$this->_show_split_view = $params[ 'show_split_view' ];
+		}
 	}
 
 	/**
@@ -280,8 +281,10 @@ 
 					//	we double the length of chars not in those tags.
 					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
-						continue; // Too different. Don't save diffs.
+					if ( $diff_ratio > $this->_diff_threshold ) {
+											continue;
+					}
+					// Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
@@ -292,23 +295,26 @@ 
 
 		foreach ( array_keys($orig_rows) as $row ) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
-				continue;
+			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) {
+							continue;
+			}
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
-				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
-				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
-			else
-				$orig_line = '';
-
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
-				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
-				$final_line = htmlspecialchars($final[$final_rows[$row]]);
-			else
-				$final_line = '';
+			if ( isset( $orig_diffs[$orig_rows[$row]] ) ) {
+							$orig_line = $orig_diffs[$orig_rows[$row]];
+			} elseif ( isset( $orig[$orig_rows[$row]] ) ) {
+							$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
+			} else {
+							$orig_line = '';
+			}
+
+			if ( isset( $final_diffs[$final_rows[$row]] ) ) {
+							$final_line = $final_diffs[$final_rows[$row]];
+			} elseif ( isset( $final[$final_rows[$row]] ) ) {
+							$final_line = htmlspecialchars($final[$final_rows[$row]]);
+			} else {
+							$final_line = '';
+			}
 
 			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
 				$r .= $this->_added( array($final_line), false );
@@ -360,8 +366,9 @@ 
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
-				continue;
+			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) {
+							continue;
+			}
 
 			// First match for these guys. Must be best match
 			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
@@ -371,12 +378,14 @@ 
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
-				$final_matches[$f] = 'x';
+			if ( isset($orig_matches[$o]) ) {
+							$final_matches[$f] = 'x';
+			}
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
-				$orig_matches[$o] = 'x';
+			elseif ( isset($final_matches[$f]) ) {
+							$orig_matches[$o] = 'x';
+			}
 		}
 
 		// We read the text in this order
@@ -397,24 +406,28 @@ 
 				array_splice( $final_rows, $orig_pos, 0, -1 );
 			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
 		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
-				array_push($orig_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($orig_rows, $diff_count++);
+			}
 		} elseif ( $diff_count > 0 ) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
-				array_push($final_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($final_rows, $diff_count++);
+			}
 		}
 
 		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
@@ -438,8 +451,9 @@ 
 		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
-			return $difference;
+		if ( !$string1 ) {
+					return $difference;
+		}
 
 		// Return distance per character (of string1).
 		return $difference / strlen($string1);

src/wp-trackback.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  *
  * @since 0.71
  *
- * @param mixed  $error         Whether there was an error.
+ * @param integer  $error         Whether there was an error.
  *                              Default '0'. Accepts '0' or '1', true or false.
  * @param string $error_message Error message if an error occurred.
  */

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Handle Trackbacks and Pingbacks Sent to WordPress
- *
- * @since 0.71
- *
- * @package WordPress
- * @subpackage Trackbacks
- */
+	 * Handle Trackbacks and Pingbacks Sent to WordPress
+	 *
+	 * @since 0.71
+	 *
+	 * @package WordPress
+	 * @subpackage Trackbacks
+	 */
 
 if (empty($wp)) {
 	require_once( dirname( __FILE__ ) . '/wp-load.php' );

Spacing +23 added lines, -23 removed lines

@@ -9,8 +9,8 @@ 
  */
 
 if (empty($wp)) {
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
-	wp( array( 'tb' => '1' ) );
+	require_once(dirname(__FILE__).'/wp-load.php');
+	wp(array('tb' => '1'));
 }
 
 /**
@@ -25,7 +25,7 @@ 
  * @param string $error_message Error message if an error occurred.
  */
 function trackback_response($error = 0, $error_message = '') {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 	if ($error) {
 		echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
 		echo "<response>\n";
@@ -44,30 +44,30 @@ 
 // Trackback is done by a POST.
 $request_array = 'HTTP_POST_VARS';
 
-if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {
+if ( ! isset($_GET['tb_id']) || ! $_GET['tb_id']) {
 	$tb_id = explode('/', $_SERVER['REQUEST_URI']);
-	$tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
+	$tb_id = intval($tb_id[count($tb_id) - 1]);
 }
 
-$tb_url  = isset($_POST['url'])     ? $_POST['url']     : '';
+$tb_url  = isset($_POST['url']) ? $_POST['url'] : '';
 $charset = isset($_POST['charset']) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so they can be properly escaped after mb_convert_encoding().
-$title     = isset($_POST['title'])     ? wp_unslash($_POST['title'])      : '';
-$excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
-$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
+$title     = isset($_POST['title']) ? wp_unslash($_POST['title']) : '';
+$excerpt   = isset($_POST['excerpt']) ? wp_unslash($_POST['excerpt']) : '';
+$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name']) : '';
 
 if ($charset)
-	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
+	$charset = str_replace(array(',', ' '), '', strtoupper(trim($charset)));
 else
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if (false !== strpos($charset, 'UTF-7'))
 	die;
 
 // For international trackbacks.
-if ( function_exists('mb_convert_encoding') ) {
+if (function_exists('mb_convert_encoding')) {
 	$title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
 	$excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
 	$blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
@@ -78,10 +78,10 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if (is_single() || is_page())
 	$tb_id = $posts[0]->ID;
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( ! isset($tb_id) || ! intval($tb_id))
 	trackback_response(1, 'I really need an ID for this to work.');
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
@@ -90,14 +90,14 @@ 
 	exit;
 }
 
-if ( !empty($tb_url) && !empty($title) ) {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+if ( ! empty($tb_url) && ! empty($title)) {
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 
-	if ( !pings_open($tb_id) )
+	if ( ! pings_open($tb_id))
 		trackback_response(1, 'Sorry, trackbacks are closed for this item.');
 
-	$title =  wp_html_excerpt( $title, 250, '&#8230;' );
-	$excerpt = wp_html_excerpt( $excerpt, 252, '&#8230;' );
+	$title = wp_html_excerpt($title, 250, '&#8230;');
+	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	$comment_post_ID = (int) $tb_id;
 	$comment_author = $blog_name;
@@ -106,8 +106,8 @@ 
 	$comment_content = "<strong>$title</strong>\n\n$excerpt";
 	$comment_type = 'trackback';
 
-	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
+	$dupe = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url));
+	if ($dupe)
 		trackback_response(1, 'We already have a ping from that URL for this post.');
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
@@ -122,6 +122,6 @@ 
 	 *
 	 * @param int $trackback_id Trackback ID.
 	 */
-	do_action( 'trackback_post', $trackback_id );
-	trackback_response( 0 );
+	do_action('trackback_post', $trackback_id);
+	trackback_response(0);
 }

Braces +15 added lines, -9 removed lines

@@ -57,14 +57,16 @@ 
 $excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
 $blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
 
-if ($charset)
+if ($charset) {
 	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
-else
+} else {
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
+}
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if ( false !== strpos($charset, 'UTF-7') ) {
 	die;
+}
 
 // For international trackbacks.
 if ( function_exists('mb_convert_encoding') ) {
@@ -78,11 +80,13 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if ( is_single() || is_page() ) {
 	$tb_id = $posts[0]->ID;
+}
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( !isset($tb_id) || !intval( $tb_id ) ) {
 	trackback_response(1, 'I really need an ID for this to work.');
+}
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
 	// If it doesn't look like a trackback at all.
@@ -93,8 +97,9 @@ 
 if ( !empty($tb_url) && !empty($title) ) {
 	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
 
-	if ( !pings_open($tb_id) )
-		trackback_response(1, 'Sorry, trackbacks are closed for this item.');
+	if ( !pings_open($tb_id) ) {
+			trackback_response(1, 'Sorry, trackbacks are closed for this item.');
+	}
 
 	$title =  wp_html_excerpt( $title, 250, '…' );
 	$excerpt = wp_html_excerpt( $excerpt, 252, '…' );
@@ -107,8 +112,9 @@ 
 	$comment_type = 'trackback';
 
 	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
-		trackback_response(1, 'We already have a ping from that URL for this post.');
+	if ( $dupe ) {
+			trackback_response(1, 'We already have a ping from that URL for this post.');
+	}
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
 

tools/i18n/extract.php

Doc Comments +10 added lines

@@ -40,11 +40,17 @@ 
 		return $translations;
 	}
 
+	/**
+	 * @param string $prefix
+	 */
 	function extract_from_file( $file_name, $prefix ) {
 		$code = file_get_contents( $file_name );
 		return $this->extract_from_code( $code, $prefix . $file_name );
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function does_file_name_match( $path, $excludes, $includes ) {
 		if ( $includes ) {
 			$matched_any_include = false;
@@ -128,6 +134,10 @@ 
 		return $entry;
 	}
 
+	/**
+	 * @param string $code
+	 * @param string $file_name
+	 */
 	function extract_from_code( $code, $file_name ) {
 		$translations = new Translations;
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );

Switch Indentation +29 added lines, -29 removed lines

@@ -75,35 +75,35 @@
 		for( $i = 0; $i < count( $rule ); ++$i ) {
 			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
 			switch( $rule[$i] ) {
-			case 'string':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$complete = true;
-				break;
-			case 'singular':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$entry->is_plural = true;
-				break;
-			case 'plural':
-				$entry->plural = $call['args'][$i];
-				$entry->is_plural = true;
-				$complete = true;
-				break;
-			case 'context':
-				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
-					$single_entry->context = $entry->context;
-				}
-				break;
+				case 'string':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$complete = true;
+					break;
+				case 'singular':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$entry->is_plural = true;
+					break;
+				case 'plural':
+					$entry->plural = $call['args'][$i];
+					$entry->is_plural = true;
+					$complete = true;
+					break;
+				case 'context':
+					$entry->context = $call['args'][$i];
+					foreach( $multiple as &$single_entry ) {
+						$single_entry->context = $entry->context;
+					}
+					break;
 			}
 		}
 		if ( isset( $call['line'] ) && $call['line'] ) {

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/entry.php";
 require_once "$pomo/translations.php";
 
@@ -10,55 +10,55 @@ 
 class StringExtractor {
 
 	var $rules = array(
-		'__' => array( 'string' ),
-		'_e' => array( 'string' ),
-		'_n' => array( 'singular', 'plural' ),
+		'__' => array('string'),
+		'_e' => array('string'),
+		'_n' => array('singular', 'plural'),
 	);
 	var $comment_prefix = 'translators:';
 
-	function __construct( $rules = array() ) {
+	function __construct($rules = array()) {
 		$this->rules = $rules;
 	}
 
-	function extract_from_directory( $dir, $excludes = array(), $includes = array(), $prefix = '' ) {
+	function extract_from_directory($dir, $excludes = array(), $includes = array(), $prefix = '') {
 		$old_cwd = getcwd();
-		chdir( $dir );
+		chdir($dir);
 		$translations = new Translations;
-		$file_names = (array) scandir( '.' );
-		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
-			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
-				$extracted = $this->extract_from_file( $file_name, $prefix );
-				$translations->merge_originals_with( $extracted );
+		$file_names = (array) scandir('.');
+		foreach ($file_names as $file_name) {
+			if ('.' == $file_name || '..' == $file_name) continue;
+			if (preg_match('/\.php$/', $file_name) && $this->does_file_name_match($prefix.$file_name, $excludes, $includes)) {
+				$extracted = $this->extract_from_file($file_name, $prefix);
+				$translations->merge_originals_with($extracted);
 			}
-			if ( is_dir( $file_name ) ) {
-				$extracted = $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' );
-				$translations->merge_originals_with( $extracted );
+			if (is_dir($file_name)) {
+				$extracted = $this->extract_from_directory($file_name, $excludes, $includes, $prefix.$file_name.'/');
+				$translations->merge_originals_with($extracted);
 			}
 		}
-		chdir( $old_cwd );
+		chdir($old_cwd);
 		return $translations;
 	}
 
-	function extract_from_file( $file_name, $prefix ) {
-		$code = file_get_contents( $file_name );
-		return $this->extract_from_code( $code, $prefix . $file_name );
+	function extract_from_file($file_name, $prefix) {
+		$code = file_get_contents($file_name);
+		return $this->extract_from_code($code, $prefix.$file_name);
 	}
 
-	function does_file_name_match( $path, $excludes, $includes ) {
-		if ( $includes ) {
+	function does_file_name_match($path, $excludes, $includes) {
+		if ($includes) {
 			$matched_any_include = false;
-			foreach( $includes as $include ) {
-				if ( preg_match( '|^'.$include.'$|', $path ) ) {
+			foreach ($includes as $include) {
+				if (preg_match('|^'.$include.'$|', $path)) {
 					$matched_any_include = true;
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( ! $matched_any_include) return false;
 		}
-		if ( $excludes ) {
-			foreach( $excludes as $exclude ) {
-				if ( preg_match( '|^'.$exclude.'$|', $path ) ) {
+		if ($excludes) {
+			foreach ($excludes as $exclude) {
+				if (preg_match('|^'.$exclude.'$|', $path)) {
 					return false;
 				}
 			}
@@ -66,17 +66,17 @@ 
 		return true;
 	}
 
-	function entry_from_call( $call, $file_name ) {
-		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+	function entry_from_call($call, $file_name) {
+		$rule = isset($this->rules[$call['name']]) ? $this->rules[$call['name']] : null;
+		if ( ! $rule) return null;
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
-		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
-			switch( $rule[$i] ) {
+		for ($i = 0; $i < count($rule); ++$i) {
+			if ($rule[$i] && ( ! isset($call['args'][$i]) || ! is_string($call['args'][$i]) || '' == $call['args'][$i])) return false;
+			switch ($rule[$i]) {
 			case 'string':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -85,7 +85,7 @@ 
 				$complete = true;
 				break;
 			case 'singular':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -100,27 +100,27 @@ 
 				break;
 			case 'context':
 				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
+				foreach ($multiple as &$single_entry) {
 					$single_entry->context = $entry->context;
 				}
 				break;
 			}
 		}
-		if ( isset( $call['line'] ) && $call['line'] ) {
-			$references = array( $file_name . ':' . $call['line'] );
+		if (isset($call['line']) && $call['line']) {
+			$references = array($file_name.':'.$call['line']);
 			$entry->references = $references;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->references = $references;
 			}
 		}
-		if ( isset( $call['comment'] ) && $call['comment'] ) {
-			$comments = rtrim( $call['comment'] ) . "\n";
+		if (isset($call['comment']) && $call['comment']) {
+			$comments = rtrim($call['comment'])."\n";
 			$entry->extracted_comments = $comments;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->extracted_comments = $comments;
 			}
 		}
-		if ( $multiple && $entry ) {
+		if ($multiple && $entry) {
 			$multiple[] = $entry;
 			return $multiple;
 		}
@@ -128,16 +128,16 @@ 
 		return $entry;
 	}
 
-	function extract_from_code( $code, $file_name ) {
+	function extract_from_code($code, $file_name) {
 		$translations = new Translations;
-		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
-		foreach( $function_calls as $call ) {
-			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
-					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+		$function_calls = $this->find_function_calls(array_keys($this->rules), $code);
+		foreach ($function_calls as $call) {
+			$entry = $this->entry_from_call($call, $file_name);
+			if (is_array($entry))
+				foreach ($entry as $single_entry)
+					$translations->add_entry_or_merge($single_entry);
+			elseif ($entry)
+				$translations->add_entry_or_merge($entry);
 		}
 		return $translations;
 	}
@@ -148,70 +148,70 @@ 
 	 *	- args - array for the function arguments. Each string literal is represented by itself, other arguments are represented by null.
 	 *  - line - line number
 	 */
-	function find_function_calls( $function_names, $code ) {
-		$tokens = token_get_all( $code );
+	function find_function_calls($function_names, $code) {
+		$tokens = token_get_all($code);
 		$function_calls = array();
 		$latest_comment = false;
 		$in_func = false;
-		foreach( $tokens as $token ) {
+		foreach ($tokens as $token) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
-			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
+			if (is_array($token)) list($id, $text, $line) = $token;
+			if (T_WHITESPACE == $id) continue;
+			if (T_STRING == $id && in_array($text, $function_names) && ! $in_func) {
 				$in_func = true;
 				$paren_level = -1;
 				$args = array();
 				$func_name = $text;
 				$func_line = $line;
-				$func_comment = $latest_comment? $latest_comment : '';
+				$func_comment = $latest_comment ? $latest_comment : '';
 
 				$just_got_into_func = true;
 				$latest_comment = false;
 				continue;
 			}
-			if ( T_COMMENT == $id ) {
-				$text = preg_replace( '%^\s+\*\s%m', '', $text );
-				$text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
-				$text = trim( preg_replace( '%^/\*|//%', '', preg_replace( '%\*/$%', '', $text ) ) );
-				if ( 0 === stripos( $text, $this->comment_prefix ) ) {
+			if (T_COMMENT == $id) {
+				$text = preg_replace('%^\s+\*\s%m', '', $text);
+				$text = str_replace(array("\r\n", "\n"), ' ', $text); ;
+				$text = trim(preg_replace('%^/\*|//%', '', preg_replace('%\*/$%', '', $text)));
+				if (0 === stripos($text, $this->comment_prefix)) {
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
-			if ( '(' == $token ) {
+			if ( ! $in_func) continue;
+			if ('(' == $token) {
 				$paren_level++;
-				if ( 0 == $paren_level ) { // start of first argument
+				if (0 == $paren_level) { // start of first argument
 					$just_got_into_func = false;
 					$current_argument = null;
 					$current_argument_is_just_literal = true;
 				}
 				continue;
 			}
-			if ( $just_got_into_func ) {
+			if ($just_got_into_func) {
 				// there wasn't a opening paren just after the function name -- this means it is not a function
 				$in_func = false;
 				$just_got_into_func = false;
 			}
-			if ( ')' == $token ) {
-				if ( 0 == $paren_level ) {
+			if (')' == $token) {
+				if (0 == $paren_level) {
 					$in_func = false;
 					$args[] = $current_argument;
-					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					$call = array('name' => $func_name, 'args' => $args, 'line' => $func_line);
+					if ($func_comment) $call['comment'] = $func_comment;
 					$function_calls[] = $call;
 				}
 				$paren_level--;
 				continue;
 			}
-			if ( ',' == $token && 0 == $paren_level ) {
+			if (',' == $token && 0 == $paren_level) {
 				$args[] = $current_argument;
 				$current_argument = null;
 				$current_argument_is_just_literal = true;
 				continue;
 			}
-			if ( T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal ) {
+			if (T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal) {
 				// we can use eval safely, because we are sure $text is just a string literal
-				eval('$current_argument = '.$text.';' );
+				eval('$current_argument = '.$text.';');
 				continue;
 			}
 			$current_argument_is_just_literal = false;

Braces +29 added lines, -12 removed lines

@@ -26,7 +26,9 @@ 
 		$translations = new Translations;
 		$file_names = (array) scandir( '.' );
 		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
+			if ( '.' == $file_name || '..' == $file_name ) {
+				continue;
+			}
 			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
 				$extracted = $this->extract_from_file( $file_name, $prefix );
 				$translations->merge_originals_with( $extracted );
@@ -54,7 +56,9 @@ 
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( !$matched_any_include ) {
+				return false;
+			}
 		}
 		if ( $excludes ) {
 			foreach( $excludes as $exclude ) {
@@ -68,12 +72,16 @@ 
 
 	function entry_from_call( $call, $file_name ) {
 		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+		if ( !$rule ) {
+			return null;
+		}
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
 		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
+			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) {
+				return false;
+			}
 			switch( $rule[$i] ) {
 			case 'string':
 				if ( $complete ) {
@@ -133,11 +141,12 @@ 
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
 		foreach( $function_calls as $call ) {
 			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
+			if ( is_array( $entry ) ) {
+							foreach( $entry as $single_entry )
 					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+			} elseif ( $entry) {
+							$translations->add_entry_or_merge( $entry );
+			}
 		}
 		return $translations;
 	}
@@ -155,8 +164,12 @@ 
 		$in_func = false;
 		foreach( $tokens as $token ) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
+			if ( is_array( $token ) ) {
+				list( $id, $text, $line ) = $token;
+			}
+			if ( T_WHITESPACE == $id ) {
+				continue;
+			}
 			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
 				$in_func = true;
 				$paren_level = -1;
@@ -177,7 +190,9 @@ 
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
+			if ( !$in_func ) {
+				continue;
+			}
 			if ( '(' == $token ) {
 				$paren_level++;
 				if ( 0 == $paren_level ) { // start of first argument
@@ -197,7 +212,9 @@ 
 					$in_func = false;
 					$args[] = $current_argument;
 					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					if ( $func_comment ) {
+						$call['comment'] = $func_comment;
+					}
 					$function_calls[] = $call;
 				}
 				$paren_level--;

tools/i18n/makepot.php

Doc Comments +12 added lines

@@ -153,6 +153,9 @@ 
 			unlink( $temp_file );
 	}
 
+	/**
+	 * @param string $file
+	 */
 	function tempnam( $file ) {
 		$tempnam = tempnam( sys_get_temp_dir(), $file );
 		$this->temp_files[] = $tempnam;
@@ -232,6 +235,9 @@ 
 		return $res;
 	}
 
+	/**
+	 * @param string $output
+	 */
 	function wp_core($dir, $output) {
 		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
 
@@ -242,6 +248,9 @@ 
 		) );
 	}
 
+	/**
+	 * @param string $output
+	 */
 	function wp_frontend( $dir, $output ) {
 		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
 			return false;
@@ -262,6 +271,9 @@ 
 		) );
 	}
 
+	/**
+	 * @param string $output
+	 */
 	function wp_admin($dir, $output) {
 		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
 			return false;

Spacing +173 added lines, -173 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-require_once dirname( __FILE__ ) . '/not-gettexted.php';
-require_once dirname( __FILE__ ) . '/pot-ext-meta.php';
-require_once dirname( __FILE__ ) . '/extract.php';
+require_once dirname(__FILE__).'/not-gettexted.php';
+require_once dirname(__FILE__).'/pot-ext-meta.php';
+require_once dirname(__FILE__).'/extract.php';
 
-if ( !defined( 'STDERR' ) ) {
-	define( 'STDERR', fopen( 'php://stderr', 'w' ) );
+if ( ! defined('STDERR')) {
+	define('STDERR', fopen('php://stderr', 'w'));
 }
 
 class MakePOT {
@@ -53,7 +53,7 @@ 
 		'comments_number_link' => array('string', 'singular', 'plural'),
 	);
 
-	var $ms_files = array( 'ms-.*', '.*/ms-.*', '.*/my-.*', 'wp-activate\.php', 'wp-signup\.php', 'wp-admin/network\.php', 'wp-admin/includes/ms\.php', 'wp-admin/network/.*\.php', 'wp-admin/includes/class-wp-ms.*' );
+	var $ms_files = array('ms-.*', '.*/ms-.*', '.*/my-.*', 'wp-activate\.php', 'wp-signup\.php', 'wp-admin/network\.php', 'wp-admin/includes/ms\.php', 'wp-admin/network/.*\.php', 'wp-admin/includes/class-wp-ms.*');
 
 	var $temp_files = array();
 
@@ -145,16 +145,16 @@ 
 	);
 
 	function __construct($deprecated = true) {
-		$this->extractor = new StringExtractor( $this->rules );
+		$this->extractor = new StringExtractor($this->rules);
 	}
 
 	function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ($this->temp_files as $temp_file)
+			unlink($temp_file);
 	}
 
-	function tempnam( $file ) {
-		$tempnam = tempnam( sys_get_temp_dir(), $file );
+	function tempnam($file) {
+		$tempnam = tempnam(sys_get_temp_dir(), $file);
 		$this->temp_files[] = $tempnam;
 		return $tempnam;
 	}
@@ -164,31 +164,31 @@ 
 	}
 
 	function xgettext($project, $dir, $output_file, $placeholders = array(), $excludes = array(), $includes = array()) {
-		$meta = array_merge( $this->meta['default'], $this->meta[$project] );
-		$placeholders = array_merge( $meta, $placeholders );
-		$meta['output'] = $this->realpath_missing( $output_file );
-		$placeholders['year'] = date( 'Y' );
-		$placeholder_keys = array_map( create_function( '$x', 'return "{".$x."}";' ), array_keys( $placeholders ) );
-		$placeholder_values = array_values( $placeholders );
-		foreach($meta as $key => $value) {
+		$meta = array_merge($this->meta['default'], $this->meta[$project]);
+		$placeholders = array_merge($meta, $placeholders);
+		$meta['output'] = $this->realpath_missing($output_file);
+		$placeholders['year'] = date('Y');
+		$placeholder_keys = array_map(create_function('$x', 'return "{".$x."}";'), array_keys($placeholders));
+		$placeholder_values = array_values($placeholders);
+		foreach ($meta as $key => $value) {
 			$meta[$key] = str_replace($placeholder_keys, $placeholder_values, $value);
 		}
 
-		$originals = $this->extractor->extract_from_directory( $dir, $excludes, $includes );
+		$originals = $this->extractor->extract_from_directory($dir, $excludes, $includes);
 		$pot = new PO;
 		$pot->entries = $originals->entries;
 
-		$pot->set_header( 'Project-Id-Version', $meta['package-name'].' '.$meta['package-version'] );
-		$pot->set_header( 'Report-Msgid-Bugs-To', $meta['msgid-bugs-address'] );
-		$pot->set_header( 'POT-Creation-Date', gmdate( 'Y-m-d H:i:s+00:00' ) );
-		$pot->set_header( 'MIME-Version', '1.0' );
-		$pot->set_header( 'Content-Type', 'text/plain; charset=UTF-8' );
-		$pot->set_header( 'Content-Transfer-Encoding', '8bit' );
-		$pot->set_header( 'PO-Revision-Date', date( 'Y') . '-MO-DA HO:MI+ZONE' );
-		$pot->set_header( 'Last-Translator', 'FULL NAME <EMAIL@ADDRESS>' );
-		$pot->set_header( 'Language-Team', 'LANGUAGE <LL@li.org>' );
-		$pot->set_comment_before_headers( $meta['comments'] );
-		$pot->export_to_file( $output_file );
+		$pot->set_header('Project-Id-Version', $meta['package-name'].' '.$meta['package-version']);
+		$pot->set_header('Report-Msgid-Bugs-To', $meta['msgid-bugs-address']);
+		$pot->set_header('POT-Creation-Date', gmdate('Y-m-d H:i:s+00:00'));
+		$pot->set_header('MIME-Version', '1.0');
+		$pot->set_header('Content-Type', 'text/plain; charset=UTF-8');
+		$pot->set_header('Content-Transfer-Encoding', '8bit');
+		$pot->set_header('PO-Revision-Date', date('Y').'-MO-DA HO:MI+ZONE');
+		$pot->set_header('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>');
+		$pot->set_header('Language-Team', 'LANGUAGE <LL@li.org>');
+		$pot->set_comment_before_headers($meta['comments']);
+		$pot->export_to_file($output_file);
 		return true;
 	}
 
@@ -199,203 +199,203 @@ 
 			'default_output' => 'wordpress.pot',
 			'includes' => array(),
 			'excludes' => array_merge(
-				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*', ),
+				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*',),
 				$this->ms_files
 			),
 			'extract_not_gettexted' => false,
 			'not_gettexted_files_filter' => false,
 		);
-		$args = array_merge( $defaults, $args );
-		extract( $args );
+		$args = array_merge($defaults, $args);
+		extract($args);
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
+		if ($wp_version = $this->wp_version($dir))
 			$placeholders['version'] = $wp_version;
 		else
 			return false;
-		$output = is_null( $output )? $default_output : $output;
-		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		$output = is_null($output) ? $default_output : $output;
+		$res = $this->xgettext($project, $dir, $output, $placeholders, $excludes, $includes);
+		if ( ! $res) return false;
 
-		if ( $extract_not_gettexted ) {
+		if ($extract_not_gettexted) {
 			$old_dir = getcwd();
-			$output = realpath( $output );
-			chdir( $dir );
+			$output = realpath($output);
+			chdir($dir);
 			$php_files = NotGettexted::list_php_files('.');
-			$php_files = array_filter( $php_files, $not_gettexted_files_filter );
+			$php_files = array_filter($php_files, $not_gettexted_files_filter);
 			$not_gettexted = new NotGettexted;
-			$res = $not_gettexted->command_extract( $output, $php_files );
-			chdir( $old_dir );
+			$res = $not_gettexted->command_extract($output, $php_files);
+			chdir($old_dir);
 			/* Adding non-gettexted strings can repeat some phrases */
-			$output_shell = escapeshellarg( $output );
-			system( "msguniq --use-first $output_shell -o $output_shell" );
+			$output_shell = escapeshellarg($output);
+			system("msguniq --use-first $output_shell -o $output_shell");
 		}
 		return $res;
 	}
 
 	function wp_core($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if (file_exists("$dir/wp-admin/user/about.php")) return false;
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-core', 'output' => $output,
 			'extract_not_gettexted' => true,
-			'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
-		) );
+			'not_gettexted_files_filter' => array($this, 'is_not_ms_file'),
+		));
 	}
 
-	function wp_frontend( $dir, $output ) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+	function wp_frontend($dir, $output) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$excludes = array( 'wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php' );
+		$excludes = array('wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php');
 
 		// Exclude Akismet all together for 3.9+.
-		if ( file_exists( "$dir/wp-admin/css/about.css" ) ) {
+		if (file_exists("$dir/wp-admin/css/about.css")) {
 			$excludes[] = 'wp-content/plugins/akismet/.*';
 		}
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-frontend', 'output' => $output,
 			'includes' => array(),
 			'excludes' => $excludes,
 			'default_output' => 'wordpress.pot',
-		) );
+		));
 	}
 
 	function wp_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) {
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) {
 			return false;
 		}
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result ) {
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result) {
 			return false;
 		}
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/.*' ),
-			'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'includes' => array('wp-admin/.*'),
+			'excludes' => array('wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php'),
 			'default_output' => 'wordpress-admin.pot',
-		) );
-		if ( ! $result ) {
+		));
+		if ( ! $result) {
 			return false;
 		}
 
 		$potextmeta = new PotExtMeta;
 
-		if ( ! file_exists( "$dir/wp-admin/css/about.css" ) ) { // < 3.9
-			$result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
-			if ( ! $result ) {
+		if ( ! file_exists("$dir/wp-admin/css/about.css")) { // < 3.9
+			$result = $potextmeta->append("$dir/wp-content/plugins/akismet/akismet.php", $output);
+			if ( ! $result) {
 				return false;
 			}
 		}
 
-		$result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
-		if ( ! $result ) {
+		$result = $potextmeta->append("$dir/wp-content/plugins/hello.php", $output);
+		if ( ! $result) {
 			return false;
 		}
 
 		/* Adding non-gettexted strings can repeat some phrases */
-		$output_shell = escapeshellarg( $output );
-		system( "msguniq $output_shell -o $output_shell" );
+		$output_shell = escapeshellarg($output);
+		system("msguniq $output_shell -o $output_shell");
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot ) {
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot) {
 			return false;
 		}
-		$admin_pot = realpath( is_null( $output ) ? 'wordpress-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $admin_pot $common_pot -o $admin_pot" );
+		$admin_pot = realpath(is_null($output) ? 'wordpress-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot");
+		system("msgcat -u --use-first $admin_pot $common_pot -o $admin_pot");
 		return true;
 	}
 
 	function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) return false;
 
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) return false;
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result)
 			return false;
 
-		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		$admin_pot = $this->tempnam('admin.pot');
+		if (false === $admin_pot) return false;
 
-		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
+		$admin_result = $this->wp_admin($dir, $admin_pot);
+		if ( ! $admin_result)
 			return false;
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'includes' => array('wp-admin/network/.*', 'wp-admin/network.php'),
 			'excludes' => array(),
 			'default_output' => 'wordpress-admin-network.pot',
-		) );
+		));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot)
 			return false;
 
-		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot" );
+		$net_admin_pot = realpath(is_null($output) ? 'wordpress-network-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot");
+		system("msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot");
 		return true;
 	}
 
 	function wp_ms($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
-		if ( !is_file("$dir/wp-admin/ms-users.php") ) return false;
-		$core_pot = $this->tempnam( 'wordpress.pot' );
-		if ( false === $core_pot ) return false;
-		$core_result = $this->wp_core( $dir, $core_pot );
-		if ( ! $core_result )
+		if (file_exists("$dir/wp-admin/user/about.php")) return false;
+		if ( ! is_file("$dir/wp-admin/ms-users.php")) return false;
+		$core_pot = $this->tempnam('wordpress.pot');
+		if (false === $core_pot) return false;
+		$core_result = $this->wp_core($dir, $core_pot);
+		if ( ! $core_result)
 			return false;
-		$ms_result = $this->wp_generic( $dir, array(
+		$ms_result = $this->wp_generic($dir, array(
 			'project' => 'wp-ms', 'output' => $output,
 			'includes' => $this->ms_files,
 			'excludes' => array(),
 			'default_output' => 'wordpress-ms.pot',
 			'extract_not_gettexted' => true,
-			'not_gettexted_files_filter' => array( $this, 'is_ms_file' ),
-		) );
-		if ( !$ms_result ) {
+			'not_gettexted_files_filter' => array($this, 'is_ms_file'),
+		));
+		if ( ! $ms_result) {
 			return false;
 		}
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot)
 			return false;
-		$ms_pot = realpath( is_null( $output )? 'wordpress-ms.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot" );
-		system( "msgcat -u --use-first $ms_pot $common_pot -o $ms_pot" );
+		$ms_pot = realpath(is_null($output) ? 'wordpress-ms.pot' : $output);
+		system("msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot");
+		system("msgcat -u --use-first $ms_pot $common_pot -o $ms_pot");
 		return true;
 	}
 
 	function wp_tz($dir, $output) {
 		$continents_path = 'wp-admin/includes/continents-cities.php';
-		if ( !file_exists( "$dir/$continents_path" ) ) return false;
-		return $this->wp_generic( $dir, array(
+		if ( ! file_exists("$dir/$continents_path")) return false;
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-tz', 'output' => $output,
-			'includes' => array( $continents_path ),
+			'includes' => array($continents_path),
 			'excludes' => array(),
 			'default_output' => 'wordpress-continents-cities.pot',
-		) );
+		));
 	}
 
 	function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
-		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
+		if ( ! is_readable($version_php)) return false;
+		return preg_match('/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents($version_php), $matches) ? $matches[1] : false;
 	}
 
 
@@ -404,23 +404,23 @@ 
 		if (preg_match('/\$wpmu_version\s*=\s*\'(.*?)\';/', file_get_contents($dir.'/wp-includes/version.php'), $matches)) {
 			$placeholders['version'] = $matches[1];
 		}
-		$output = is_null($output)? 'wordpress.pot' : $output;
+		$output = is_null($output) ? 'wordpress.pot' : $output;
 		return $this->xgettext('wp', $dir, $output, $placeholders);
 	}
 
 
 	function bb($dir, $output) {
 		$placeholders = array();
-		$output = is_null($output)? 'bbpress.pot' : $output;
+		$output = is_null($output) ? 'bbpress.pot' : $output;
 		return $this->xgettext('bb', $dir, $output, $placeholders);
 
 	}
 
 	function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if ( ! $extf) return false;
 		$first_lines = '';
-		foreach(range(1, $lines) as $x) {
+		foreach (range(1, $lines) as $x) {
 			$line = fgets($extf);
 			if (feof($extf)) break;
 			if (false === $line) {
@@ -440,7 +440,7 @@ 
 	}
 
 	function generic($dir, $output) {
-		$output = is_null($output)? "generic.pot" : $output;
+		$output = is_null($output) ? "generic.pot" : $output;
 		return $this->xgettext('generic', $dir, $output, array());
 	}
 
@@ -462,41 +462,41 @@ 
 			$slug = $this->guess_plugin_slug($dir);
 		}
 
-		$plugins_dir = @opendir( $dir );
+		$plugins_dir = @opendir($dir);
 		$plugin_files = array();
-		if ( $plugins_dir ) {
-			while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-				if ( '.' === substr( $file, 0, 1 ) ) {
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if ('.' === substr($file, 0, 1)) {
 					continue;
 				}
 
-				if ( '.php' === substr( $file, -4 ) ) {
+				if ('.php' === substr($file, -4)) {
 					$plugin_files[] = $file;
 				}
 			}
-			closedir( $plugins_dir );
+			closedir($plugins_dir);
 		}
 
-		if ( empty( $plugin_files ) ) {
+		if (empty($plugin_files)) {
 			return false;
 		}
 
 		$main_file = '';
-		foreach ( $plugin_files as $plugin_file ) {
-			if ( ! is_readable( "$dir/$plugin_file" ) ) {
+		foreach ($plugin_files as $plugin_file) {
+			if ( ! is_readable("$dir/$plugin_file")) {
 				continue;
 			}
 
-			$source = $this->get_first_lines( "$dir/$plugin_file", $this->max_header_lines );
+			$source = $this->get_first_lines("$dir/$plugin_file", $this->max_header_lines);
 
 			// Stop when we find a file with a plugin name header in it.
-			if ( $this->get_addon_header( 'Plugin Name', $source ) != false ) {
+			if ($this->get_addon_header('Plugin Name', $source) != false) {
 				$main_file = "$dir/$plugin_file";
 				break;
 			}
 		}
 
-		if ( empty( $main_file ) ) {
+		if (empty($main_file)) {
 			return false;
 		}
 
@@ -505,9 +505,9 @@ 
 		$placeholders['name'] = $this->get_addon_header('Plugin Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders);
-		if (!$res) return false;
+		if ( ! $res) return false;
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -530,37 +530,37 @@ 
 		$placeholders['name'] = $this->get_addon_header('Theme Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
+		$license = $this->get_addon_header('License', $source);
+		if ($license)
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
 		else
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
+		if ( ! $res)
 			return false;
 		$potextmeta = new PotExtMeta;
-		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
+		$res = $potextmeta->append($main_file, $output, array('Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI'));
+		if ( ! $res)
 			return false;
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
-		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
-		if ( ! $extract_templates ) {
-			$wp_dir = dirname( dirname( dirname( $dir ) ) );
-			$extract_templates = file_exists( "$wp_dir/wp-admin/user/about.php" ) || ! file_exists( "$wp_dir/wp-load.php" );
+		$extract_templates = ! in_array($slug, array('twentyten', 'twentyeleven', 'default', 'classic'));
+		if ( ! $extract_templates) {
+			$wp_dir = dirname(dirname(dirname($dir)));
+			$extract_templates = file_exists("$wp_dir/wp-admin/user/about.php") || ! file_exists("$wp_dir/wp-load.php");
 		}
-		if ( $extract_templates ) {
-			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
+		if ($extract_templates) {
+			$res = $potextmeta->append($dir, $output, array('Template Name'));
+			if ( ! $res)
 				return false;
-			$files = scandir( $dir );
-			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
+			$files = scandir($dir);
+			foreach ($files as $file) {
+				if ('.' == $file[0] || 'CVS' == $file)
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
+				if (is_dir($dir.'/'.$file)) {
+					$res = $potextmeta->append($dir.'/'.$file, $output, array('Template Name'));
+					if ( ! $res)
 						return false;
 				}
 			}
@@ -572,47 +572,47 @@ 
 	}
 
 	function bp($dir, $output) {
-		$output = is_null($output)? "buddypress.pot" : $output;
+		$output = is_null($output) ? "buddypress.pot" : $output;
 		return $this->xgettext('bp', $dir, $output, array(), array('bp-forums/bbpress/.*'));
 	}
 
-	function glotpress( $dir, $output ) {
-		$output = is_null( $output ) ? "glotpress.pot" : $output;
-		return $this->xgettext( 'glotpress', $dir, $output );
+	function glotpress($dir, $output) {
+		$output = is_null($output) ? "glotpress.pot" : $output;
+		return $this->xgettext('glotpress', $dir, $output);
 	}
 
-	function wporg_bb_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg.pot' : $output;
-		return $this->xgettext( 'wporg-bb-forums', $dir, $output, array(), array(
+	function wporg_bb_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg.pot' : $output;
+		return $this->xgettext('wporg-bb-forums', $dir, $output, array(), array(
 			'bb-plugins/elfakismet/.*',
 			'bb-plugins/support-forum/.*',
-		) );
+		));
 	}
 
-	function rosetta( $dir, $output ) {
-		$output = is_null( $output )? 'rosetta.pot' : $output;
-		return $this->xgettext( 'rosetta', $dir, $output, array(), array(), array(
+	function rosetta($dir, $output) {
+		$output = is_null($output) ? 'rosetta.pot' : $output;
+		return $this->xgettext('rosetta', $dir, $output, array(), array(), array(
 			'mu-plugins/(roles|showcase|downloads)/.*\.php',
 			'mu-plugins/rosetta.*\.php',
 			'mu-plugins/rosetta/[^/]+\.php',
 			'mu-plugins/rosetta/tmpl/.*\.php',
 			'themes/rosetta/.*\.php',
-		) );
+		));
 	}
 
-	function is_ms_file( $file_name ) {
+	function is_ms_file($file_name) {
 		$is_ms_file = false;
-		$prefix = substr( $file_name, 0, 2 ) === './'? '\./' : '';
-		foreach( $this->ms_files as $ms_file )
-			if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
+		$prefix = substr($file_name, 0, 2) === './' ? '\./' : '';
+		foreach ($this->ms_files as $ms_file)
+			if (preg_match('|^'.$prefix.$ms_file.'$|', $file_name)) {
 				$is_ms_file = true;
 				break;
 			}
 		return $is_ms_file;
 	}
 
-	function is_not_ms_file( $file_name ) {
-		return !$this->is_ms_file( $file_name );
+	function is_not_ms_file($file_name) {
+		return ! $this->is_ms_file($file_name);
 	}
 }
 
@@ -622,7 +622,7 @@ 
 if ($included_files[0] == __FILE__) {
 	$makepot = new MakePOT;
 	if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
-		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
+		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3]) ? $argv[3] : null);
 		if (false === $res) {
 			fwrite(STDERR, "Couldn't generate POT file!\n");
 		}

Braces +90 added lines, -49 removed lines

@@ -149,8 +149,9 @@ 
 	}
 
 	function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ( $this->temp_files as $temp_file ) {
+					unlink( $temp_file );
+		}
 	}
 
 	function tempnam( $file ) {
@@ -208,13 +209,16 @@ 
 		$args = array_merge( $defaults, $args );
 		extract( $args );
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
-			$placeholders['version'] = $wp_version;
-		else
-			return false;
+		if ( $wp_version = $this->wp_version( $dir ) ) {
+					$placeholders['version'] = $wp_version;
+		} else {
+					return false;
+		}
 		$output = is_null( $output )? $default_output : $output;
 		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		if ( !$res ) {
+			return false;
+		}
 
 		if ( $extract_not_gettexted ) {
 			$old_dir = getcwd();
@@ -233,7 +237,9 @@ 
 	}
 
 	function wp_core($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
 
 		return $this->wp_generic( $dir, array(
 			'project' => 'wp-core', 'output' => $output,
@@ -316,21 +322,29 @@ 
 	}
 
 	function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
 
 		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		if ( false === $frontend_pot ) {
+			return false;
+		}
 
 		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
-			return false;
+		if ( ! $frontend_result ) {
+					return false;
+		}
 
 		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		if ( false === $admin_pot ) {
+			return false;
+		}
 
 		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
-			return false;
+		if ( ! $admin_result ) {
+					return false;
+		}
 
 		$result = $this->wp_generic( $dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
@@ -344,8 +358,9 @@ 
 		}
 
 		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
-			return false;
+		if ( ! $common_pot ) {
+					return false;
+		}
 
 		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
 		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
@@ -354,13 +369,20 @@ 
 	}
 
 	function wp_ms($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
-		if ( !is_file("$dir/wp-admin/ms-users.php") ) return false;
+		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
+		if ( !is_file("$dir/wp-admin/ms-users.php") ) {
+			return false;
+		}
 		$core_pot = $this->tempnam( 'wordpress.pot' );
-		if ( false === $core_pot ) return false;
-		$core_result = $this->wp_core( $dir, $core_pot );
-		if ( ! $core_result )
+		if ( false === $core_pot ) {
 			return false;
+		}
+		$core_result = $this->wp_core( $dir, $core_pot );
+		if ( ! $core_result ) {
+					return false;
+		}
 		$ms_result = $this->wp_generic( $dir, array(
 			'project' => 'wp-ms', 'output' => $output,
 			'includes' => $this->ms_files,
@@ -373,8 +395,9 @@ 
 			return false;
 		}
 		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
-			return false;
+		if ( ! $common_pot ) {
+					return false;
+		}
 		$ms_pot = realpath( is_null( $output )? 'wordpress-ms.pot' : $output );
 		system( "msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot" );
 		system( "msgcat -u --use-first $ms_pot $common_pot -o $ms_pot" );
@@ -383,7 +406,9 @@ 
 
 	function wp_tz($dir, $output) {
 		$continents_path = 'wp-admin/includes/continents-cities.php';
-		if ( !file_exists( "$dir/$continents_path" ) ) return false;
+		if ( !file_exists( "$dir/$continents_path" ) ) {
+			return false;
+		}
 		return $this->wp_generic( $dir, array(
 			'project' => 'wp-tz', 'output' => $output,
 			'includes' => array( $continents_path ),
@@ -394,7 +419,9 @@ 
 
 	function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
+		if ( !is_readable( $version_php ) ) {
+			return false;
+		}
 		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
 	}
 
@@ -418,11 +445,15 @@ 
 
 	function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if (!$extf) {
+			return false;
+		}
 		$first_lines = '';
 		foreach(range(1, $lines) as $x) {
 			$line = fgets($extf);
-			if (feof($extf)) break;
+			if (feof($extf)) {
+				break;
+			}
 			if (false === $line) {
 				return false;
 			}
@@ -433,10 +464,11 @@ 
 
 
 	function get_addon_header($header, &$source) {
-		if (preg_match('|'.$header.':(.*)$|mi', $source, $matches))
-			return trim($matches[1]);
-		else
-			return false;
+		if (preg_match('|'.$header.':(.*)$|mi', $source, $matches)) {
+					return trim($matches[1]);
+		} else {
+					return false;
+		}
 	}
 
 	function generic($dir, $output) {
@@ -507,7 +539,9 @@ 
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders);
-		if (!$res) return false;
+		if (!$res) {
+			return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -531,19 +565,22 @@ 
 		$placeholders['slug'] = $slug;
 
 		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
-		else
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		if ( $license ) {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
+		} else {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		}
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
-			return false;
+		if (! $res ) {
+					return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
-			return false;
+		if ( ! $res ) {
+					return false;
+		}
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
 		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
 		if ( ! $extract_templates ) {
@@ -552,16 +589,19 @@ 
 		}
 		if ( $extract_templates ) {
 			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
-				return false;
+			if ( ! $res ) {
+							return false;
+			}
 			$files = scandir( $dir );
 			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
-					continue;
+				if ( '.' == $file[0] || 'CVS' == $file ) {
+									continue;
+				}
 				if ( is_dir( $dir . '/' . $file ) ) {
 					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
-						return false;
+					if ( ! $res ) {
+											return false;
+					}
 				}
 			}
 		}
@@ -603,9 +643,10 @@ 
 	function is_ms_file( $file_name ) {
 		$is_ms_file = false;
 		$prefix = substr( $file_name, 0, 2 ) === './'? '\./' : '';
-		foreach( $this->ms_files as $ms_file )
-			if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
+		foreach( $this->ms_files as $ms_file ) {
+					if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
 				$is_ms_file = true;
+		}
 				break;
 			}
 		return $is_ms_file;

tools/i18n/not-gettexted.php

Doc Comments +12 added lines

@@ -51,6 +51,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	function list_php_files($dir) {
 		$files = array();
 		$items = scandir( $dir );
@@ -67,16 +70,25 @@ 
 	}
 
 
+	/**
+	 * @param string $global_array_name
+	 */
 	function make_string_aggregator($global_array_name, $filename) {
 		$a = $global_array_name;
 		return create_function('$string, $comment_id, $line_number', 'global $'.$a.'; $'.$a.'[] = array($string, $comment_id, '.var_export($filename, true).', $line_number);');
 	}
 
+	/**
+	 * @param string $global_mo_name
+	 */
 	function make_mo_replacer($global_mo_name) {
 		$m = $global_mo_name;
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
+	/**
+	 * @param string $register_action
+	 */
 	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
 
 		$current_comment_id = '';

Indentation +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
  */
 // see: http://php.net/tokenizer
 if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+		define( 'T_ML_COMMENT', T_COMMENT );
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+		define( 'T_DOC_COMMENT', T_ML_COMMENT );
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";

Spacing +24 added lines, -24 removed lines

@@ -7,12 +7,12 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+if ( ! defined('T_ML_COMMENT'))
+	    define('T_ML_COMMENT', T_COMMENT);
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+	    define('T_DOC_COMMENT', T_ML_COMMENT);
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
 require_once "$pomo/mo.php";
 
@@ -26,7 +26,7 @@ 
 	var $STAGE_WHITESPACE_AFTER = 4;
 	var $STAGE_END_COMMENT = 4;
 
-	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace' );
+	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace');
 
 
 	function logmsg() {
@@ -34,8 +34,8 @@ 
 		if ($this->enable_logging) error_log(implode(' ', $args));
 	}
 
-	function stderr($msg, $nl=true) {
-		fwrite(STDERR, $msg.($nl? "\n" : ""));
+	function stderr($msg, $nl = true) {
+		fwrite(STDERR, $msg.($nl ? "\n" : ""));
 	}
 
 	function cli_die($msg) {
@@ -43,19 +43,19 @@ 
 		exit(1);
 	}
 
-	function unchanged_token($token, $s='') {
-		return is_array($token)? $token[1] : $token;
+	function unchanged_token($token, $s = '') {
+		return is_array($token) ? $token[1] : $token;
 	}
 
-	function ignore_token($token, $s='') {
+	function ignore_token($token, $s = '') {
 		return '';
 	}
 
 	function list_php_files($dir) {
 		$files = array();
-		$items = scandir( $dir );
-		foreach ( (array) $items as $item ) {
-			$full_item = $dir . '/' . $item;
+		$items = scandir($dir);
+		foreach ((array) $items as $item) {
+			$full_item = $dir.'/'.$item;
 			if ('.' == $item || '..' == $item)
 				continue;
 			if ('.php' == substr($item, -4))
@@ -77,7 +77,7 @@ 
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
-	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
+	function walk_tokens(&$tokens, $string_action, $other_action, $register_action = null) {
 
 		$current_comment_id = '';
 		$current_string = '';
@@ -86,7 +86,7 @@ 
 		$result = '';
 		$line = 1;
 
-		foreach($tokens as $token) {
+		foreach ($tokens as $token) {
 			if (is_array($token)) {
 				list($id, $text) = $token;
 				$line += substr_count($text, "\n");
@@ -102,7 +102,7 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if ( ! is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -149,21 +149,21 @@ 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
 
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$tokens = token_get_all(file_get_contents($filename));
 			$aggregator = $this->make_string_aggregator($global_name, $filename);
 			$this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
 		}
 
-		$potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
+		$potf = '-' == $pot_filename ? STDOUT : @fopen($pot_filename, 'a');
 		if (false === $potf) {
 			$this->cli_die("Couldn't open pot file: $pot_filename");
 		}
 
-		foreach($GLOBALS[$global_name] as $item) {
+		foreach ($GLOBALS[$global_name] as $item) {
 			@list($string, $comment_id, $filename, $line_number) = $item;
-			$filename = isset($filename)? preg_replace('|^\./|', '', $filename) : '';
-			$ref_line_number = isset($line_number)? ":$line_number" : '';
+			$filename = isset($filename) ? preg_replace('|^\./|', '', $filename) : '';
+			$ref_line_number = isset($line_number) ? ":$line_number" : '';
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => "Not gettexted string $comment_id",
@@ -192,9 +192,9 @@ 
 		if (false === $res) {
 			$this->cli_die("Couldn't read MO file '$mo_filename'!");
 		}
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if (strlen($source) > 150000) continue;
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');
@@ -214,7 +214,7 @@ 
 
 	function cli() {
 		global $argv, $commands;
-		if (count($argv) < 4 || !in_array($argv[1], array_keys($this->commands))) {
+		if (count($argv) < 4 || ! in_array($argv[1], array_keys($this->commands))) {
 			$this->usage();
 			exit(1);
 		}

Braces +34 added lines, -20 removed lines

@@ -7,10 +7,11 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
+if ( ! defined( 'T_ML_COMMENT' ) ) {
 	    define( 'T_ML_COMMENT', T_COMMENT );
-else
+} else {
 	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+}
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";
@@ -31,7 +32,9 @@ 
 
 	function logmsg() {
 		$args = func_get_args();
-		if ($this->enable_logging) error_log(implode(' ', $args));
+		if ($this->enable_logging) {
+			error_log(implode(' ', $args));
+		}
 	}
 
 	function stderr($msg, $nl=true) {
@@ -56,12 +59,15 @@ 
 		$items = scandir( $dir );
 		foreach ( (array) $items as $item ) {
 			$full_item = $dir . '/' . $item;
-			if ('.' == $item || '..' == $item)
-				continue;
-			if ('.php' == substr($item, -4))
-				$files[] = $full_item;
-			if (is_dir($full_item))
-				$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			if ('.' == $item || '..' == $item) {
+							continue;
+			}
+			if ('.php' == substr($item, -4)) {
+							$files[] = $full_item;
+			}
+			if (is_dir($full_item)) {
+							$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			}
 		}
 		return $files;
 	}
@@ -102,7 +108,9 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if (!is_null($register_action)) {
+							call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						}
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -141,10 +149,11 @@ 
 	function command_extract() {
 		$args = func_get_args();
 		$pot_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
@@ -172,17 +181,20 @@ 
 			$entry = new Translation_Entry($args);
 			fwrite($potf, "\n".PO::export_entry($entry)."\n");
 		}
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 
 	function command_replace() {
 		$args = func_get_args();
 		$mo_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__mo_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = new MO();
@@ -194,7 +206,9 @@ 
 		}
 		foreach($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if ( strlen($source) > 150000 ) {
+				continue;
+			}
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');