ntwb / wordpress

src/wp-includes/class-wp-widget-factory.php

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 	 * @access public
 	 */
 	public function __construct() {
-		add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
+		add_action('widgets_init', array($this, '_register_widgets'), 100);
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 	 * @access public
 	 */
 	public function WP_Widget_Factory() {
-		_deprecated_constructor( 'WP_Widget_Factory', '4.2.0' );
+		_deprecated_constructor('WP_Widget_Factory', '4.2.0');
 		self::__construct();
 	}
 
@@ -71,20 +71,20 @@ 
 	 * @param WP_Widget $widget Widget.
 	 * @return string Object hash.
 	 */
-	private function hash_object( $widget ) {
-		if ( function_exists( 'spl_object_hash' ) ) {
-			return spl_object_hash( $widget );
+	private function hash_object($widget) {
+		if (function_exists('spl_object_hash')) {
+			return spl_object_hash($widget);
 		} else {
-			$class_name = get_class( $widget );
+			$class_name = get_class($widget);
 			$hash = $class_name;
-			if ( ! isset( $widget->_wp_widget_factory_hash_id ) ) {
-				if ( ! isset( $this->hashed_class_counts[ $class_name ] ) ) {
-					$this->hashed_class_counts[ $class_name ] = 0;
+			if ( ! isset($widget->_wp_widget_factory_hash_id)) {
+				if ( ! isset($this->hashed_class_counts[$class_name])) {
+					$this->hashed_class_counts[$class_name] = 0;
 				}
-				$this->hashed_class_counts[ $class_name ] += 1;
-				$widget->_wp_widget_factory_hash_id = $this->hashed_class_counts[ $class_name ];
+				$this->hashed_class_counts[$class_name] += 1;
+				$widget->_wp_widget_factory_hash_id = $this->hashed_class_counts[$class_name];
 			}
-			$hash .= ':' . $widget->_wp_widget_factory_hash_id;
+			$hash .= ':'.$widget->_wp_widget_factory_hash_id;
 			return $hash;
 		}
 	}
@@ -98,11 +98,11 @@ 
 	 *
 	 * @param string|WP_Widget $widget Either the name of a `WP_Widget` subclass or an instance of a `WP_Widget` subclass.
 	 */
-	public function register( $widget ) {
-		if ( $widget instanceof WP_Widget ) {
-			$this->widgets[ $this->hash_object( $widget ) ] = $widget;
+	public function register($widget) {
+		if ($widget instanceof WP_Widget) {
+			$this->widgets[$this->hash_object($widget)] = $widget;
 		} else {
-			$this->widgets[ $widget ] = new $widget();
+			$this->widgets[$widget] = new $widget();
 		}
 	}
 
@@ -115,11 +115,11 @@ 
 	 *
 	 * @param string|WP_Widget $widget Either the name of a `WP_Widget` subclass or an instance of a `WP_Widget` subclass.
 	 */
-	public function unregister( $widget ) {
-		if ( $widget instanceof WP_Widget ) {
-			unset( $this->widgets[ $this->hash_object( $widget ) ] );
+	public function unregister($widget) {
+		if ($widget instanceof WP_Widget) {
+			unset($this->widgets[$this->hash_object($widget)]);
 		} else {
-			unset( $this->widgets[ $widget ] );
+			unset($this->widgets[$widget]);
 		}
 	}
 
@@ -137,9 +137,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;
 			}

src/wp-includes/ms-load.php

Indentation +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	 * @since 3.0.0
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
-	*/
+	 */
 	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check )
 		return true;

Spacing +129 added lines, -129 removed lines

@@ -16,10 +16,10 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
+	if (defined('SUBDOMAIN_INSTALL'))
 		return SUBDOMAIN_INSTALL;
 
-	return ( defined( 'VHOST' ) && VHOST == 'yes' );
+	return (defined('VHOST') && VHOST == 'yes');
 }
 
 /**
@@ -34,20 +34,20 @@ 
  * @return array Files to include.
  */
 function wp_get_active_network_plugins() {
-	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
+	$active_plugins = (array) get_site_option('active_sitewide_plugins', array());
+	if (empty($active_plugins))
 		return array();
 
 	$plugins = array();
-	$active_plugins = array_keys( $active_plugins );
-	sort( $active_plugins );
+	$active_plugins = array_keys($active_plugins);
+	sort($active_plugins);
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -76,42 +76,42 @@ 
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
-	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
+	$check = apply_filters('ms_site_check', null);
+	if (null !== $check)
 		return true;
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
+	if (is_super_admin())
 		return true;
 
 	$blog = get_site();
 
-	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
+	if ('1' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-deleted.php'))
+			return WP_CONTENT_DIR.'/blog-deleted.php';
 		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site is no longer available.'), '', array('response' => 410));
 	}
 
-	if ( '2' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
-			return WP_CONTENT_DIR . '/blog-inactive.php';
+	if ('2' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-inactive.php')) {
+			return WP_CONTENT_DIR.'/blog-inactive.php';
 		} else {
-			$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
+			$admin_email = str_replace('@', ' AT ', get_site_option('admin_email', 'support@'.get_network()->domain));
 			wp_die(
 				/* translators: %s: admin email link */
-				sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
-					sprintf( '<a href="mailto:%s">%s</a>', $admin_email )
+				sprintf(__('This site has not been activated yet. If you are having problems activating your site, please contact %s.'),
+					sprintf('<a href="mailto:%s">%s</a>', $admin_email)
 				)
 			);
 		}
 	}
 
-	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
+	if ($blog->archived == '1' || $blog->spam == '1') {
+		if (file_exists(WP_CONTENT_DIR.'/blog-suspended.php'))
+			return WP_CONTENT_DIR.'/blog-suspended.php';
 		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site has been archived or suspended.'), '', array('response' => 410));
 	}
 
 	return true;
@@ -129,8 +129,8 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return WP_Network|false Network object if successful. False when no network is found.
  */
-function get_network_by_path( $domain, $path, $segments = null ) {
-	return WP_Network::get_by_path( $domain, $path, $segments );
+function get_network_by_path($domain, $path, $segments = null) {
+	return WP_Network::get_by_path($domain, $path, $segments);
 }
 
 /**
@@ -153,8 +153,8 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return WP_Site|false Site object if successful. False when no site is found.
  */
-function get_site_by_path( $domain, $path, $segments = null ) {
-	$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+function get_site_by_path($domain, $path, $segments = null) {
+	$path_segments = array_filter(explode('/', trim($path, '/')));
 
 	/**
 	 * Filters the number of path segments to consider when searching for a site.
@@ -167,17 +167,17 @@ 
 	 * @param string   $domain   The requested domain.
 	 * @param string   $path     The requested path, in full.
 	 */
-	$segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path );
+	$segments = apply_filters('site_by_path_segments_count', $segments, $domain, $path);
 
-	if ( null !== $segments && count( $path_segments ) > $segments ) {
-		$path_segments = array_slice( $path_segments, 0, $segments );
+	if (null !== $segments && count($path_segments) > $segments) {
+		$path_segments = array_slice($path_segments, 0, $segments);
 	}
 
 	$paths = array();
 
-	while ( count( $path_segments ) ) {
-		$paths[] = '/' . implode( '/', $path_segments ) . '/';
-		array_pop( $path_segments );
+	while (count($path_segments)) {
+		$paths[] = '/'.implode('/', $path_segments).'/';
+		array_pop($path_segments);
 	}
 
 	$paths[] = '/';
@@ -201,10 +201,10 @@ 
 	 *                                    Default null, meaning the entire path was to be consulted.
 	 * @param array             $paths    The paths to search for, based on $path and $segments.
 	 */
-	$pre = apply_filters( 'pre_get_site_by_path', null, $domain, $path, $segments, $paths );
-	if ( null !== $pre ) {
-		if ( false !== $pre && ! $pre instanceof WP_Site ) {
-			$pre = new WP_Site( $pre );
+	$pre = apply_filters('pre_get_site_by_path', null, $domain, $path, $segments, $paths);
+	if (null !== $pre) {
+		if (false !== $pre && ! $pre instanceof WP_Site) {
+			$pre = new WP_Site($pre);
 		}
 		return $pre;
 	}
@@ -220,9 +220,9 @@ 
 
 	// Either www or non-www is supported, not both. If a www domain is requested,
 	// query for both to provide the proper redirect.
-	$domains = array( $domain );
-	if ( 'www.' === substr( $domain, 0, 4 ) ) {
-		$domains[] = substr( $domain, 4 );
+	$domains = array($domain);
+	if ('www.' === substr($domain, 0, 4)) {
+		$domains[] = substr($domain, 4);
 	}
 
 	$args = array(
@@ -231,18 +231,18 @@ 
 		'number' => 1,
 	);
 
-	if ( count( $domains ) > 1 ) {
+	if (count($domains) > 1) {
 		$args['orderby']['domain_length'] = 'DESC';
 	}
 
-	if ( count( $paths ) > 1 ) {
+	if (count($paths) > 1) {
 		$args['orderby']['path_length'] = 'DESC';
 	}
 
-	$result = get_sites( $args );
-	$site = array_shift( $result );
+	$result = get_sites($args);
+	$site = array_shift($result);
 
-	if ( $site ) {
+	if ($site) {
 		return $site;
 	}
 
@@ -280,55 +280,55 @@ 
  *                     False if bootstrap could not be properly completed.
  *                     Redirect URL if parts exist, but the request as a whole can not be fulfilled.
  */
-function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
+function ms_load_current_site_and_network($domain, $path, $subdomain = false) {
 	global $wpdb, $current_site, $current_blog;
 
 	// If the network is defined in wp-config.php, we can simply use that.
-	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+	if (defined('DOMAIN_CURRENT_SITE') && defined('PATH_CURRENT_SITE')) {
 		$current_site = new stdClass;
-		$current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+		$current_site->id = defined('SITE_ID_CURRENT_SITE') ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path = PATH_CURRENT_SITE;
-		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+		if (defined('BLOG_ID_CURRENT_SITE')) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
-		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+		} elseif (defined('BLOGID_CURRENT_SITE')) { // deprecated.
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
 		}
 
-		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
-			$current_blog = get_site_by_path( $domain, $path );
-		} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
+		if (0 === strcasecmp($current_site->domain, $domain) && 0 === strcasecmp($current_site->path, $path)) {
+			$current_blog = get_site_by_path($domain, $path);
+		} elseif ('/' !== $current_site->path && 0 === strcasecmp($current_site->domain, $domain) && 0 === stripos($path, $current_site->path)) {
 			// If the current network has a path and also matches the domain and path of the request,
 			// we need to look for a site using the first path segment following the network's path.
-			$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
+			$current_blog = get_site_by_path($domain, $path, 1 + count(explode('/', trim($current_site->path, '/'))));
 		} else {
 			// Otherwise, use the first path segment (as usual).
-			$current_blog = get_site_by_path( $domain, $path, 1 );
+			$current_blog = get_site_by_path($domain, $path, 1);
 		}
 
-	} elseif ( ! $subdomain ) {
+	} elseif ( ! $subdomain) {
 		/*
 		 * A "subdomain" install can be re-interpreted to mean "can support any domain".
 		 * If we're not dealing with one of these installs, then the important part is determining
 		 * the network first, because we need the network's path to identify any sites.
 		 */
-		if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+		if ( ! $current_site = wp_cache_get('current_network', 'site-options')) {
 			// Are there even two networks installed?
-			$one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
-			if ( 1 === $wpdb->num_rows ) {
-				$current_site = new WP_Network( $one_network );
-				wp_cache_add( 'current_network', $current_site, 'site-options' );
-			} elseif ( 0 === $wpdb->num_rows ) {
+			$one_network = $wpdb->get_row("SELECT * FROM $wpdb->site LIMIT 2"); // [sic]
+			if (1 === $wpdb->num_rows) {
+				$current_site = new WP_Network($one_network);
+				wp_cache_add('current_network', $current_site, 'site-options');
+			} elseif (0 === $wpdb->num_rows) {
 				// A network not found hook should fire here.
 				return false;
 			}
 		}
 
-		if ( empty( $current_site ) ) {
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+		if (empty($current_site)) {
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 
-		if ( empty( $current_site ) ) {
+		if (empty($current_site)) {
 			/**
 			 * Fires when a network cannot be found based on the requested domain and path.
 			 *
@@ -340,48 +340,48 @@ 
 			 * @param string $domain       The domain used to search for a network.
 			 * @param string $path         The path used to search for a path.
 			 */
-			do_action( 'ms_network_not_found', $domain, $path );
+			do_action('ms_network_not_found', $domain, $path);
 
 			return false;
-		} elseif ( $path === $current_site->path ) {
-			$current_blog = get_site_by_path( $domain, $path );
+		} elseif ($path === $current_site->path) {
+			$current_blog = get_site_by_path($domain, $path);
 		} else {
 			// Search the network path + one more path segment (on top of the network path).
-			$current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
+			$current_blog = get_site_by_path($domain, $path, substr_count($current_site->path, '/'));
 		}
 	} else {
 		// Find the site by the domain and at most the first path segment.
-		$current_blog = get_site_by_path( $domain, $path, 1 );
-		if ( $current_blog ) {
-			$current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 );
+		$current_blog = get_site_by_path($domain, $path, 1);
+		if ($current_blog) {
+			$current_site = WP_Network::get_instance($current_blog->site_id ? $current_blog->site_id : 1);
 		} else {
 			// If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 	}
 
 	// The network declared by the site trumps any constants.
-	if ( $current_blog && $current_blog->site_id != $current_site->id ) {
-		$current_site = WP_Network::get_instance( $current_blog->site_id );
+	if ($current_blog && $current_blog->site_id != $current_site->id) {
+		$current_site = WP_Network::get_instance($current_blog->site_id);
 	}
 
 	// No network has been found, bail.
-	if ( empty( $current_site ) ) {
+	if (empty($current_site)) {
 		/** This action is documented in wp-includes/ms-settings.php */
-		do_action( 'ms_network_not_found', $domain, $path );
+		do_action('ms_network_not_found', $domain, $path);
 
 		return false;
 	}
 
 	// During activation of a new subdomain, the requested site does not yet exist.
-	if ( empty( $current_blog ) && wp_installing() ) {
+	if (empty($current_blog) && wp_installing()) {
 		$current_blog = new stdClass;
 		$current_blog->blog_id = $blog_id = 1;
 		$current_blog->public = 1;
 	}
 
 	// No site has been found, bail.
-	if ( empty( $current_blog ) ) {
+	if (empty($current_blog)) {
 		// We're going to redirect to the network URL, with some possible modifications.
 		$scheme = is_ssl() ? 'https' : 'http';
 		$destination = "$scheme://{$current_site->domain}{$current_site->path}";
@@ -398,19 +398,19 @@ 
 		 * @param string $domain       The domain used to search for a site.
 		 * @param string $path         The path used to search for a site.
 		 */
-		do_action( 'ms_site_not_found', $current_site, $domain, $path );
+		do_action('ms_site_not_found', $current_site, $domain, $path);
 
-		if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
+		if ($subdomain && ! defined('NOBLOGREDIRECT')) {
 			// For a "subdomain" install, redirect to the signup form specifically.
-			$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
-		} elseif ( $subdomain ) {
+			$destination .= 'wp-signup.php?new='.str_replace('.'.$current_site->domain, '', $domain);
+		} elseif ($subdomain) {
 			// For a "subdomain" install, the NOBLOGREDIRECT constant
 			// can be used to avoid a redirect to the signup form.
 			// Using the ms_site_not_found action is preferred to the constant.
-			if ( '%siteurl%' !== NOBLOGREDIRECT ) {
+			if ('%siteurl%' !== NOBLOGREDIRECT) {
 				$destination = NOBLOGREDIRECT;
 			}
-		} elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
+		} elseif (0 === strcasecmp($current_site->domain, $domain)) {
 			/*
 			 * If the domain we were searching for matches the network's domain,
 			 * it's no use redirecting back to ourselves -- it'll cause a loop.
@@ -423,13 +423,13 @@ 
 	}
 
 	// Figure out the current network's main site.
-	if ( empty( $current_site->blog_id ) ) {
-		if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+	if (empty($current_site->blog_id)) {
+		if ($current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path) {
 			$current_site->blog_id = $current_blog->blog_id;
-		} elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-			$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-				$current_site->domain, $current_site->path ) );
-			wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
+		} elseif ( ! $current_site->blog_id = wp_cache_get('network:'.$current_site->id.':main_site', 'site-options')) {
+			$current_site->blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
+				$current_site->domain, $current_site->path));
+			wp_cache_add('network:'.$current_site->id.':main_site', $current_site->blog_id, 'site-options');
 		}
 	}
 
@@ -450,50 +450,50 @@ 
  * @param string $domain The requested domain for the error to reference.
  * @param string $path   The requested path for the error to reference.
  */
-function ms_not_installed( $domain, $path ) {
+function ms_not_installed($domain, $path) {
 	global $wpdb;
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		dead_db();
 	}
 
 	wp_load_translations_early();
 
-	$title = __( 'Error establishing a database connection' );
+	$title = __('Error establishing a database connection');
 
-	$msg  = '<h1>' . $title . '</h1>';
-	$msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
-	$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
-	if ( ! $wpdb->get_var( $query ) ) {
-		$msg .= '<p>' . sprintf(
+	$msg  = '<h1>'.$title.'</h1>';
+	$msg .= '<p>'.__('If your site does not display, please contact the owner of this network.').'';
+	$msg .= ' '.__('If you are the owner of this network please check that MySQL is running properly and all tables are error free.').'</p>';
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->site));
+	if ( ! $wpdb->get_var($query)) {
+		$msg .= '<p>'.sprintf(
 			/* translators: %s: table name */
-			__( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
-			'<code>' . $wpdb->site . '</code>'
-		) . '</p>';
+			__('<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.'),
+			'<code>'.$wpdb->site.'</code>'
+		).'</p>';
 	} else {
-		$msg .= '<p>' . sprintf(
+		$msg .= '<p>'.sprintf(
 			/* translators: 1: site url, 2: table name, 3: database name */
-			__( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
-			'<code>' . rtrim( $domain . $path, '/' ) . '</code>',
-			'<code>' . $wpdb->blogs . '</code>',
-			'<code>' . DB_NAME . '</code>'
-		) . '</p>';
+			__('<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?'),
+			'<code>'.rtrim($domain.$path, '/').'</code>',
+			'<code>'.$wpdb->blogs.'</code>',
+			'<code>'.DB_NAME.'</code>'
+		).'</p>';
 	}
-	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
+	$msg .= '<p><strong>'.__('What do I do now?').'</strong> ';
 	/* translators: %s: Codex URL */
-	$msg .= sprintf( __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
-		__( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' )
+	$msg .= sprintf(__('Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'),
+		__('https://codex.wordpress.org/Debugging_a_WordPress_Network')
 	);
-	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
-	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
+	$msg .= ' '.__('If you&#8217;re still stuck with this message, then check that your database contains the following tables:').'</p><ul>';
+	foreach ($wpdb->tables('global') as $t => $table) {
+		if ('sitecategories' == $t)
 			continue;
-		$msg .= '<li>' . $table . '</li>';
+		$msg .= '<li>'.$table.'</li>';
 	}
 	$msg .= '</ul>';
 
-	wp_die( $msg, $title, array( 'response' => 500 ) );
+	wp_die($msg, $title, array('response' => 500));
 }
 
 /**
@@ -509,8 +509,8 @@ 
  * @param object $current_site
  * @return object
  */
-function get_current_site_name( $current_site ) {
-	_deprecated_function( __FUNCTION__, '3.9.0', 'get_current_site()' );
+function get_current_site_name($current_site) {
+	_deprecated_function(__FUNCTION__, '3.9.0', 'get_current_site()');
 	return $current_site;
 }
 
@@ -530,7 +530,7 @@ 
  */
 function wpmu_current_site() {
 	global $current_site;
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+	_deprecated_function(__FUNCTION__, '3.9.0');
 	return $current_site;
 }
 
@@ -546,11 +546,11 @@ 
  * @param object|int $network The network's database row or ID.
  * @return WP_Network|false Object containing network information if found, false if not.
  */
-function wp_get_network( $network ) {
-	_deprecated_function( __FUNCTION__, '4.7.0', 'get_network()' );
+function wp_get_network($network) {
+	_deprecated_function(__FUNCTION__, '4.7.0', 'get_network()');
 
-	$network = get_network( $network );
-	if ( null === $network ) {
+	$network = get_network($network);
+	if (null === $network) {
 		return false;
 	}
 

Doc Comments +1 added lines, -1 removed lines

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

Braces +28 added lines, -20 removed lines

@@ -16,8 +16,9 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
-		return SUBDOMAIN_INSTALL;
+	if ( defined('SUBDOMAIN_INSTALL') ) {
+			return SUBDOMAIN_INSTALL;
+	}
 
 	return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
@@ -35,8 +36,9 @@ 
  */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
-		return array();
+	if ( empty( $active_plugins ) ) {
+			return array();
+	}
 
 	$plugins = array();
 	$active_plugins = array_keys( $active_plugins );
@@ -46,8 +48,9 @@ 
 		if ( ! validate_file( $plugin ) // $plugin must validate as file
 			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -77,20 +80,23 @@ 
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
 	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
-		return true;
+	if ( null !== $check ) {
+			return true;
+	}
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
-		return true;
+	if ( is_super_admin() ) {
+			return true;
+	}
 
 	$blog = get_site();
 
 	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
-		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-deleted.php';
+		} else {
+					wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	if ( '2' == $blog->deleted ) {
@@ -108,10 +114,11 @@ 
 	}
 
 	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
-		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-suspended.php';
+		} else {
+					wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	return true;
@@ -487,8 +494,9 @@ 
 	);
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
-			continue;
+		if ( 'sitecategories' == $t ) {
+					continue;
+		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';

src/wp-includes/class-requests.php

Braces +11 added lines, -22 removed lines

@@ -370,8 +370,7 @@ 
 			if (is_string($options['transport'])) {
 				$transport = new $transport();
 			}
-		}
-		else {
+		} else {
 			$need_ssl = (0 === stripos($url, 'https://'));
 			$capabilities = array('ssl' => $need_ssl);
 			$transport = self::get_transport($capabilities);
@@ -447,8 +446,7 @@ 
 			if (!isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
-			}
-			else {
+			} else {
 				if (empty($request['options']['type'])) {
 					$request['options']['type'] = $request['type'];
 				}
@@ -473,8 +471,7 @@ 
 			if (is_string($options['transport'])) {
 				$transport = new $transport();
 			}
-		}
-		else {
+		} else {
 			$transport = self::get_transport();
 		}
 		$responses = $transport->request_multiple($requests, $options);
@@ -584,8 +581,7 @@ 
 
 		if (is_array($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
-		}
-		elseif (empty($options['cookies'])) {
+		} elseif (empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
 		if ($options['cookies'] !== false) {
@@ -604,8 +600,7 @@ 
 		if (!isset($options['data_format'])) {
 			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
-			}
-			else {
+			} else {
 				$options['data_format'] = 'body';
 			}
 		}
@@ -642,8 +637,7 @@ 
 
 			$headers = substr($return->raw, 0, $pos);
 			$return->body = substr($return->raw, $pos + strlen("\n\r\n\r"));
-		}
-		else {
+		} else {
 			$return->body = '';
 		}
 		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
@@ -706,8 +700,7 @@ 
 				$redirected = self::request($location, $req_headers, $req_data, $options['type'], $options);
 				$redirected->history[] = $return;
 				return $redirected;
-			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			} elseif ($options['redirected'] >= $options['redirects']) {
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -735,8 +728,7 @@ 
 			$data = $request['data'];
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
-		}
-		catch (Requests_Exception $e) {
+		} catch (Requests_Exception $e) {
 			$response = $e;
 		}
 	}
@@ -826,14 +818,11 @@ 
 
 		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
 			return $decoded;
-		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		} elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
 			return $decoded;
-		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		} elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
 			return $decoded;
-		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		} elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
 			return $decoded;
 		}
 

Spacing +23 added lines, -23 removed lines

@@ -142,8 +142,8 @@ 
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once(dirname(__FILE__) . '/' . $file . '.php');
+		if (file_exists(dirname(__FILE__).'/'.$file.'.php')) {
+			require_once(dirname(__FILE__).'/'.$file.'.php');
 		}
 	}
 
@@ -200,7 +200,7 @@ 
 
 		// Find us a working transport
 		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+			if ( ! class_exists($class)) {
 				continue;
 			}
 
@@ -364,7 +364,7 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if ( ! empty($options['transport'])) {
 			$transport = $options['transport'];
 
 			if (is_string($options['transport'])) {
@@ -427,24 +427,24 @@ 
 	public static function request_multiple($requests, $options = array()) {
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if ( ! empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if ( ! empty($options['complete'])) {
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
 		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+			if ( ! isset($request['headers'])) {
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if ( ! isset($request['data'])) {
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if ( ! isset($request['type'])) {
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if ( ! isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
@@ -460,14 +460,14 @@ 
 			// Ensure we only hook in once
 			if ($request['options']['hooks'] !== $options['hooks']) {
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if ( ! empty($request['options']['complete'])) {
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if ( ! empty($options['transport'])) {
 			$transport = $options['transport'];
 
 			if (is_string($options['transport'])) {
@@ -503,7 +503,7 @@ 
 		$defaults = array(
 			'timeout' => 10,
 			'connect_timeout' => 10,
-			'useragent' => 'php-requests/' . self::VERSION,
+			'useragent' => 'php-requests/'.self::VERSION,
 			'protocol_version' => 1.1,
 			'redirected' => 0,
 			'redirects' => 10,
@@ -533,11 +533,11 @@ 
 	 * @return string Default certificate path.
 	 */
 	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+		if ( ! empty(Requests::$certificate_path)) {
 			return Requests::$certificate_path;
 		}
 
-		return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
+		return dirname(__FILE__).'/Requests/Transport/cacert.pem';
 	}
 
 	/**
@@ -545,7 +545,7 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path($path) {
 		Requests::$certificate_path = $path;
 	}
 
@@ -560,7 +560,7 @@ 
 	 * @return array $options
 	 */
 	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+		if ( ! preg_match('/^http(s)?:\/\//i', $url, $matches)) {
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
@@ -601,7 +601,7 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
+		if ( ! isset($options['data_format'])) {
 			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
 			}
@@ -627,14 +627,14 @@ 
 	 */
 	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if ( ! $options['blocking']) {
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
+		if ( ! $options['filename']) {
 			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
@@ -749,7 +749,7 @@ 
 	 * @return string Decoded body
 	 */
 	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+		if ( ! preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
 			return $data;
 		}
 
@@ -760,7 +760,7 @@ 
 
 		while (true) {
 			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+			if ( ! $is_chunked) {
 				// Looks like it's not chunked after all
 				return $data;
 			}
@@ -929,7 +929,7 @@ 
 			// between a compressed document, and a ZIP file
 			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if ( ! $zip_compressed_on_the_fly) {
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}

src/wp-includes/l10n.php

Braces +36 added lines, -23 removed lines

@@ -489,14 +489,16 @@ 
  * @return string Either $single or $plural translated text.
  */
 function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
-	if ( $nooped_plural['domain'] )
-		$domain = $nooped_plural['domain'];
+	if ( $nooped_plural['domain'] ) {
+			$domain = $nooped_plural['domain'];
+	}
 
-	if ( $nooped_plural['context'] )
-		return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
-	else
-		return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
-}
+	if ( $nooped_plural['context'] ) {
+			return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
+	} else {
+			return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
+	}
+	}
 
 /**
  * Load a .mo file into the text domain $domain.
@@ -558,13 +560,18 @@ 
 	 */
 	$mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
 
-	if ( !is_readable( $mofile ) ) return false;
+	if ( !is_readable( $mofile ) ) {
+		return false;
+	}
 
 	$mo = new MO();
-	if ( !$mo->import_from_file( $mofile ) ) return false;
+	if ( !$mo->import_from_file( $mofile ) ) {
+		return false;
+	}
 
-	if ( isset( $l10n[$domain] ) )
-		$mo->merge_with( $l10n[$domain] );
+	if ( isset( $l10n[$domain] ) ) {
+			$mo->merge_with( $l10n[$domain] );
+	}
 
 	unset( $l10n_unloaded[ $domain ] );
 
@@ -657,8 +664,9 @@ 
 		load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
 	}
 
-	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
-		load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) {
+			load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+	}
 
 	return $return;
 }
@@ -793,8 +801,9 @@ 
  * @return bool True when the theme textdomain is successfully loaded, false otherwise.
  */
 function load_child_theme_textdomain( $domain, $path = false ) {
-	if ( ! $path )
-		$path = get_stylesheet_directory();
+	if ( ! $path ) {
+			$path = get_stylesheet_directory();
+	}
 	return load_theme_textdomain( $domain, $path );
 }
 
@@ -957,20 +966,24 @@ 
  * @return array Array of language data.
  */
 function wp_get_installed_translations( $type ) {
-	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
-		return array();
+	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' ) {
+			return array();
+	}
 
 	$dir = 'core' === $type ? '' : "/$type";
 
-	if ( ! is_dir( WP_LANG_DIR ) )
-		return array();
+	if ( ! is_dir( WP_LANG_DIR ) ) {
+			return array();
+	}
 
-	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
-		return array();
+	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) ) {
+			return array();
+	}
 
 	$files = scandir( WP_LANG_DIR . $dir );
-	if ( ! $files )
-		return array();
+	if ( ! $files ) {
+			return array();
+	}
 
 	$language_data = array();
 

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
  *
  * @since 4.7.0
  *
- * @param int|WP_User $user_id User's ID or a WP_User object. Defaults to current user.
+ * @param integer $user_id User's ID or a WP_User object. Defaults to current user.
  * @return string The locale of the user.
  */
 function get_user_locale( $user_id = 0 ) {

Spacing +214 added lines, -214 removed lines

@@ -30,7 +30,7 @@ 
 function get_locale() {
 	global $locale, $wp_local_package;
 
-	if ( isset( $locale ) ) {
+	if (isset($locale)) {
 		/**
 		 * Filters WordPress install's locale ID.
 		 *
@@ -38,41 +38,41 @@ 
 		 *
 		 * @param string $locale The locale ID.
 		 */
-		return apply_filters( 'locale', $locale );
+		return apply_filters('locale', $locale);
 	}
 
-	if ( isset( $wp_local_package ) ) {
+	if (isset($wp_local_package)) {
 		$locale = $wp_local_package;
 	}
 
 	// WPLANG was defined in wp-config.
-	if ( defined( 'WPLANG' ) ) {
+	if (defined('WPLANG')) {
 		$locale = WPLANG;
 	}
 
 	// If multisite, check options.
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// Don't check blog option when installing.
-		if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
-			$ms_locale = get_site_option( 'WPLANG' );
+		if (wp_installing() || (false === $ms_locale = get_option('WPLANG'))) {
+			$ms_locale = get_site_option('WPLANG');
 		}
 
-		if ( $ms_locale !== false ) {
+		if ($ms_locale !== false) {
 			$locale = $ms_locale;
 		}
 	} else {
-		$db_locale = get_option( 'WPLANG' );
-		if ( $db_locale !== false ) {
+		$db_locale = get_option('WPLANG');
+		if ($db_locale !== false) {
 			$locale = $db_locale;
 		}
 	}
 
-	if ( empty( $locale ) ) {
+	if (empty($locale)) {
 		$locale = 'en_US';
 	}
 
 	/** This filter is documented in wp-includes/l10n.php */
-	return apply_filters( 'locale', $locale );
+	return apply_filters('locale', $locale);
 }
 
 /**
@@ -86,17 +86,17 @@ 
  * @param int|WP_User $user_id User's ID or a WP_User object. Defaults to current user.
  * @return string The locale of the user.
  */
-function get_user_locale( $user_id = 0 ) {
+function get_user_locale($user_id = 0) {
 	$user = false;
-	if ( 0 === $user_id && function_exists( 'wp_get_current_user' ) ) {
+	if (0 === $user_id && function_exists('wp_get_current_user')) {
 		$user = wp_get_current_user();
-	} elseif ( $user_id instanceof WP_User ) {
+	} elseif ($user_id instanceof WP_User) {
 		$user = $user_id;
-	} elseif ( $user_id && is_numeric( $user_id ) ) {
-		$user = get_user_by( 'id', $user_id );
+	} elseif ($user_id && is_numeric($user_id)) {
+		$user = get_user_by('id', $user_id);
 	}
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		return get_locale();
 	}
 
@@ -118,9 +118,9 @@ 
  *                       Default 'default'.
  * @return string Translated text
  */
-function translate( $text, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translation  = $translations->translate( $text );
+function translate($text, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translation  = $translations->translate($text);
 
 	/**
 	 * Filters text with its translation.
@@ -131,7 +131,7 @@ 
 	 * @param string $text         Text to translate.
 	 * @param string $domain       Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'gettext', $translation, $text, $domain );
+	return apply_filters('gettext', $translation, $text, $domain);
 }
 
 /**
@@ -145,12 +145,12 @@ 
  * @param string $string A pipe-delimited string.
  * @return string Either $string or everything before the last pipe.
  */
-function before_last_bar( $string ) {
-	$last_bar = strrpos( $string, '|' );
-	if ( false === $last_bar ) {
+function before_last_bar($string) {
+	$last_bar = strrpos($string, '|');
+	if (false === $last_bar) {
 		return $string;
 	} else {
-		return substr( $string, 0, $last_bar );
+		return substr($string, 0, $last_bar);
 	}
 }
 
@@ -170,9 +170,9 @@ 
  *                        Default 'default'.
  * @return string Translated text on success, original text on failure.
  */
-function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translation  = $translations->translate( $text, $context );
+function translate_with_gettext_context($text, $context, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translation  = $translations->translate($text, $context);
 	/**
 	 * Filters text with its translation based on context information.
 	 *
@@ -183,7 +183,7 @@ 
 	 * @param string $context      Context information for the translators.
 	 * @param string $domain       Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'gettext_with_context', $translation, $text, $context, $domain );
+	return apply_filters('gettext_with_context', $translation, $text, $context, $domain);
 }
 
 /**
@@ -198,8 +198,8 @@ 
  *                       Default 'default'.
  * @return string Translated text.
  */
-function __( $text, $domain = 'default' ) {
-	return translate( $text, $domain );
+function __($text, $domain = 'default') {
+	return translate($text, $domain);
 }
 
 /**
@@ -214,8 +214,8 @@ 
  *                       Default 'default'.
  * @return string Translated text on success, original text on failure.
  */
-function esc_attr__( $text, $domain = 'default' ) {
-	return esc_attr( translate( $text, $domain ) );
+function esc_attr__($text, $domain = 'default') {
+	return esc_attr(translate($text, $domain));
 }
 
 /**
@@ -230,8 +230,8 @@ 
  *                       Default 'default'.
  * @return string Translated text
  */
-function esc_html__( $text, $domain = 'default' ) {
-	return esc_html( translate( $text, $domain ) );
+function esc_html__($text, $domain = 'default') {
+	return esc_html(translate($text, $domain));
 }
 
 /**
@@ -243,8 +243,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function _e( $text, $domain = 'default' ) {
-	echo translate( $text, $domain );
+function _e($text, $domain = 'default') {
+	echo translate($text, $domain);
 }
 
 /**
@@ -256,8 +256,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function esc_attr_e( $text, $domain = 'default' ) {
-	echo esc_attr( translate( $text, $domain ) );
+function esc_attr_e($text, $domain = 'default') {
+	echo esc_attr(translate($text, $domain));
 }
 
 /**
@@ -269,8 +269,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function esc_html_e( $text, $domain = 'default' ) {
-	echo esc_html( translate( $text, $domain ) );
+function esc_html_e($text, $domain = 'default') {
+	echo esc_html(translate($text, $domain));
 }
 
 /**
@@ -290,8 +290,8 @@ 
  *                        Default 'default'.
  * @return string Translated context string without pipe.
  */
-function _x( $text, $context, $domain = 'default' ) {
-	return translate_with_gettext_context( $text, $context, $domain );
+function _x($text, $context, $domain = 'default') {
+	return translate_with_gettext_context($text, $context, $domain);
 }
 
 /**
@@ -305,8 +305,8 @@ 
  *                        Default 'default'.
  * @return string Translated context string without pipe.
  */
-function _ex( $text, $context, $domain = 'default' ) {
-	echo _x( $text, $context, $domain );
+function _ex($text, $context, $domain = 'default') {
+	echo _x($text, $context, $domain);
 }
 
 /**
@@ -320,8 +320,8 @@ 
  *                        Default 'default'.
  * @return string Translated text
  */
-function esc_attr_x( $text, $context, $domain = 'default' ) {
-	return esc_attr( translate_with_gettext_context( $text, $context, $domain ) );
+function esc_attr_x($text, $context, $domain = 'default') {
+	return esc_attr(translate_with_gettext_context($text, $context, $domain));
 }
 
 /**
@@ -335,8 +335,8 @@ 
  *                        Default 'default'.
  * @return string Translated text.
  */
-function esc_html_x( $text, $context, $domain = 'default' ) {
-	return esc_html( translate_with_gettext_context( $text, $context, $domain ) );
+function esc_html_x($text, $context, $domain = 'default') {
+	return esc_html(translate_with_gettext_context($text, $context, $domain));
 }
 
 /**
@@ -358,9 +358,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _n( $single, $plural, $number, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translation  = $translations->translate_plural( $single, $plural, $number );
+function _n($single, $plural, $number, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translation  = $translations->translate_plural($single, $plural, $number);
 
 	/**
 	 * Filters the singular or plural form of a string.
@@ -373,7 +373,7 @@ 
 	 * @param string $number      The number to compare against to use either the singular or plural form.
 	 * @param string $domain      Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
+	return apply_filters('ngettext', $translation, $single, $plural, $number, $domain);
 }
 
 /**
@@ -400,8 +400,8 @@ 
  * @return string The translated singular or plural form.
  */
 function _nx($single, $plural, $number, $context, $domain = 'default') {
-	$translations = get_translations_for_domain( $domain );
-	$translation  = $translations->translate_plural( $single, $plural, $number, $context );
+	$translations = get_translations_for_domain($domain);
+	$translation  = $translations->translate_plural($single, $plural, $number, $context);
 
 	/**
 	 * Filters the singular or plural form of a string with gettext context.
@@ -415,7 +415,7 @@ 
 	 * @param string $context     Context information for the translators.
 	 * @param string $domain      Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'ngettext_with_context', $translation, $single, $plural, $number, $context, $domain );
+	return apply_filters('ngettext_with_context', $translation, $single, $plural, $number, $context, $domain);
 }
 
 /**
@@ -447,8 +447,8 @@ 
  *     @type string $domain   Text domain.
  * }
  */
-function _n_noop( $singular, $plural, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain );
+function _n_noop($singular, $plural, $domain = null) {
+	return array(0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain);
 }
 
 /**
@@ -486,8 +486,8 @@ 
  *     @type string $domain   Text domain.
  * }
  */
-function _nx_noop( $singular, $plural, $context, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain );
+function _nx_noop($singular, $plural, $context, $domain = null) {
+	return array(0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain);
 }
 
 /**
@@ -510,14 +510,14 @@ 
  *                              a text domain passed to _n_noop() or _nx_noop(), it will override this value. Default 'default'.
  * @return string Either $single or $plural translated text.
  */
-function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
-	if ( $nooped_plural['domain'] )
+function translate_nooped_plural($nooped_plural, $count, $domain = 'default') {
+	if ($nooped_plural['domain'])
 		$domain = $nooped_plural['domain'];
 
-	if ( $nooped_plural['context'] )
-		return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
+	if ($nooped_plural['context'])
+		return _nx($nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain);
 	else
-		return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
+		return _n($nooped_plural['singular'], $nooped_plural['plural'], $count, $domain);
 }
 
 /**
@@ -538,7 +538,7 @@ 
  * @param string $mofile Path to the .mo file.
  * @return bool True on success, false on failure.
  */
-function load_textdomain( $domain, $mofile ) {
+function load_textdomain($domain, $mofile) {
 	global $l10n, $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
@@ -552,10 +552,10 @@ 
 	 * @param string $domain   Text domain. Unique identifier for retrieving translated strings.
 	 * @param string $mofile   Path to the MO file.
 	 */
-	$plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
+	$plugin_override = apply_filters('override_load_textdomain', false, $domain, $mofile);
 
-	if ( true == $plugin_override ) {
-		unset( $l10n_unloaded[ $domain ] );
+	if (true == $plugin_override) {
+		unset($l10n_unloaded[$domain]);
 
 		return true;
 	}
@@ -568,7 +568,7 @@ 
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 * @param string $mofile Path to the .mo file.
 	 */
-	do_action( 'load_textdomain', $domain, $mofile );
+	do_action('load_textdomain', $domain, $mofile);
 
 	/**
 	 * Filters MO file path for loading translations for a specific text domain.
@@ -578,17 +578,17 @@ 
 	 * @param string $mofile Path to the MO file.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
+	$mofile = apply_filters('load_textdomain_mofile', $mofile, $domain);
 
-	if ( !is_readable( $mofile ) ) return false;
+	if ( ! is_readable($mofile)) return false;
 
 	$mo = new MO();
-	if ( !$mo->import_from_file( $mofile ) ) return false;
+	if ( ! $mo->import_from_file($mofile)) return false;
 
-	if ( isset( $l10n[$domain] ) )
-		$mo->merge_with( $l10n[$domain] );
+	if (isset($l10n[$domain]))
+		$mo->merge_with($l10n[$domain]);
 
-	unset( $l10n_unloaded[ $domain ] );
+	unset($l10n_unloaded[$domain]);
 
 	$l10n[$domain] = &$mo;
 
@@ -606,7 +606,7 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool Whether textdomain was unloaded.
  */
-function unload_textdomain( $domain ) {
+function unload_textdomain($domain) {
 	global $l10n, $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
@@ -619,10 +619,10 @@ 
 	 * @param bool   $override Whether to override the text domain unloading. Default false.
 	 * @param string $domain   Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$plugin_override = apply_filters( 'override_unload_textdomain', false, $domain );
+	$plugin_override = apply_filters('override_unload_textdomain', false, $domain);
 
-	if ( $plugin_override ) {
-		$l10n_unloaded[ $domain ] = true;
+	if ($plugin_override) {
+		$l10n_unloaded[$domain] = true;
 
 		return true;
 	}
@@ -634,12 +634,12 @@ 
 	 *
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	do_action( 'unload_textdomain', $domain );
+	do_action('unload_textdomain', $domain);
 
-	if ( isset( $l10n[$domain] ) ) {
-		unset( $l10n[$domain] );
+	if (isset($l10n[$domain])) {
+		unset($l10n[$domain]);
 
-		$l10n_unloaded[ $domain ] = true;
+		$l10n_unloaded[$domain] = true;
 
 		return true;
 	}
@@ -660,27 +660,27 @@ 
  * @param string $locale Optional. Locale to load. Default is the value of get_locale().
  * @return bool Whether the textdomain was loaded.
  */
-function load_default_textdomain( $locale = null ) {
-	if ( null === $locale ) {
+function load_default_textdomain($locale = null) {
+	if (null === $locale) {
 		$locale = is_admin() ? get_user_locale() : get_locale();
 	}
 
 	// Unload previously loaded strings so we can switch translations.
-	unload_textdomain( 'default' );
+	unload_textdomain('default');
 
-	$return = load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
+	$return = load_textdomain('default', WP_LANG_DIR."/$locale.mo");
 
-	if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists(  WP_LANG_DIR . "/admin-$locale.mo" ) ) {
-		load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
+	if ((is_multisite() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK)) && ! file_exists(WP_LANG_DIR."/admin-$locale.mo")) {
+		load_textdomain('default', WP_LANG_DIR."/ms-$locale.mo");
 		return $return;
 	}
 
-	if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
-		load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+	if (is_admin() || wp_installing() || (defined('WP_REPAIRING') && WP_REPAIRING)) {
+		load_textdomain('default', WP_LANG_DIR."/admin-$locale.mo");
 	}
 
-	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
-		load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+	if (is_network_admin() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK))
+		load_textdomain('default', WP_LANG_DIR."/admin-network-$locale.mo");
 
 	return $return;
 }
@@ -701,7 +701,7 @@ 
  *                                Default false.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) {
+function load_plugin_textdomain($domain, $deprecated = false, $plugin_rel_path = false) {
 	/**
 	 * Filters a plugin's locale.
 	 *
@@ -710,25 +710,25 @@ 
 	 * @param string $locale The plugin's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
+	$locale = apply_filters('plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/plugins/'.$mofile)) {
 		return true;
 	}
 
-	if ( false !== $plugin_rel_path ) {
-		$path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
-	} elseif ( false !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '2.7.0' );
-		$path = ABSPATH . trim( $deprecated, '/' );
+	if (false !== $plugin_rel_path) {
+		$path = WP_PLUGIN_DIR.'/'.trim($plugin_rel_path, '/');
+	} elseif (false !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '2.7.0');
+		$path = ABSPATH.trim($deprecated, '/');
 	} else {
 		$path = WP_PLUGIN_DIR;
 	}
 
-	return load_textdomain( $domain, $path . '/' . $mofile );
+	return load_textdomain($domain, $path.'/'.$mofile);
 }
 
 /**
@@ -742,20 +742,20 @@ 
  *                                   file resides. Default empty string.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
+function load_muplugin_textdomain($domain, $mu_plugin_rel_path = '') {
 	/** This filter is documented in wp-includes/l10n.php */
-	$locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
+	$locale = apply_filters('plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/plugins/'.$mofile)) {
 		return true;
 	}
 
-	$path = WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' );
+	$path = WPMU_PLUGIN_DIR.'/'.ltrim($mu_plugin_rel_path, '/');
 
-	return load_textdomain( $domain, $path . '/' . $mofile );
+	return load_textdomain($domain, $path.'/'.$mofile);
 }
 
 /**
@@ -774,7 +774,7 @@ 
  *                       Default false.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_theme_textdomain( $domain, $path = false ) {
+function load_theme_textdomain($domain, $path = false) {
 	/**
 	 * Filters a theme's locale.
 	 *
@@ -783,20 +783,20 @@ 
 	 * @param string $locale The theme's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'theme_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
+	$locale = apply_filters('theme_locale', is_admin() ? get_user_locale() : get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/themes/'.$mofile)) {
 		return true;
 	}
 
-	if ( ! $path ) {
+	if ( ! $path) {
 		$path = get_template_directory();
 	}
 
-	return load_textdomain( $domain, $path . '/' . $locale . '.mo' );
+	return load_textdomain($domain, $path.'/'.$locale.'.mo');
 }
 
 /**
@@ -814,10 +814,10 @@ 
  *                       Default false.
  * @return bool True when the theme textdomain is successfully loaded, false otherwise.
  */
-function load_child_theme_textdomain( $domain, $path = false ) {
-	if ( ! $path )
+function load_child_theme_textdomain($domain, $path = false) {
+	if ( ! $path)
 		$path = get_stylesheet_directory();
-	return load_theme_textdomain( $domain, $path );
+	return load_theme_textdomain($domain, $path);
 }
 
 /**
@@ -836,22 +836,22 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool True when the textdomain is successfully loaded, false otherwise.
  */
-function _load_textdomain_just_in_time( $domain ) {
+function _load_textdomain_just_in_time($domain) {
 	global $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
 
 	// Short-circuit if domain is 'default' which is reserved for core.
-	if ( 'default' === $domain || isset( $l10n_unloaded[ $domain ] ) ) {
+	if ('default' === $domain || isset($l10n_unloaded[$domain])) {
 		return false;
 	}
 
-	$translation_path = _get_path_to_translation( $domain );
-	if ( false === $translation_path ) {
+	$translation_path = _get_path_to_translation($domain);
+	if (false === $translation_path) {
 		return false;
 	}
 
-	return load_textdomain( $domain, $translation_path );
+	return load_textdomain($domain, $translation_path);
 }
 
 /**
@@ -868,18 +868,18 @@ 
  * @param bool   $reset  Whether to reset the internal cache. Used by the switch to locale functionality.
  * @return string|false The path to the translation file or false if no translation file was found.
  */
-function _get_path_to_translation( $domain, $reset = false ) {
+function _get_path_to_translation($domain, $reset = false) {
 	static $available_translations = array();
 
-	if ( true === $reset ) {
+	if (true === $reset) {
 		$available_translations = array();
 	}
 
-	if ( ! isset( $available_translations[ $domain ] ) ) {
-		$available_translations[ $domain ] = _get_path_to_translation_from_lang_dir( $domain );
+	if ( ! isset($available_translations[$domain])) {
+		$available_translations[$domain] = _get_path_to_translation_from_lang_dir($domain);
 	}
 
-	return $available_translations[ $domain ];
+	return $available_translations[$domain];
 }
 
 /**
@@ -895,21 +895,21 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return string|false The path to the translation file or false if no translation file was found.
  */
-function _get_path_to_translation_from_lang_dir( $domain ) {
+function _get_path_to_translation_from_lang_dir($domain) {
 	static $cached_mofiles = null;
 
-	if ( null === $cached_mofiles ) {
+	if (null === $cached_mofiles) {
 		$cached_mofiles = array();
 
 		$locations = array(
-			WP_LANG_DIR . '/plugins',
-			WP_LANG_DIR . '/themes',
+			WP_LANG_DIR.'/plugins',
+			WP_LANG_DIR.'/themes',
 		);
 
-		foreach ( $locations as $location ) {
-			$mofiles = glob( $location . '/*.mo' );
-			if ( $mofiles ) {
-				$cached_mofiles = array_merge( $cached_mofiles, $mofiles );
+		foreach ($locations as $location) {
+			$mofiles = glob($location.'/*.mo');
+			if ($mofiles) {
+				$cached_mofiles = array_merge($cached_mofiles, $mofiles);
 			}
 		}
 	}
@@ -917,13 +917,13 @@ 
 	$locale = is_admin() ? get_user_locale() : get_locale();
 	$mofile = "{$domain}-{$locale}.mo";
 
-	$path = WP_LANG_DIR . '/plugins/' . $mofile;
-	if ( in_array( $path, $cached_mofiles ) ) {
+	$path = WP_LANG_DIR.'/plugins/'.$mofile;
+	if (in_array($path, $cached_mofiles)) {
 		return $path;
 	}
 
-	$path = WP_LANG_DIR . '/themes/' . $mofile;
-	if ( in_array( $path, $cached_mofiles ) ) {
+	$path = WP_LANG_DIR.'/themes/'.$mofile;
+	if (in_array($path, $cached_mofiles)) {
 		return $path;
 	}
 
@@ -942,14 +942,14 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return Translations|NOOP_Translations A Translations instance.
  */
-function get_translations_for_domain( $domain ) {
+function get_translations_for_domain($domain) {
 	global $l10n;
-	if ( isset( $l10n[ $domain ] ) || ( _load_textdomain_just_in_time( $domain ) && isset( $l10n[ $domain ] ) ) ) {
-		return $l10n[ $domain ];
+	if (isset($l10n[$domain]) || (_load_textdomain_just_in_time($domain) && isset($l10n[$domain]))) {
+		return $l10n[$domain];
 	}
 
 	static $noop_translations = null;
-	if ( null === $noop_translations ) {
+	if (null === $noop_translations) {
 		$noop_translations = new NOOP_Translations;
 	}
 
@@ -966,9 +966,9 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool Whether there are translations.
  */
-function is_textdomain_loaded( $domain ) {
+function is_textdomain_loaded($domain) {
 	global $l10n;
-	return isset( $l10n[ $domain ] );
+	return isset($l10n[$domain]);
 }
 
 /**
@@ -988,8 +988,8 @@ 
  * @param string $name The role name.
  * @return string Translated role name on success, original name on failure.
  */
-function translate_user_role( $name ) {
-	return translate_with_gettext_context( before_last_bar($name), 'User role' );
+function translate_user_role($name) {
+	return translate_with_gettext_context(before_last_bar($name), 'User role');
 }
 
 /**
@@ -1004,15 +1004,15 @@ 
  *                    Default WP_LANG_DIR.
  * @return array An array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
  */
-function get_available_languages( $dir = null ) {
+function get_available_languages($dir = null) {
 	$languages = array();
 
-	$lang_files = glob( ( is_null( $dir ) ? WP_LANG_DIR : $dir ) . '/*.mo' );
-	if ( $lang_files ) {
-		foreach ( $lang_files as $lang_file ) {
-			$lang_file = basename( $lang_file, '.mo' );
-			if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
-				0 !== strpos( $lang_file, 'admin-' ) ) {
+	$lang_files = glob((is_null($dir) ? WP_LANG_DIR : $dir).'/*.mo');
+	if ($lang_files) {
+		foreach ($lang_files as $lang_file) {
+			$lang_file = basename($lang_file, '.mo');
+			if (0 !== strpos($lang_file, 'continents-cities') && 0 !== strpos($lang_file, 'ms-') &&
+				0 !== strpos($lang_file, 'admin-')) {
 				$languages[] = $lang_file;
 			}
 		}
@@ -1026,7 +1026,7 @@ 
 	 * @param array  $languages An array of available language codes.
 	 * @param string $dir       The directory where the language files were found.
 	 */
-	return apply_filters( 'get_available_languages', $languages, $dir );
+	return apply_filters('get_available_languages', $languages, $dir);
 }
 
 /**
@@ -1040,43 +1040,43 @@ 
  * @param string $type What to search for. Accepts 'plugins', 'themes', 'core'.
  * @return array Array of language data.
  */
-function wp_get_installed_translations( $type ) {
-	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
+function wp_get_installed_translations($type) {
+	if ($type !== 'themes' && $type !== 'plugins' && $type !== 'core')
 		return array();
 
 	$dir = 'core' === $type ? '' : "/$type";
 
-	if ( ! is_dir( WP_LANG_DIR ) )
+	if ( ! is_dir(WP_LANG_DIR))
 		return array();
 
-	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
+	if ($dir && ! is_dir(WP_LANG_DIR.$dir))
 		return array();
 
-	$files = scandir( WP_LANG_DIR . $dir );
-	if ( ! $files )
+	$files = scandir(WP_LANG_DIR.$dir);
+	if ( ! $files)
 		return array();
 
 	$language_data = array();
 
-	foreach ( $files as $file ) {
-		if ( '.' === $file[0] || is_dir( WP_LANG_DIR . "$dir/$file" ) ) {
+	foreach ($files as $file) {
+		if ('.' === $file[0] || is_dir(WP_LANG_DIR."$dir/$file")) {
 			continue;
 		}
-		if ( substr( $file, -3 ) !== '.po' ) {
+		if (substr($file, -3) !== '.po') {
 			continue;
 		}
-		if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
+		if ( ! preg_match('/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match)) {
 			continue;
 		}
-		if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) )  {
+		if ( ! in_array(substr($file, 0, -3).'.mo', $files)) {
 			continue;
 		}
 
-		list( , $textdomain, $language ) = $match;
-		if ( '' === $textdomain ) {
+		list(, $textdomain, $language) = $match;
+		if ('' === $textdomain) {
 			$textdomain = 'default';
 		}
-		$language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "$dir/$file" );
+		$language_data[$textdomain][$language] = wp_get_pomo_file_data(WP_LANG_DIR."$dir/$file");
 	}
 	return $language_data;
 }
@@ -1089,16 +1089,16 @@ 
  * @param string $po_file Path to PO file.
  * @return array PO file headers.
  */
-function wp_get_pomo_file_data( $po_file ) {
-	$headers = get_file_data( $po_file, array(
+function wp_get_pomo_file_data($po_file) {
+	$headers = get_file_data($po_file, array(
 		'POT-Creation-Date'  => '"POT-Creation-Date',
 		'PO-Revision-Date'   => '"PO-Revision-Date',
 		'Project-Id-Version' => '"Project-Id-Version',
 		'X-Generator'        => '"X-Generator',
-	) );
-	foreach ( $headers as $header => $value ) {
+	));
+	foreach ($headers as $header => $value) {
 		// Remove possible contextual '\n' and closing double quote.
-		$headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
+		$headers[$header] = preg_replace('~(\\\n)?"$~', '', $value);
 	}
 	return $headers;
 }
@@ -1130,9 +1130,9 @@ 
  * }
  * @return string HTML content
  */
-function wp_dropdown_languages( $args = array() ) {
+function wp_dropdown_languages($args = array()) {
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'id'           => '',
 		'name'         => '',
 		'languages'    => array(),
@@ -1141,16 +1141,16 @@ 
 		'echo'         => 1,
 		'show_available_translations' => true,
 		'show_option_site_default'    => false,
-	) );
+	));
 
 	// English (United States) uses an empty string for the value attribute.
-	if ( 'en_US' === $args['selected'] ) {
+	if ('en_US' === $args['selected']) {
 		$args['selected'] = '';
 	}
 
 	$translations = $args['translations'];
-	if ( empty( $translations ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+	if (empty($translations)) {
+		require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 		$translations = wp_get_available_translations();
 	}
 
@@ -1159,17 +1159,17 @@ 
 	 * $translations to get the native name. Fall back to locale.
 	 */
 	$languages = array();
-	foreach ( $args['languages'] as $locale ) {
-		if ( isset( $translations[ $locale ] ) ) {
-			$translation = $translations[ $locale ];
+	foreach ($args['languages'] as $locale) {
+		if (isset($translations[$locale])) {
+			$translation = $translations[$locale];
 			$languages[] = array(
 				'language'    => $translation['language'],
 				'native_name' => $translation['native_name'],
-				'lang'        => current( $translation['iso'] ),
+				'lang'        => current($translation['iso']),
 			);
 
 			// Remove installed language from available translations.
-			unset( $translations[ $locale ] );
+			unset($translations[$locale]);
 		} else {
 			$languages[] = array(
 				'language'    => $locale,
@@ -1179,64 +1179,64 @@ 
 		}
 	}
 
-	$translations_available = ( ! empty( $translations ) && $args['show_available_translations'] );
+	$translations_available = ( ! empty($translations) && $args['show_available_translations']);
 
-	$output = sprintf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) );
+	$output = sprintf('<select name="%s" id="%s">', esc_attr($args['name']), esc_attr($args['id']));
 
 	// Holds the HTML markup.
 	$structure = array();
 
 	// List installed languages.
-	if ( $translations_available ) {
-		$structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
+	if ($translations_available) {
+		$structure[] = '<optgroup label="'.esc_attr_x('Installed', 'translations').'">';
 	}
 
-	if ( $args['show_option_site_default'] ) {
+	if ($args['show_option_site_default']) {
 		$structure[] = sprintf(
 			'<option value="site-default" data-installed="1"%s>%s</option>',
-			selected( 'site-default', $args['selected'], false ),
-			_x( 'Site Default', 'default site language' )
+			selected('site-default', $args['selected'], false),
+			_x('Site Default', 'default site language')
 		);
 	}
 
 	$structure[] = sprintf(
 		'<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
-		selected( '', $args['selected'], false )
+		selected('', $args['selected'], false)
 	);
 
-	foreach ( $languages as $language ) {
+	foreach ($languages as $language) {
 		$structure[] = sprintf(
 			'<option value="%s" lang="%s"%s data-installed="1">%s</option>',
-			esc_attr( $language['language'] ),
-			esc_attr( $language['lang'] ),
-			selected( $language['language'], $args['selected'], false ),
-			esc_html( $language['native_name'] )
+			esc_attr($language['language']),
+			esc_attr($language['lang']),
+			selected($language['language'], $args['selected'], false),
+			esc_html($language['native_name'])
 		);
 	}
-	if ( $translations_available ) {
+	if ($translations_available) {
 		$structure[] = '</optgroup>';
 	}
 
 	// List available translations.
-	if ( $translations_available ) {
-		$structure[] = '<optgroup label="' . esc_attr_x( 'Available', 'translations' ) . '">';
-		foreach ( $translations as $translation ) {
+	if ($translations_available) {
+		$structure[] = '<optgroup label="'.esc_attr_x('Available', 'translations').'">';
+		foreach ($translations as $translation) {
 			$structure[] = sprintf(
 				'<option value="%s" lang="%s"%s>%s</option>',
-				esc_attr( $translation['language'] ),
-				esc_attr( current( $translation['iso'] ) ),
-				selected( $translation['language'], $args['selected'], false ),
-				esc_html( $translation['native_name'] )
+				esc_attr($translation['language']),
+				esc_attr(current($translation['iso'])),
+				selected($translation['language'], $args['selected'], false),
+				esc_html($translation['native_name'])
 			);
 		}
 		$structure[] = '</optgroup>';
 	}
 
-	$output .= join( "\n", $structure );
+	$output .= join("\n", $structure);
 
 	$output .= '</select>';
 
-	if ( $args['echo'] ) {
+	if ($args['echo']) {
 		echo $output;
 	}
 
@@ -1254,7 +1254,7 @@ 
  */
 function is_rtl() {
 	global $wp_locale;
-	if ( ! ( $wp_locale instanceof WP_Locale ) ) {
+	if ( ! ($wp_locale instanceof WP_Locale)) {
 		return false;
 	}
 	return $wp_locale->is_rtl();
@@ -1270,11 +1270,11 @@ 
  * @param string $locale The locale.
  * @return bool True on success, false on failure.
  */
-function switch_to_locale( $locale ) {
+function switch_to_locale($locale) {
 	/* @var WP_Locale_Switcher $wp_locale_switcher */
 	global $wp_locale_switcher;
 
-	return $wp_locale_switcher->switch_to_locale( $locale );
+	return $wp_locale_switcher->switch_to_locale($locale);
 }
 
 /**

src/wp-includes/widgets/class-wp-widget-recent-comments.php

Indentation +5 added lines, -5 removed lines

@@ -37,11 +37,11 @@
 	}
 
  	/**
-	 * Outputs the default styles for the Recent Comments widget.
-	 *
-	 * @since 2.8.0
-	 * @access public
-	 */
+ 	 * Outputs the default styles for the Recent Comments widget.
+ 	 *
+ 	 * @since 2.8.0
+ 	 * @access public
+ 	 */
 	public function recent_comments_style() {
 		/**
 		 * Filters the Recent Comments default widget styles.

Spacing +34 added lines, -34 removed lines

@@ -25,14 +25,14 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_recent_comments',
-			'description' => __( 'Your site’s most recent comments.' ),
+			'description' => __('Your site’s most recent comments.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'recent-comments', __( 'Recent Comments' ), $widget_ops );
+		parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_comments';
 
-		if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) {
-			add_action( 'wp_head', array( $this, 'recent_comments_style' ) );
+		if (is_active_widget(false, false, $this->id_base) || is_customize_preview()) {
+			add_action('wp_head', array($this, 'recent_comments_style'));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 		 * @param bool   $active  Whether the widget is active. Default true.
 		 * @param string $id_base The widget ID.
 		 */
-		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+		if ( ! current_theme_supports('widgets') // Temp hack #14876
+			|| ! apply_filters('show_recent_comments_widget_style', true, $this->id_base))
 			return;
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
@@ -69,19 +69,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
+	public function widget($args, $instance) {
+		if ( ! isset($args['widget_id']))
 			$args['widget_id'] = $this->id;
 
 		$output = '';
 
-		$title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+		$title = ( ! empty($instance['title'])) ? $instance['title'] : __('Recent Comments');
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
-		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
+		$number = ( ! empty($instance['number'])) ? absint($instance['number']) : 5;
+		if ( ! $number)
 			$number = 5;
 
 		/**
@@ -93,29 +93,29 @@ 
 		 *
 		 * @param array $comment_args An array of arguments used to retrieve the recent comments.
 		 */
-		$comments = get_comments( apply_filters( 'widget_comments_args', array(
+		$comments = get_comments(apply_filters('widget_comments_args', array(
 			'number'      => $number,
 			'status'      => 'approve',
 			'post_status' => 'publish'
-		) ) );
+		)));
 
 		$output .= $args['before_widget'];
-		if ( $title ) {
-			$output .= $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			$output .= $args['before_title'].$title.$args['after_title'];
 		}
 
 		$output .= '<ul id="recentcomments">';
-		if ( is_array( $comments ) && $comments ) {
+		if (is_array($comments) && $comments) {
 			// Prime cache for associated posts. (Prime post term cache if we need it for permalinks.)
-			$post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) );
-			_prime_post_caches( $post_ids, strpos( get_option( 'permalink_structure' ), '%category%' ), false );
+			$post_ids = array_unique(wp_list_pluck($comments, 'comment_post_ID'));
+			_prime_post_caches($post_ids, strpos(get_option('permalink_structure'), '%category%'), false);
 
-			foreach ( (array) $comments as $comment ) {
+			foreach ((array) $comments as $comment) {
 				$output .= '<li class="recentcomments">';
 				/* translators: comments widget: 1: comment author, 2: post link */
-				$output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
-					'<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
-					'<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
+				$output .= sprintf(_x('%1$s on %2$s', 'widgets'),
+					'<span class="comment-author-link">'.get_comment_author_link($comment).'</span>',
+					'<a href="'.esc_url(get_comment_link($comment)).'">'.get_the_title($comment->comment_post_ID).'</a>'
 				);
 				$output .= '</li>';
 			}
@@ -137,10 +137,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['number'] = absint( $new_instance['number'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		$instance['number'] = absint($new_instance['number']);
 		return $instance;
 	}
 
@@ -152,15 +152,15 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
-		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
+	public function form($instance) {
+		$title = isset($instance['title']) ? $instance['title'] : '';
+		$number = isset($instance['number']) ? absint($instance['number']) : 5;
 		?>
-		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
-		<input class="tiny-text" id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
+		<p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of comments to show:'); ?></label>
+		<input class="tiny-text" id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
 		<?php
 	}
 
@@ -173,6 +173,6 @@ 
 	 * @deprecated 4.4.0 Fragment caching was removed in favor of split queries.
 	 */
 	public function flush_widget_cache() {
-		_deprecated_function( __METHOD__, '4.4.0' );
+		_deprecated_function(__METHOD__, '4.4.0');
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 		 * @param string $id_base The widget ID.
 		 */
 		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
-			return;
+			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) ) {
+					return;
+		}
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
 		<?php
@@ -70,8 +71,9 @@ 
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
-			$args['widget_id'] = $this->id;
+		if ( ! isset( $args['widget_id'] ) ) {
+					$args['widget_id'] = $this->id;
+		}
 
 		$output = '';
 
@@ -81,8 +83,9 @@ 
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
 		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
-			$number = 5;
+		if ( ! $number ) {
+					$number = 5;
+		}
 
 		/**
 		 * Filters the arguments for the Recent Comments widget.

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

Braces +35 added lines, -22 removed lines

@@ -738,8 +738,9 @@ 
 		 */
 		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if ( is_string( $value ) ) {
+					return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		}
 
 		return $value;
 	}
@@ -768,11 +769,13 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
-			return false;
+		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+					return false;
+		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
-			return false;
+		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+					return false;
+		}
 
 		return true;
 	}
@@ -788,21 +791,25 @@ 
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
 	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
-			$root = array();
+		if ( $create && empty( $root ) ) {
+					$root = array();
+		}
 
-		if ( ! isset( $root ) || empty( $keys ) )
-			return;
+		if ( ! isset( $root ) || empty( $keys ) ) {
+					return;
+		}
 
 		$last = array_pop( $keys );
 		$node = &$root;
 
 		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+			if ( $create && ! isset( $node[ $key ] ) ) {
+							$node[ $key ] = array();
+			}
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
-				return;
+			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
+							return;
+			}
 
 			$node = &$node[ $key ];
 		}
@@ -817,8 +824,9 @@ 
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
-			return;
+		if ( ! isset( $node[ $last ] ) ) {
+					return;
+		}
 
 		return array(
 			'root' => &$root,
@@ -838,15 +846,18 @@ 
 	 * @return mixed
 	 */
 	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
-			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		if ( ! isset( $value ) ) {
+					return $root;
+		} elseif ( empty( $keys ) ) {
+			// If there are no keys, we're replacing the root.
 			return $value;
+		}
 
 		$result = $this->multidimensional( $root, $keys, true );
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if ( isset( $result ) ) {
+					$result['node'][ $result['key'] ] = $value;
+		}
 
 		return $root;
 	}
@@ -862,8 +873,10 @@ 
 	 * @return mixed The requested value or the default value.
 	 */
 	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
+		if ( empty( $keys ) ) {
+			// If there are no keys, test the root.
 			return isset( $root ) ? $root : $default;
+		}
 
 		$result = $this->multidimensional( $root, $keys );
 		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;

Spacing +159 added lines, -159 removed lines

@@ -175,11 +175,11 @@ 
 	 *                                      theme mod or option name.
 	 * @param array                $args    Setting arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
@@ -187,32 +187,32 @@ 
 		$this->id = $id;
 
 		// Parse the ID for array keys.
-		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
 		// Rebuild the ID.
-		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) ) {
-			$this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
+		$this->id = $this->id_data['base'];
+		if ( ! empty($this->id_data['keys'])) {
+			$this->id .= '['.implode('][', $this->id_data['keys']).']';
 		}
 
-		if ( $this->validate_callback ) {
-			add_filter( "customize_validate_{$this->id}", $this->validate_callback, 10, 3 );
+		if ($this->validate_callback) {
+			add_filter("customize_validate_{$this->id}", $this->validate_callback, 10, 3);
 		}
-		if ( $this->sanitize_callback ) {
-			add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ($this->sanitize_callback) {
+			add_filter("customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2);
 		}
-		if ( $this->sanitize_js_callback ) {
-			add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ($this->sanitize_js_callback) {
+			add_filter("customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2);
 		}
 
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
 			// Other setting types can opt-in to aggregate multidimensional explicitly.
 			$this->aggregate_multidimensional();
 
 			// Allow option settings to indicate whether they should be autoloaded.
-			if ( 'option' === $this->type && isset( $args['autoload'] ) ) {
-				self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] = $args['autoload'];
+			if ('option' === $this->type && isset($args['autoload'])) {
+				self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'] = $args['autoload'];
 			}
 		}
 	}
@@ -243,20 +243,20 @@ 
 	 */
 	protected function aggregate_multidimensional() {
 		$id_base = $this->id_data['base'];
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ] = array();
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type])) {
+			self::$aggregated_multidimensionals[$this->type] = array();
 		}
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ][ $id_base ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ][ $id_base ] = array(
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type][$id_base])) {
+			self::$aggregated_multidimensionals[$this->type][$id_base] = array(
 				'previewed_instances'       => array(), // Calling preview() will add the $setting to the array.
 				'preview_applied_instances' => array(), // Flags for which settings have had their values applied.
-				'root_value'                => $this->get_root_value( array() ), // Root value for initial state, manipulated by preview and update calls.
+				'root_value'                => $this->get_root_value(array()), // Root value for initial state, manipulated by preview and update calls.
 			);
 		}
 
-		if ( ! empty( $this->id_data['keys'] ) ) {
+		if ( ! empty($this->id_data['keys'])) {
 			// Note the preview-applied flag is cleared at priority 9 to ensure it is cleared before a deferred-preview runs.
-			add_action( "customize_post_value_set_{$this->id}", array( $this, '_clear_aggregated_multidimensional_preview_applied_flag' ), 9 );
+			add_action("customize_post_value_set_{$this->id}", array($this, '_clear_aggregated_multidimensional_preview_applied_flag'), 9);
 			$this->is_multidimensional_aggregated = true;
 		}
 	}
@@ -290,10 +290,10 @@ 
 	 * @return bool If preview() has been called.
 	 */
 	public function is_current_blog_previewed() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			return false;
 		}
-		return ( get_current_blog_id() === $this->_previewed_blog_id );
+		return (get_current_blog_id() === $this->_previewed_blog_id);
 	}
 
 	/**
@@ -319,18 +319,18 @@ 
 	 * @return bool False when preview short-circuits due no change needing to be previewed.
 	 */
 	public function preview() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			$this->_previewed_blog_id = get_current_blog_id();
 		}
 
 		// Prevent re-previewing an already-previewed setting.
-		if ( $this->is_previewed ) {
+		if ($this->is_previewed) {
 			return true;
 		}
 
 		$id_base = $this->id_data['base'];
-		$is_multidimensional = ! empty( $this->id_data['keys'] );
-		$multidimensional_filter = array( $this, '_multidimensional_preview_filter' );
+		$is_multidimensional = ! empty($this->id_data['keys']);
+		$multidimensional_filter = array($this, '_multidimensional_preview_filter');
 
 		/*
 		 * Check if the setting has a pre-existing value (an isset check),
@@ -339,53 +339,53 @@ 
 		 * to be previewed.
 		 */
 		$undefined = new stdClass();
-		$needs_preview = ( $undefined !== $this->post_value( $undefined ) );
+		$needs_preview = ($undefined !== $this->post_value($undefined));
 		$value = null;
 
 		// Since no post value was defined, check if we have an initial value set.
-		if ( ! $needs_preview ) {
-			if ( $this->is_multidimensional_aggregated ) {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$value = $this->multidimensional_get( $root, $this->id_data['keys'], $undefined );
+		if ( ! $needs_preview) {
+			if ($this->is_multidimensional_aggregated) {
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$value = $this->multidimensional_get($root, $this->id_data['keys'], $undefined);
 			} else {
 				$default = $this->default;
 				$this->default = $undefined; // Temporarily set default to undefined so we can detect if existing value is set.
 				$value = $this->value();
 				$this->default = $default;
 			}
-			$needs_preview = ( $undefined === $value ); // Because the default needs to be supplied.
+			$needs_preview = ($undefined === $value); // Because the default needs to be supplied.
 		}
 
 		// If the setting does not need previewing now, defer to when it has a value to preview.
-		if ( ! $needs_preview ) {
-			if ( ! has_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) ) ) {
-				add_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) );
+		if ( ! $needs_preview) {
+			if ( ! has_action("customize_post_value_set_{$this->id}", array($this, 'preview'))) {
+				add_action("customize_post_value_set_{$this->id}", array($this, 'preview'));
 			}
 			return false;
 		}
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'theme_mod' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "theme_mod_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("theme_mod_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add this filter once for this ID base.
-						add_filter( "theme_mod_{$id_base}", $multidimensional_filter );
+						add_filter("theme_mod_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			case 'option' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "pre_option_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("pre_option_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add these filters once for this ID base.
-						add_filter( "option_{$id_base}", $multidimensional_filter );
-						add_filter( "default_option_{$id_base}", $multidimensional_filter );
+						add_filter("option_{$id_base}", $multidimensional_filter);
+						add_filter("default_option_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			default :
@@ -400,7 +400,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 				 */
-				do_action( "customize_preview_{$this->id}", $this );
+				do_action("customize_preview_{$this->id}", $this);
 
 				/**
 				 * Fires when the WP_Customize_Setting::preview() method is called for settings
@@ -412,7 +412,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 				 */
-				do_action( "customize_preview_{$this->type}", $this );
+				do_action("customize_preview_{$this->type}", $this);
 		}
 
 		$this->is_previewed = true;
@@ -433,7 +433,7 @@ 
 	 * @see WP_Customize_Setting::_multidimensional_preview_filter()
 	 */
 	final public function _clear_aggregated_multidimensional_preview_applied_flag() {
-		unset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['preview_applied_instances'][ $this->id ] );
+		unset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['preview_applied_instances'][$this->id]);
 	}
 
 	/**
@@ -448,14 +448,14 @@ 
 	 * @param mixed $original Old value.
 	 * @return mixed New or old value.
 	 */
-	public function _preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	public function _preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$undefined = new stdClass(); // Symbol hack.
-		$post_value = $this->post_value( $undefined );
-		if ( $undefined !== $post_value ) {
+		$post_value = $this->post_value($undefined);
+		if ($undefined !== $post_value) {
 			$value = $post_value;
 		} else {
 			/*
@@ -480,35 +480,35 @@ 
 	 * @param mixed $original Original root value.
 	 * @return mixed New or old value.
 	 */
-	final public function _multidimensional_preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	final public function _multidimensional_preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$id_base = $this->id_data['base'];
 
 		// If no settings have been previewed yet (which should not be the case, since $this is), just pass through the original value.
-		if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+		if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 			return $original;
 		}
 
-		foreach ( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] as $previewed_setting ) {
+		foreach (self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'] as $previewed_setting) {
 			// Skip applying previewed value for any settings that have already been applied.
-			if ( ! empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] ) ) {
+			if ( ! empty(self::$aggregated_multidimensionals[$this->type][$id_base]['preview_applied_instances'][$previewed_setting->id])) {
 				continue;
 			}
 
 			// Do the replacements of the posted/default sub value into the root value.
-			$value = $previewed_setting->post_value( $previewed_setting->default );
-			$root = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
-			$root = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'] = $root;
+			$value = $previewed_setting->post_value($previewed_setting->default);
+			$root = self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'];
+			$root = $previewed_setting->multidimensional_replace($root, $previewed_setting->id_data['keys'], $value);
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'] = $root;
 
 			// Mark this setting having been applied so that it will be skipped when the filter is called again.
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] = true;
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['preview_applied_instances'][$previewed_setting->id] = true;
 		}
 
-		return self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
+		return self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
 	}
 
 	/**
@@ -522,7 +522,7 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) ) {
+		if ( ! $this->check_capabilities() || ! isset($value)) {
 			return false;
 		}
 
@@ -538,9 +538,9 @@ 
 		 *
 		 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 		 */
-		do_action( "customize_save_{$id_base}", $this );
+		do_action("customize_save_{$id_base}", $this);
 
-		$this->update( $value );
+		$this->update($value);
 	}
 
 	/**
@@ -553,8 +553,8 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized and validated value.
 	 */
-	final public function post_value( $default = null ) {
-		return $this->manager->post_value( $this, $default );
+	final public function post_value($default = null) {
+		return $this->manager->post_value($this, $default);
 	}
 
 	/**
@@ -565,7 +565,7 @@ 
 	 * @param string|array $value    The value to sanitize.
 	 * @return string|array|null|WP_Error Sanitized value, or `null`/`WP_Error` if invalid.
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		/**
 		 * Filters a Customize setting value in un-slashed form.
@@ -575,7 +575,7 @@ 
 		 * @param mixed                $value Value of the setting.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $value, $this);
 	}
 
 	/**
@@ -588,12 +588,12 @@ 
 	 * @param mixed $value Value to validate.
 	 * @return true|WP_Error True if the input was validated, otherwise WP_Error.
 	 */
-	public function validate( $value ) {
-		if ( is_wp_error( $value ) ) {
+	public function validate($value) {
+		if (is_wp_error($value)) {
 			return $value;
 		}
-		if ( is_null( $value ) ) {
-			return new WP_Error( 'invalid_value', __( 'Invalid value.' ) );
+		if (is_null($value)) {
+			return new WP_Error('invalid_value', __('Invalid value.'));
 		}
 
 		$validity = new WP_Error();
@@ -611,9 +611,9 @@ 
 		 * @param mixed                $value    Value of the setting.
 		 * @param WP_Customize_Setting $this     WP_Customize_Setting instance.
 		 */
-		$validity = apply_filters( "customize_validate_{$this->id}", $validity, $value, $this );
+		$validity = apply_filters("customize_validate_{$this->id}", $validity, $value, $this);
 
-		if ( is_wp_error( $validity ) && empty( $validity->errors ) ) {
+		if (is_wp_error($validity) && empty($validity->errors)) {
 			$validity = true;
 		}
 		return $validity;
@@ -627,12 +627,12 @@ 
 	 * @param mixed $default Value to return if root does not exist.
 	 * @return mixed
 	 */
-	protected function get_root_value( $default = null ) {
+	protected function get_root_value($default = null) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
-			return get_option( $id_base, $default );
-		} elseif ( 'theme_mod' === $this->type ) {
-			return get_theme_mod( $id_base, $default );
+		if ('option' === $this->type) {
+			return get_option($id_base, $default);
+		} elseif ('theme_mod' === $this->type) {
+			return get_theme_mod($id_base, $default);
 		} else {
 			/*
 			 * Any WP_Customize_Setting subclass implementing aggregate multidimensional
@@ -651,16 +651,16 @@ 
 	 * @param mixed $value Value to set as root of multidimensional setting.
 	 * @return bool Whether the multidimensional root was updated successfully.
 	 */
-	protected function set_root_value( $value ) {
+	protected function set_root_value($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
+		if ('option' === $this->type) {
 			$autoload = true;
-			if ( isset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] ) ) {
-				$autoload = self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'];
+			if (isset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'])) {
+				$autoload = self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'];
 			}
-			return update_option( $id_base, $value, $autoload );
-		} elseif ( 'theme_mod' === $this->type ) {
-			set_theme_mod( $id_base, $value );
+			return update_option($id_base, $value, $autoload);
+		} elseif ('theme_mod' === $this->type) {
+			set_theme_mod($id_base, $value);
 			return true;
 		} else {
 			/*
@@ -680,16 +680,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return bool The result of saving the value.
 	 */
-	protected function update( $value ) {
+	protected function update($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
-			if ( ! $this->is_multidimensional_aggregated ) {
-				return $this->set_root_value( $value );
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
+			if ( ! $this->is_multidimensional_aggregated) {
+				return $this->set_root_value($value);
 			} else {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$root = $this->multidimensional_replace( $root, $this->id_data['keys'], $value );
-				self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'] = $root;
-				return $this->set_root_value( $root );
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$root = $this->multidimensional_replace($root, $this->id_data['keys'], $value);
+				self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'] = $root;
+				return $this->set_root_value($root);
 			}
 		} else {
 			/**
@@ -703,9 +703,9 @@ 
 			 * @param mixed                $value Value of the setting.
 			 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 			 */
-			do_action( "customize_update_{$this->type}", $value, $this );
+			do_action("customize_update_{$this->type}", $value, $this);
 
-			return has_action( "customize_update_{$this->type}" );
+			return has_action("customize_update_{$this->type}");
 		}
 	}
 
@@ -716,7 +716,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_theme_mod() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -726,7 +726,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_option() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -738,19 +738,19 @@ 
 	 */
 	public function value() {
 		$id_base = $this->id_data['base'];
-		$is_core_type = ( 'option' === $this->type || 'theme_mod' === $this->type );
+		$is_core_type = ('option' === $this->type || 'theme_mod' === $this->type);
 
-		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated ) {
+		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated) {
 
 			// Use post value if previewed and a post value is present.
-			if ( $this->is_previewed ) {
-				$value = $this->post_value( null );
-				if ( null !== $value ) {
+			if ($this->is_previewed) {
+				$value = $this->post_value(null);
+				if (null !== $value) {
 					return $value;
 				}
 			}
 
-			$value = $this->get_root_value( $this->default );
+			$value = $this->get_root_value($this->default);
 
 			/**
 			 * Filters a Customize setting value not handled as a theme_mod or option.
@@ -767,17 +767,17 @@ 
 			 * @param mixed                $default The setting default value. Default empty.
 			 * @param WP_Customize_Setting $this    The setting instance.
 			 */
-			$value = apply_filters( "customize_value_{$id_base}", $value, $this );
-		} elseif ( $this->is_multidimensional_aggregated ) {
-			$root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-			$value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+			$value = apply_filters("customize_value_{$id_base}", $value, $this);
+		} elseif ($this->is_multidimensional_aggregated) {
+			$root_value = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+			$value = $this->multidimensional_get($root_value, $this->id_data['keys'], $this->default);
 
 			// Ensure that the post value is used if the setting is previewed, since preview filters aren't applying on cached $root_value.
-			if ( $this->is_previewed ) {
-				$value = $this->post_value( $value );
+			if ($this->is_previewed) {
+				$value = $this->post_value($value);
 			}
 		} else {
-			$value = $this->get_root_value( $this->default );
+			$value = $this->get_root_value($this->default);
 		}
 		return $value;
 	}
@@ -801,10 +801,10 @@ 
 		 * @param mixed                $value The setting value.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
+		$value = apply_filters("customize_sanitize_js_{$this->id}", $this->value(), $this);
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if (is_string($value))
+			return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 
 		return $value;
 	}
@@ -833,10 +833,10 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability))
 			return false;
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports))
 			return false;
 
 		return true;
@@ -852,37 +852,37 @@ 
 	 * @param bool $create Default is false.
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
-	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
+	final protected function multidimensional(&$root, $keys, $create = false) {
+		if ($create && empty($root))
 			$root = array();
 
-		if ( ! isset( $root ) || empty( $keys ) )
+		if ( ! isset($root) || empty($keys))
 			return;
 
-		$last = array_pop( $keys );
+		$last = array_pop($keys);
 		$node = &$root;
 
-		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+		foreach ($keys as $key) {
+			if ($create && ! isset($node[$key]))
+				$node[$key] = array();
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+			if ( ! is_array($node) || ! isset($node[$key]))
 				return;
 
-			$node = &$node[ $key ];
+			$node = &$node[$key];
 		}
 
-		if ( $create ) {
-			if ( ! is_array( $node ) ) {
+		if ($create) {
+			if ( ! is_array($node)) {
 				// account for an array overriding a string or object value
 				$node = array();
 			}
-			if ( ! isset( $node[ $last ] ) ) {
-				$node[ $last ] = array();
+			if ( ! isset($node[$last])) {
+				$node[$last] = array();
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
+		if ( ! isset($node[$last]))
 			return;
 
 		return array(
@@ -902,16 +902,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return mixed
 	 */
-	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
+	final protected function multidimensional_replace($root, $keys, $value) {
+		if ( ! isset($value))
 			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		elseif (empty($keys)) // If there are no keys, we're replacing the root.
 			return $value;
 
-		$result = $this->multidimensional( $root, $keys, true );
+		$result = $this->multidimensional($root, $keys, true);
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if (isset($result))
+			$result['node'][$result['key']] = $value;
 
 		return $root;
 	}
@@ -926,12 +926,12 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The requested value or the default value.
 	 */
-	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
-			return isset( $root ) ? $root : $default;
+	final protected function multidimensional_get($root, $keys, $default = null) {
+		if (empty($keys)) // If there are no keys, test the root.
+			return isset($root) ? $root : $default;
 
-		$result = $this->multidimensional( $root, $keys );
-		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
+		$result = $this->multidimensional($root, $keys);
+		return isset($result) ? $result['node'][$result['key']] : $default;
 	}
 
 	/**
@@ -943,33 +943,33 @@ 
 	 * @param $keys
 	 * @return bool True if value is set, false if not.
 	 */
-	final protected function multidimensional_isset( $root, $keys ) {
-		$result = $this->multidimensional_get( $root, $keys );
-		return isset( $result );
+	final protected function multidimensional_isset($root, $keys) {
+		$result = $this->multidimensional_get($root, $keys);
+		return isset($result);
 	}
 }
 
 /**
  * WP_Customize_Filter_Setting class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
 
 /**
  * WP_Customize_Header_Image_Setting class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
 
 /**
  * WP_Customize_Background_Image_Setting class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
 
 /**
  * WP_Customize_Nav_Menu_Item_Setting class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
 
 /**
  * WP_Customize_Nav_Menu_Setting class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');

src/wp-includes/post-template.php

Indentation +1 added lines, -1 removed lines

@@ -1097,7 +1097,7 @@
 	 * @param string $output HTML output for drop down list of pages.
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
- 	 */
+	 */
 	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
 
 	if ( $r['echo'] ) {

Braces +205 added lines, -149 removed lines

@@ -42,16 +42,18 @@ 
 function the_title( $before = '', $after = '', $echo = true ) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
-		return;
+	if ( strlen($title) == 0 ) {
+			return;
+	}
 
 	$title = $before . $title . $after;
 
-	if ( $echo )
-		echo $title;
-	else
-		return $title;
-}
+	if ( $echo ) {
+			echo $title;
+	} else {
+			return $title;
+	}
+	}
 
 /**
  * Sanitize the current title when retrieving or displaying.
@@ -278,30 +280,37 @@ 
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if ( post_password_required( $post ) ) {
+			return get_the_password_form( $post );
+	}
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ( $page > count( $pages ) ) {
+		// if the requested page doesn't exist
+		$page = count( $pages );
+	}
+	// give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
 	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
 		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) {
+					$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		}
 
 		$has_teaser = true;
 	} else {
 		$content = array( $content );
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
-		$strip_teaser = true;
+	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) ) {
+			$strip_teaser = true;
+	}
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
-		$teaser = '';
+	if ( $more && $strip_teaser && $has_teaser ) {
+			$teaser = '';
+	}
 
 	$output .= $teaser;
 
@@ -309,8 +318,8 @@ 
 		if ( $more ) {
 			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
-
+			if ( ! empty( $more_link_text ) ) {
+			
 				/**
 				 * Filters the Read More link text.
 				 *
@@ -320,12 +329,15 @@ 
 				 * @param string $more_link_text    Read More text.
 				 */
 				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+			}
 			$output = force_balance_tags( $output );
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
+	if ( $preview ) {
+		// Preview fix for JavaScript bug with foreign languages.
 		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	}
 
 	return $output;
 }
@@ -464,8 +476,9 @@ 
 	}
 
 	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
-		$classes[] = $post->post_type;
+	if ( ! is_admin() ) {
+			$classes[] = $post->post_type;
+	}
 	$classes[] = 'type-' . $post->post_type;
 	$classes[] = 'status-' . $post->post_status;
 
@@ -473,10 +486,11 @@ 
 	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 		$post_format = get_post_format( $post->ID );
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
-		else
-			$classes[] = 'format-standard';
+		if ( $post_format && !is_wp_error($post_format) ) {
+					$classes[] = 'format-' . sanitize_html_class( $post_format );
+		} else {
+					$classes[] = 'format-standard';
+		}
 	}
 
 	$post_password_required = post_password_required( $post->ID );
@@ -572,27 +586,35 @@ 
 
 	$classes = array();
 
-	if ( is_rtl() )
-		$classes[] = 'rtl';
-
-	if ( is_front_page() )
-		$classes[] = 'home';
-	if ( is_home() )
-		$classes[] = 'blog';
-	if ( is_archive() )
-		$classes[] = 'archive';
-	if ( is_date() )
-		$classes[] = 'date';
+	if ( is_rtl() ) {
+			$classes[] = 'rtl';
+	}
+
+	if ( is_front_page() ) {
+			$classes[] = 'home';
+	}
+	if ( is_home() ) {
+			$classes[] = 'blog';
+	}
+	if ( is_archive() ) {
+			$classes[] = 'archive';
+	}
+	if ( is_date() ) {
+			$classes[] = 'date';
+	}
 	if ( is_search() ) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
-		$classes[] = 'paged';
-	if ( is_attachment() )
-		$classes[] = 'attachment';
-	if ( is_404() )
-		$classes[] = 'error404';
+	if ( is_paged() ) {
+			$classes[] = 'paged';
+	}
+	if ( is_attachment() ) {
+			$classes[] = 'attachment';
+	}
+	if ( is_404() ) {
+			$classes[] = 'error404';
+	}
 
 	if ( is_singular() ) {
 		$post_id = $wp_query->get_queried_object_id();
@@ -623,10 +645,11 @@ 
 				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 					$post_format = get_post_format( $post->ID );
 
-					if ( $post_format && !is_wp_error($post_format) )
-						$classes[] = 'single-format-' . sanitize_html_class( $post_format );
-					else
-						$classes[] = 'single-format-standard';
+					if ( $post_format && !is_wp_error($post_format) ) {
+											$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+					} else {
+											$classes[] = 'single-format-standard';
+					}
 				}
 			}
 		}
@@ -658,8 +681,9 @@ 
 		if ( is_post_type_archive() ) {
 			$classes[] = 'post-type-archive';
 			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
 		} elseif ( is_author() ) {
 			$author = $wp_query->get_queried_object();
@@ -707,16 +731,18 @@ 
 		}
 	}
 
-	if ( is_user_logged_in() )
-		$classes[] = 'logged-in';
+	if ( is_user_logged_in() ) {
+			$classes[] = 'logged-in';
+	}
 
 	if ( is_admin_bar_showing() ) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
-		$classes[] = 'custom-background';
+	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) {
+			$classes[] = 'custom-background';
+	}
 
 	if ( has_custom_logo() ) {
 		$classes[] = 'wp-custom-logo';
@@ -724,33 +750,36 @@ 
 
 	$page = $wp_query->get( 'page' );
 
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
+	if ( ! $page || $page < 2 ) {
+			$page = $wp_query->get( 'paged' );
+	}
 
 	if ( $page && $page > 1 && ! is_404() ) {
 		$classes[] = 'paged-' . $page;
 
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+		if ( is_single() ) {
+					$classes[] = 'single-paged-' . $page;
+		} elseif ( is_page() ) {
+					$classes[] = 'page-paged-' . $page;
+		} elseif ( is_category() ) {
+					$classes[] = 'category-paged-' . $page;
+		} elseif ( is_tag() ) {
+					$classes[] = 'tag-paged-' . $page;
+		} elseif ( is_date() ) {
+					$classes[] = 'date-paged-' . $page;
+		} elseif ( is_author() ) {
+					$classes[] = 'author-paged-' . $page;
+		} elseif ( is_search() ) {
+					$classes[] = 'search-paged-' . $page;
+		} elseif ( is_post_type_archive() ) {
+					$classes[] = 'post-type-paged-' . $page;
+		}
 	}
 
 	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
+		if ( !is_array( $class ) ) {
+					$class = preg_split( '#\s+#', $class );
+		}
 		$classes = array_merge( $classes, $class );
 	} else {
 		// Ensure that we always coerce class to being an array.
@@ -961,12 +990,13 @@ 
 	if ( 1 == $i ) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
-		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) {
+					$url = add_query_arg( 'page', $i, get_permalink() );
+		} elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		} else {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		}
 	}
 
 	if ( is_preview() ) {
@@ -997,13 +1027,14 @@ 
 function post_custom( $key = '' ) {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
-		return false;
-	elseif ( 1 == count($custom[$key]) )
-		return $custom[$key][0];
-	else
-		return $custom[$key];
-}
+	if ( !isset( $custom[$key] ) ) {
+			return false;
+	} elseif ( 1 == count($custom[$key]) ) {
+			return $custom[$key][0];
+	} else {
+			return $custom[$key];
+	}
+	}
 
 /**
  * Display list of post custom fields.
@@ -1018,8 +1049,9 @@ 
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
-				continue;
+			if ( is_protected_meta( $keyt, 'post' ) ) {
+							continue;
+			}
 			$values = array_map('trim', get_post_custom_values($key));
 			$value = implode($values,', ');
 
@@ -1330,13 +1362,15 @@ 
 
 	// Show Home in the menu
 	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
-			$text = __('Home');
-		else
-			$text = $args['show_home'];
+		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) {
+					$text = __('Home');
+		} else {
+					$text = $args['show_home'];
+		}
 		$class = '';
-		if ( is_front_page() && !is_paged() )
-			$class = 'class="current_page_item"';
+		if ( is_front_page() && !is_paged() ) {
+					$class = 'class="current_page_item"';
+		}
 		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
@@ -1395,11 +1429,12 @@ 
 	 * @param array  $args An array of arguments.
 	 */
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
-		echo $menu;
-	else
-		return $menu;
-}
+	if ( $args['echo'] ) {
+			echo $menu;
+	} else {
+			return $menu;
+	}
+	}
 
 //
 // Page helpers
@@ -1418,14 +1453,16 @@ 
  * @return string
  */
 function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
-		$walker = new Walker_Page;
-	else
-		$walker = $r['walker'];
+	if ( empty($r['walker']) ) {
+			$walker = new Walker_Page;
+	} else {
+			$walker = $r['walker'];
+	}
 
 	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+		if ( $page->post_parent ) {
+					$r['pages_with_children'][ $page->post_parent ] = true;
+		}
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1443,10 +1480,12 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if ( empty($args[2]['walker']) ) {
+		// the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
-	else
-		$walker = $args[2]['walker'];
+	} else {
+			$walker = $args[2]['walker'];
+	}
 
 	return call_user_func_array(array($walker, 'walk'), $args);
 }
@@ -1466,14 +1505,16 @@ 
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.5.0' );
+	}
 
-	if ( $fullsize )
-		echo wp_get_attachment_link($id, 'full', $permalink);
-	else
-		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
-}
+	if ( $fullsize ) {
+			echo wp_get_attachment_link($id, 'full', $permalink);
+	} else {
+			echo wp_get_attachment_link($id, 'thumbnail', $permalink);
+	}
+	}
 
 /**
  * Retrieve an attachment page link using an image or icon, if possible.
@@ -1545,8 +1586,9 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
-		return $content;
+	if ( empty($post->post_type) || $post->post_type != 'attachment' ) {
+			return $content;
+	}
 
 	if ( wp_attachment_is( 'video', $post ) ) {
 		$meta = wp_get_attachment_metadata( get_the_ID() );
@@ -1637,11 +1679,13 @@ 
 
 	$page_template = get_page_template_slug( get_queried_object_id() );
 
-	if ( empty( $template ) )
-		return (bool) $page_template;
+	if ( empty( $template ) ) {
+			return (bool) $page_template;
+	}
 
-	if ( $template == $page_template )
-		return true;
+	if ( $template == $page_template ) {
+			return true;
+	}
 
 	if ( is_array( $template ) ) {
 		if ( ( in_array( 'default', $template, true ) && ! $page_template )
@@ -1690,11 +1734,13 @@ 
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	/* translators: revision date format, see https://secure.php.net/date */
 	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
@@ -1704,13 +1750,15 @@ 
 	$currentf  = __( '%s [Current Revision]' );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$date = sprintf( $currentf, $date );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$date = sprintf( $autosavef, $date );
+	}
 
 	return $date;
 }
@@ -1725,11 +1773,13 @@ 
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	$author = get_the_author_meta( 'display_name', $revision->post_author );
 	/* translators: revision date format, see https://secure.php.net/date */
@@ -1738,8 +1788,9 @@ 
 	$gravatar = get_avatar( $revision->post_author, 24 );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
@@ -1755,10 +1806,11 @@ 
 	/* translators: %s: revision date with author avatar */
 	$currentf  = __( '%s [Current Revision]' );
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$revision_date_author = sprintf( $currentf, $revision_date_author );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	}
 
 	/**
 	 * Filters the formatted author and date for a revision.
@@ -1785,8 +1837,9 @@ 
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
 	if ( is_array( $type ) ) {
@@ -1794,17 +1847,20 @@ 
 		_deprecated_argument( __FUNCTION__, '3.6.0' );
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
-		return;
+	if ( ! $revisions = wp_get_post_revisions( $post->ID ) ) {
+			return;
+	}
 
 	$rows = '';
 	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
-			continue;
+		if ( ! current_user_can( 'read_post', $revision->ID ) ) {
+					continue;
+		}
 
 		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
-			continue;
+		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) ) {
+					continue;
+		}
 
 		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
 	}

Doc Comments +9 added lines, -9 removed lines

@@ -104,7 +104,7 @@ 
  *
  * @since 0.71
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string
  */
 function get_the_title( $post = 0 ) {
@@ -169,7 +169,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
+ * @param integer $post Optional. Post ID or post object. Default is global $post.
  */
 function the_guid( $post = 0 ) {
 	$post = get_post( $post );
@@ -199,7 +199,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
+ * @param integer $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
 function get_the_guid( $post = 0 ) {
@@ -402,7 +402,7 @@ 
  *
  * @since 2.3.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return bool True if the post has a custom excerpt, false otherwise.
  */
 function has_excerpt( $post = 0 ) {
@@ -1461,7 +1461,7 @@ 
  *
  * @since 2.0.0
  *
- * @param int|WP_Post $id Optional. Post ID or post object.
+ * @param integer $id Optional. Post ID or post object.
  * @param bool        $fullsize     Optional, default is false. Whether to use full size.
  * @param bool        $deprecated   Deprecated. Not used.
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
@@ -1482,7 +1482,7 @@ 
  * @since 2.5.0
  * @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object.
  *
- * @param int|WP_Post  $id        Optional. Post ID or post object.
+ * @param integer  $id        Optional. Post ID or post object.
  * @param string|array $size      Optional. Image size. Accepts any valid image size, or an array
  *                                of width and height values in pixels (in that order).
  *                                Default 'thumbnail'.
@@ -1592,7 +1592,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string HTML content for password form for password protected post.
  */
 function get_the_password_form( $post = 0 ) {
@@ -1628,7 +1628,7 @@ 
  * @since 4.2.0 The `$template` parameter was changed to also accept an array of page templates.
  * @since 4.7.0 Now works with any post type, not just pages.
  *
- * @param string|array $template The specific template name or array of templates to match.
+ * @param string $template The specific template name or array of templates to match.
  * @return bool True on success, false on failure.
  */
 function is_page_template( $template = '' ) {
@@ -1782,7 +1782,7 @@ 
  *
  * @since 2.6.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {

Spacing +424 added lines, -424 removed lines

@@ -26,7 +26,7 @@ 
  */
 function get_the_ID() {
 	$post = get_post();
-	return ! empty( $post ) ? $post->ID : false;
+	return ! empty($post) ? $post->ID : false;
 }
 
 /**
@@ -39,15 +39,15 @@ 
  * @param bool   $echo   Optional. Whether to echo or return the title. Default true for echo.
  * @return string|void Current post title if $echo is false.
  */
-function the_title( $before = '', $after = '', $echo = true ) {
+function the_title($before = '', $after = '', $echo = true) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
+	if (strlen($title) == 0)
 		return;
 
-	$title = $before . $title . $after;
+	$title = $before.$title.$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $title;
 	else
 		return $title;
@@ -75,20 +75,20 @@ 
  * }
  * @return string|void String when echo is false.
  */
-function the_title_attribute( $args = '' ) {
-	$defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
-	$r = wp_parse_args( $args, $defaults );
+function the_title_attribute($args = '') {
+	$defaults = array('before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post());
+	$r = wp_parse_args($args, $defaults);
 
-	$title = get_the_title( $r['post'] );
+	$title = get_the_title($r['post']);
 
-	if ( strlen( $title ) == 0 ) {
+	if (strlen($title) == 0) {
 		return;
 	}
 
-	$title = $r['before'] . $title . $r['after'];
-	$title = esc_attr( strip_tags( $title ) );
+	$title = $r['before'].$title.$r['after'];
+	$title = esc_attr(strip_tags($title));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $title;
 	} else {
 		return $title;
@@ -107,14 +107,14 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string
  */
-function get_the_title( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_title($post = 0) {
+	$post = get_post($post);
 
-	$title = isset( $post->post_title ) ? $post->post_title : '';
-	$id = isset( $post->ID ) ? $post->ID : 0;
+	$title = isset($post->post_title) ? $post->post_title : '';
+	$id = isset($post->ID) ? $post->ID : 0;
 
-	if ( ! is_admin() ) {
-		if ( ! empty( $post->post_password ) ) {
+	if ( ! is_admin()) {
+		if ( ! empty($post->post_password)) {
 
 			/**
 			 * Filters the text prepended to the post title for protected posts.
@@ -127,9 +127,9 @@ 
 			 *                         Default 'Protected: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
-			$title = sprintf( $protected_title_format, $title );
-		} elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
+			$protected_title_format = apply_filters('protected_title_format', __('Protected: %s'), $post);
+			$title = sprintf($protected_title_format, $title);
+		} elseif (isset($post->post_status) && 'private' == $post->post_status) {
 
 			/**
 			 * Filters the text prepended to the post title of private posts.
@@ -142,8 +142,8 @@ 
 			 *                         Default 'Private: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
-			$title = sprintf( $private_title_format, $title );
+			$private_title_format = apply_filters('private_title_format', __('Private: %s'), $post);
+			$title = sprintf($private_title_format, $title);
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @param string $title The post title.
 	 * @param int    $id    The post ID.
 	 */
-	return apply_filters( 'the_title', $title, $id );
+	return apply_filters('the_title', $title, $id);
 }
 
 /**
@@ -171,11 +171,11 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  */
-function the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? get_the_guid( $post ) : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? get_the_guid($post) : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filters the escaped Global Unique Identifier (guid) of the post.
@@ -187,7 +187,7 @@ 
 	 * @param string $guid Escaped Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	echo apply_filters( 'the_guid', $guid, $id );
+	echo apply_filters('the_guid', $guid, $id);
 }
 
 /**
@@ -202,11 +202,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
-function get_the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? $post->guid : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? $post->guid : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filters the Global Unique Identifier (guid) of the post.
@@ -216,7 +216,7 @@ 
 	 * @param string $guid Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	return apply_filters( 'get_the_guid', $guid, $id );
+	return apply_filters('get_the_guid', $guid, $id);
 }
 
 /**
@@ -227,8 +227,8 @@ 
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  */
-function the_content( $more_link_text = null, $strip_teaser = false) {
-	$content = get_the_content( $more_link_text, $strip_teaser );
+function the_content($more_link_text = null, $strip_teaser = false) {
+	$content = get_the_content($more_link_text, $strip_teaser);
 
 	/**
 	 * Filters the post content.
@@ -237,8 +237,8 @@ 
 	 *
 	 * @param string $content Content of the current post.
 	 */
-	$content = apply_filters( 'the_content', $content );
-	$content = str_replace( ']]>', ']]>', $content );
+	$content = apply_filters('the_content', $content);
+	$content = str_replace(']]>', ']]>', $content);
 	echo $content;
 }
 
@@ -257,20 +257,20 @@ 
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content($more_link_text = null, $strip_teaser = false) {
 	global $page, $more, $preview, $pages, $multipage;
 
 	$post = get_post();
 
-	if ( null === $more_link_text ) {
+	if (null === $more_link_text) {
 		$more_link_text = sprintf(
 			'<span aria-label="%1$s">%2$s</span>',
 			sprintf(
 				/* translators: %s: Name of current post */
-				__( 'Continue reading %s' ),
-				the_title_attribute( array( 'echo' => false ) )
+				__('Continue reading %s'),
+				the_title_attribute(array('echo' => false))
 			),
-			__( '(more&hellip;)' )
+			__('(more&hellip;)')
 		);
 	}
 
@@ -278,38 +278,38 @@ 
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if (post_password_required($post))
+		return get_the_password_form($post);
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ($page > count($pages)) // if the requested page doesn't exist
+		$page = count($pages); // give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
-	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
-		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+	if (preg_match('/<!--more(.*?)?-->/', $content, $matches)) {
+		$content = explode($matches[0], $content, 2);
+		if ( ! empty($matches[1]) && ! empty($more_link_text))
+			$more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
 
 		$has_teaser = true;
 	} else {
-		$content = array( $content );
+		$content = array($content);
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
+	if (false !== strpos($post->post_content, '<!--noteaser-->') && ( ! $multipage || $page == 1))
 		$strip_teaser = true;
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
+	if ($more && $strip_teaser && $has_teaser)
 		$teaser = '';
 
 	$output .= $teaser;
 
-	if ( count( $content ) > 1 ) {
-		if ( $more ) {
-			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
+	if (count($content) > 1) {
+		if ($more) {
+			$output .= '<span id="more-'.$post->ID.'"></span>'.$content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
+			if ( ! empty($more_link_text))
 
 				/**
 				 * Filters the Read More link text.
@@ -319,13 +319,13 @@ 
 				 * @param string $more_link_element Read More link element.
 				 * @param string $more_link_text    Read More text.
 				 */
-				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
-			$output = force_balance_tags( $output );
+				$output .= apply_filters('the_content_more_link', ' <a href="'.get_permalink()."#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text);
+			$output = force_balance_tags($output);
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
-		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	if ($preview) // Preview fix for JavaScript bug with foreign languages.
+		$output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
 
 	return $output;
 }
@@ -339,8 +339,8 @@ 
  * @param array $match Match array from preg_replace_callback.
  * @return string
  */
-function _convert_urlencoded_to_entities( $match ) {
-	return '&#' . base_convert( $match[1], 16, 10 ) . ';';
+function _convert_urlencoded_to_entities($match) {
+	return '&#'.base_convert($match[1], 16, 10).';';
 }
 
 /**
@@ -359,7 +359,7 @@ 
 	 *
 	 * @param string $post_excerpt The post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt', get_the_excerpt() );
+	echo apply_filters('the_excerpt', get_the_excerpt());
 }
 
 /**
@@ -371,18 +371,18 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string Post excerpt.
  */
-function get_the_excerpt( $post = null ) {
-	if ( is_bool( $post ) ) {
-		_deprecated_argument( __FUNCTION__, '2.3.0' );
+function get_the_excerpt($post = null) {
+	if (is_bool($post)) {
+		_deprecated_argument(__FUNCTION__, '2.3.0');
 	}
 
-	$post = get_post( $post );
-	if ( empty( $post ) ) {
+	$post = get_post($post);
+	if (empty($post)) {
 		return '';
 	}
 
-	if ( post_password_required( $post ) ) {
-		return __( 'There is no excerpt because this is a protected post.' );
+	if (post_password_required($post)) {
+		return __('There is no excerpt because this is a protected post.');
 	}
 
 	/**
@@ -394,7 +394,7 @@ 
 	 * @param string $post_excerpt The post excerpt.
 	 * @param WP_Post $post Post object.
 	 */
-	return apply_filters( 'get_the_excerpt', $post->post_excerpt, $post );
+	return apply_filters('get_the_excerpt', $post->post_excerpt, $post);
 }
 
 /**
@@ -405,9 +405,9 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return bool True if the post has a custom excerpt, false otherwise.
  */
-function has_excerpt( $post = 0 ) {
-	$post = get_post( $post );
-	return ( !empty( $post->post_excerpt ) );
+function has_excerpt($post = 0) {
+	$post = get_post($post);
+	return ( ! empty($post->post_excerpt));
 }
 
 /**
@@ -418,9 +418,9 @@ 
  * @param string|array $class   One or more classes to add to the class list.
  * @param int|WP_Post  $post_id Optional. Post ID or post object. Defaults to the global `$post`.
  */
-function post_class( $class = '', $post_id = null ) {
+function post_class($class = '', $post_id = null) {
 	// Separates classes with a single space, collates classes for post DIV
-	echo 'class="' . join( ' ', get_post_class( $class, $post_id ) ) . '"';
+	echo 'class="'.join(' ', get_post_class($class, $post_id)).'"';
 }
 
 /**
@@ -444,60 +444,60 @@ 
  * @param int|WP_Post  $post_id Optional. Post ID or post object.
  * @return array Array of classes.
  */
-function get_post_class( $class = '', $post_id = null ) {
-	$post = get_post( $post_id );
+function get_post_class($class = '', $post_id = null) {
+	$post = get_post($post_id);
 
 	$classes = array();
 
-	if ( $class ) {
-		if ( ! is_array( $class ) ) {
-			$class = preg_split( '#\s+#', $class );
+	if ($class) {
+		if ( ! is_array($class)) {
+			$class = preg_split('#\s+#', $class);
 		}
-		$classes = array_map( 'esc_attr', $class );
+		$classes = array_map('esc_attr', $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return $classes;
 	}
 
-	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
+	$classes[] = 'post-'.$post->ID;
+	if ( ! is_admin())
 		$classes[] = $post->post_type;
-	$classes[] = 'type-' . $post->post_type;
-	$classes[] = 'status-' . $post->post_status;
+	$classes[] = 'type-'.$post->post_type;
+	$classes[] = 'status-'.$post->post_status;
 
 	// Post Format
-	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-		$post_format = get_post_format( $post->ID );
+	if (post_type_supports($post->post_type, 'post-formats')) {
+		$post_format = get_post_format($post->ID);
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
+		if ($post_format && ! is_wp_error($post_format))
+			$classes[] = 'format-'.sanitize_html_class($post_format);
 		else
 			$classes[] = 'format-standard';
 	}
 
-	$post_password_required = post_password_required( $post->ID );
+	$post_password_required = post_password_required($post->ID);
 
 	// Post requires password.
-	if ( $post_password_required ) {
+	if ($post_password_required) {
 		$classes[] = 'post-password-required';
-	} elseif ( ! empty( $post->post_password ) ) {
+	} elseif ( ! empty($post->post_password)) {
 		$classes[] = 'post-password-protected';
 	}
 
 	// Post thumbnails.
-	if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) && ! is_attachment( $post ) && ! $post_password_required ) {
+	if (current_theme_supports('post-thumbnails') && has_post_thumbnail($post->ID) && ! is_attachment($post) && ! $post_password_required) {
 		$classes[] = 'has-post-thumbnail';
 	}
 
 	// sticky for Sticky Posts
-	if ( is_sticky( $post->ID ) ) {
-		if ( is_home() && ! is_paged() ) {
+	if (is_sticky($post->ID)) {
+		if (is_home() && ! is_paged()) {
 			$classes[] = 'sticky';
-		} elseif ( is_admin() ) {
+		} elseif (is_admin()) {
 			$classes[] = 'status-sticky';
 		}
 	}
@@ -506,30 +506,30 @@ 
 	$classes[] = 'hentry';
 
 	// All public taxonomies
-	$taxonomies = get_taxonomies( array( 'public' => true ) );
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
-			foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) {
-				if ( empty( $term->slug ) ) {
+	$taxonomies = get_taxonomies(array('public' => true));
+	foreach ((array) $taxonomies as $taxonomy) {
+		if (is_object_in_taxonomy($post->post_type, $taxonomy)) {
+			foreach ((array) get_the_terms($post->ID, $taxonomy) as $term) {
+				if (empty($term->slug)) {
 					continue;
 				}
 
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
 				// 'post_tag' uses the 'tag' prefix for backward compatibility.
-				if ( 'post_tag' == $taxonomy ) {
-					$classes[] = 'tag-' . $term_class;
+				if ('post_tag' == $taxonomy) {
+					$classes[] = 'tag-'.$term_class;
 				} else {
-					$classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
+					$classes[] = sanitize_html_class($taxonomy.'-'.$term_class, $taxonomy.'-'.$term->term_id);
 				}
 			}
 		}
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filters the list of CSS classes for the current post.
@@ -540,9 +540,9 @@ 
 	 * @param array $class   An array of additional classes added to the post.
 	 * @param int   $post_id The post ID.
 	 */
-	$classes = apply_filters( 'post_class', $classes, $class, $post->ID );
+	$classes = apply_filters('post_class', $classes, $class, $post->ID);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -552,9 +552,9 @@ 
  *
  * @param string|array $class One or more classes to add to the class list.
  */
-function body_class( $class = '' ) {
+function body_class($class = '') {
 	// Separates classes with a single space, collates classes for body element
-	echo 'class="' . join( ' ', get_body_class( $class ) ) . '"';
+	echo 'class="'.join(' ', get_body_class($class)).'"';
 }
 
 /**
@@ -567,197 +567,197 @@ 
  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
-function get_body_class( $class = '' ) {
+function get_body_class($class = '') {
 	global $wp_query;
 
 	$classes = array();
 
-	if ( is_rtl() )
+	if (is_rtl())
 		$classes[] = 'rtl';
 
-	if ( is_front_page() )
+	if (is_front_page())
 		$classes[] = 'home';
-	if ( is_home() )
+	if (is_home())
 		$classes[] = 'blog';
-	if ( is_archive() )
+	if (is_archive())
 		$classes[] = 'archive';
-	if ( is_date() )
+	if (is_date())
 		$classes[] = 'date';
-	if ( is_search() ) {
+	if (is_search()) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
+	if (is_paged())
 		$classes[] = 'paged';
-	if ( is_attachment() )
+	if (is_attachment())
 		$classes[] = 'attachment';
-	if ( is_404() )
+	if (is_404())
 		$classes[] = 'error404';
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 		$post_id = $wp_query->get_queried_object_id();
 		$post = $wp_query->get_queried_object();
 		$post_type = $post->post_type;
 
-		if ( is_page_template() ) {
+		if (is_page_template()) {
 			$classes[] = "{$post_type}-template";
 
-			$template_slug  = get_page_template_slug( $post_id );
-			$template_parts = explode( '/', $template_slug );
+			$template_slug  = get_page_template_slug($post_id);
+			$template_parts = explode('/', $template_slug);
 
-			foreach ( $template_parts as $part ) {
-				$classes[] = "{$post_type}-template-" . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
+			foreach ($template_parts as $part) {
+				$classes[] = "{$post_type}-template-".sanitize_html_class(str_replace(array('.', '/'), '-', basename($part, '.php')));
 			}
-			$classes[] = "{$post_type}-template-" . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
+			$classes[] = "{$post_type}-template-".sanitize_html_class(str_replace('.', '-', $template_slug));
 		} else {
 			$classes[] = "{$post_type}-template-default";
 		}
 
-		if ( is_single() ) {
+		if (is_single()) {
 			$classes[] = 'single';
-			if ( isset( $post->post_type ) ) {
-				$classes[] = 'single-' . sanitize_html_class( $post->post_type, $post_id );
-				$classes[] = 'postid-' . $post_id;
+			if (isset($post->post_type)) {
+				$classes[] = 'single-'.sanitize_html_class($post->post_type, $post_id);
+				$classes[] = 'postid-'.$post_id;
 
 				// Post Format
-				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-					$post_format = get_post_format( $post->ID );
+				if (post_type_supports($post->post_type, 'post-formats')) {
+					$post_format = get_post_format($post->ID);
 
-					if ( $post_format && !is_wp_error($post_format) )
-						$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+					if ($post_format && ! is_wp_error($post_format))
+						$classes[] = 'single-format-'.sanitize_html_class($post_format);
 					else
 						$classes[] = 'single-format-standard';
 				}
 			}
 		}
 
-		if ( is_attachment() ) {
+		if (is_attachment()) {
 			$mime_type = get_post_mime_type($post_id);
-			$mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
-			$classes[] = 'attachmentid-' . $post_id;
-			$classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
-		} elseif ( is_page() ) {
+			$mime_prefix = array('application/', 'image/', 'text/', 'audio/', 'video/', 'music/');
+			$classes[] = 'attachmentid-'.$post_id;
+			$classes[] = 'attachment-'.str_replace($mime_prefix, '', $mime_type);
+		} elseif (is_page()) {
 			$classes[] = 'page';
 
 			$page_id = $wp_query->get_queried_object_id();
 
 			$post = get_post($page_id);
 
-			$classes[] = 'page-id-' . $page_id;
+			$classes[] = 'page-id-'.$page_id;
 
-			if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {
+			if (get_pages(array('parent' => $page_id, 'number' => 1))) {
 				$classes[] = 'page-parent';
 			}
 
-			if ( $post->post_parent ) {
+			if ($post->post_parent) {
 				$classes[] = 'page-child';
-				$classes[] = 'parent-pageid-' . $post->post_parent;
+				$classes[] = 'parent-pageid-'.$post->post_parent;
 			}
 		}
-	} elseif ( is_archive() ) {
-		if ( is_post_type_archive() ) {
+	} elseif (is_archive()) {
+		if (is_post_type_archive()) {
 			$classes[] = 'post-type-archive';
-			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
-		} elseif ( is_author() ) {
+			$post_type = get_query_var('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$classes[] = 'post-type-archive-'.sanitize_html_class($post_type);
+		} elseif (is_author()) {
 			$author = $wp_query->get_queried_object();
 			$classes[] = 'author';
-			if ( isset( $author->user_nicename ) ) {
-				$classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
-				$classes[] = 'author-' . $author->ID;
+			if (isset($author->user_nicename)) {
+				$classes[] = 'author-'.sanitize_html_class($author->user_nicename, $author->ID);
+				$classes[] = 'author-'.$author->ID;
 			}
-		} elseif ( is_category() ) {
+		} elseif (is_category()) {
 			$cat = $wp_query->get_queried_object();
 			$classes[] = 'category';
-			if ( isset( $cat->term_id ) ) {
-				$cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
-				if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) {
+			if (isset($cat->term_id)) {
+				$cat_class = sanitize_html_class($cat->slug, $cat->term_id);
+				if (is_numeric($cat_class) || ! trim($cat_class, '-')) {
 					$cat_class = $cat->term_id;
 				}
 
-				$classes[] = 'category-' . $cat_class;
-				$classes[] = 'category-' . $cat->term_id;
+				$classes[] = 'category-'.$cat_class;
+				$classes[] = 'category-'.$cat->term_id;
 			}
-		} elseif ( is_tag() ) {
+		} elseif (is_tag()) {
 			$tag = $wp_query->get_queried_object();
 			$classes[] = 'tag';
-			if ( isset( $tag->term_id ) ) {
-				$tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
-				if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
+			if (isset($tag->term_id)) {
+				$tag_class = sanitize_html_class($tag->slug, $tag->term_id);
+				if (is_numeric($tag_class) || ! trim($tag_class, '-')) {
 					$tag_class = $tag->term_id;
 				}
 
-				$classes[] = 'tag-' . $tag_class;
-				$classes[] = 'tag-' . $tag->term_id;
+				$classes[] = 'tag-'.$tag_class;
+				$classes[] = 'tag-'.$tag->term_id;
 			}
-		} elseif ( is_tax() ) {
+		} elseif (is_tax()) {
 			$term = $wp_query->get_queried_object();
-			if ( isset( $term->term_id ) ) {
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+			if (isset($term->term_id)) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
-				$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-				$classes[] = 'term-' . $term_class;
-				$classes[] = 'term-' . $term->term_id;
+				$classes[] = 'tax-'.sanitize_html_class($term->taxonomy);
+				$classes[] = 'term-'.$term_class;
+				$classes[] = 'term-'.$term->term_id;
 			}
 		}
 	}
 
-	if ( is_user_logged_in() )
+	if (is_user_logged_in())
 		$classes[] = 'logged-in';
 
-	if ( is_admin_bar_showing() ) {
+	if (is_admin_bar_showing()) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
+	if (get_background_color() !== get_theme_support('custom-background', 'default-color') || get_background_image())
 		$classes[] = 'custom-background';
 
-	if ( has_custom_logo() ) {
+	if (has_custom_logo()) {
 		$classes[] = 'wp-custom-logo';
 	}
 
-	$page = $wp_query->get( 'page' );
-
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
-
-	if ( $page && $page > 1 && ! is_404() ) {
-		$classes[] = 'paged-' . $page;
-
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+	$page = $wp_query->get('page');
+
+	if ( ! $page || $page < 2)
+		$page = $wp_query->get('paged');
+
+	if ($page && $page > 1 && ! is_404()) {
+		$classes[] = 'paged-'.$page;
+
+		if (is_single())
+			$classes[] = 'single-paged-'.$page;
+		elseif (is_page())
+			$classes[] = 'page-paged-'.$page;
+		elseif (is_category())
+			$classes[] = 'category-paged-'.$page;
+		elseif (is_tag())
+			$classes[] = 'tag-paged-'.$page;
+		elseif (is_date())
+			$classes[] = 'date-paged-'.$page;
+		elseif (is_author())
+			$classes[] = 'author-paged-'.$page;
+		elseif (is_search())
+			$classes[] = 'search-paged-'.$page;
+		elseif (is_post_type_archive())
+			$classes[] = 'post-type-paged-'.$page;
 	}
 
-	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
-		$classes = array_merge( $classes, $class );
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
+			$class = preg_split('#\s+#', $class);
+		$classes = array_merge($classes, $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filters the list of CSS body classes for the current post or page.
@@ -767,9 +767,9 @@ 
 	 * @param array $classes An array of body classes.
 	 * @param array $class   An array of additional classes added to the body.
 	 */
-	$classes = apply_filters( 'body_class', $classes, $class );
+	$classes = apply_filters('body_class', $classes, $class);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -780,27 +780,27 @@ 
  * @param int|WP_Post|null $post An optional post. Global $post used if not provided.
  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
-function post_password_required( $post = null ) {
+function post_password_required($post = null) {
 	$post = get_post($post);
 
-	if ( empty( $post->post_password ) ) {
+	if (empty($post->post_password)) {
 		/** This filter is documented in wp-includes/post.php */
-		return apply_filters( 'post_password_required', false, $post );
+		return apply_filters('post_password_required', false, $post);
 	}
 
-	if ( ! isset( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ) ) {
+	if ( ! isset($_COOKIE['wp-postpass_'.COOKIEHASH])) {
 		/** This filter is documented in wp-includes/post.php */
-		return apply_filters( 'post_password_required', true, $post );
+		return apply_filters('post_password_required', true, $post);
 	}
 
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+	require_once ABSPATH.WPINC.'/class-phpass.php';
+	$hasher = new PasswordHash(8, true);
 
-	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) ) {
+	$hash = wp_unslash($_COOKIE['wp-postpass_'.COOKIEHASH]);
+	if (0 !== strpos($hash, '$P$B')) {
 		$required = true;
 	} else {
-		$required = ! $hasher->CheckPassword( $post->post_password, $hash );
+		$required = ! $hasher->CheckPassword($post->post_password, $hash);
 	}
 
 	/**
@@ -812,7 +812,7 @@ 
 	 *                          provided or is incorrect, false if password has been supplied or is not required.
 	 * @param WP_Post $post     Post data.
 	 */
-	return apply_filters( 'post_password_required', $required, $post );
+	return apply_filters('post_password_required', $required, $post);
 }
 
 //
@@ -853,23 +853,23 @@ 
  * }
  * @return string Formatted output in HTML.
  */
-function wp_link_pages( $args = '' ) {
+function wp_link_pages($args = '') {
 	global $page, $numpages, $multipage, $more;
 
 	$defaults = array(
-		'before'           => '<p>' . __( 'Pages:' ),
+		'before'           => '<p>'.__('Pages:'),
 		'after'            => '</p>',
 		'link_before'      => '',
 		'link_after'       => '',
 		'next_or_number'   => 'number',
 		'separator'        => ' ',
-		'nextpagelink'     => __( 'Next page' ),
-		'previouspagelink' => __( 'Previous page' ),
+		'nextpagelink'     => __('Next page'),
+		'previouspagelink' => __('Previous page'),
 		'pagelink'         => '%',
 		'echo'             => 1
 	);
 
-	$params = wp_parse_args( $args, $defaults );
+	$params = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters the arguments used in retrieving page links for paginated posts.
@@ -878,16 +878,16 @@ 
 	 *
 	 * @param array $params An array of arguments for page links for paginated posts.
 	 */
-	$r = apply_filters( 'wp_link_pages_args', $params );
+	$r = apply_filters('wp_link_pages_args', $params);
 
 	$output = '';
-	if ( $multipage ) {
-		if ( 'number' == $r['next_or_number'] ) {
+	if ($multipage) {
+		if ('number' == $r['next_or_number']) {
 			$output .= $r['before'];
-			for ( $i = 1; $i <= $numpages; $i++ ) {
-				$link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
-				if ( $i != $page || ! $more && 1 == $page ) {
-					$link = _wp_link_page( $i ) . $link . '</a>';
+			for ($i = 1; $i <= $numpages; $i++) {
+				$link = $r['link_before'].str_replace('%', $i, $r['pagelink']).$r['link_after'];
+				if ($i != $page || ! $more && 1 == $page) {
+					$link = _wp_link_page($i).$link.'</a>';
 				}
 				/**
 				 * Filters the HTML output of individual page number links.
@@ -897,31 +897,31 @@ 
 				 * @param string $link The page number HTML output.
 				 * @param int    $i    Page number for paginated posts' page links.
 				 */
-				$link = apply_filters( 'wp_link_pages_link', $link, $i );
+				$link = apply_filters('wp_link_pages_link', $link, $i);
 
 				// Use the custom links separator beginning with the second link.
-				$output .= ( 1 === $i ) ? ' ' : $r['separator'];
+				$output .= (1 === $i) ? ' ' : $r['separator'];
 				$output .= $link;
 			}
 			$output .= $r['after'];
-		} elseif ( $more ) {
+		} elseif ($more) {
 			$output .= $r['before'];
 			$prev = $page - 1;
-			if ( $prev > 0 ) {
-				$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
+			if ($prev > 0) {
+				$link = _wp_link_page($prev).$r['link_before'].$r['previouspagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $prev );
+				$output .= apply_filters('wp_link_pages_link', $link, $prev);
 			}
 			$next = $page + 1;
-			if ( $next <= $numpages ) {
-				if ( $prev ) {
+			if ($next <= $numpages) {
+				if ($prev) {
 					$output .= $r['separator'];
 				}
-				$link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
+				$link = _wp_link_page($next).$r['link_before'].$r['nextpagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $next );
+				$output .= apply_filters('wp_link_pages_link', $link, $next);
 			}
 			$output .= $r['after'];
 		}
@@ -935,9 +935,9 @@ 
 	 * @param string $output HTML output of paginated posts' page links.
 	 * @param array  $args   An array of arguments.
 	 */
-	$html = apply_filters( 'wp_link_pages', $output, $args );
+	$html = apply_filters('wp_link_pages', $output, $args);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -954,33 +954,33 @@ 
  * @param int $i Page number.
  * @return string Link.
  */
-function _wp_link_page( $i ) {
+function _wp_link_page($i) {
 	global $wp_rewrite;
 	$post = get_post();
 	$query_args = array();
 
-	if ( 1 == $i ) {
+	if (1 == $i) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		if ('' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')))
+			$url = add_query_arg('page', $i, get_permalink());
+		elseif ('page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID)
+			$url = trailingslashit(get_permalink()).user_trailingslashit("$wp_rewrite->pagination_base/".$i, 'single_paged');
 		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+			$url = trailingslashit(get_permalink()).user_trailingslashit($i, 'single_paged');
 	}
 
-	if ( is_preview() ) {
+	if (is_preview()) {
 
-		if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
-			$query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
-			$query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
+		if (('draft' !== $post->post_status) && isset($_GET['preview_id'], $_GET['preview_nonce'])) {
+			$query_args['preview_id'] = wp_unslash($_GET['preview_id']);
+			$query_args['preview_nonce'] = wp_unslash($_GET['preview_nonce']);
 		}
 
-		$url = get_preview_post_link( $post, $query_args, $url );
+		$url = get_preview_post_link($post, $query_args, $url);
 	}
 
-	return '<a href="' . esc_url( $url ) . '">';
+	return '<a href="'.esc_url($url).'">';
 }
 
 //
@@ -995,12 +995,12 @@ 
  * @param string $key Meta data key name.
  * @return false|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist.
  */
-function post_custom( $key = '' ) {
+function post_custom($key = '') {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
+	if ( ! isset($custom[$key]))
 		return false;
-	elseif ( 1 == count($custom[$key]) )
+	elseif (1 == count($custom[$key]))
 		return $custom[$key][0];
 	else
 		return $custom[$key];
@@ -1015,14 +1015,14 @@ 
  *
  */
 function the_meta() {
-	if ( $keys = get_post_custom_keys() ) {
+	if ($keys = get_post_custom_keys()) {
 		echo "<ul class='post-meta'>\n";
-		foreach ( (array) $keys as $key ) {
+		foreach ((array) $keys as $key) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
+			if (is_protected_meta($keyt, 'post'))
 				continue;
 			$values = array_map('trim', get_post_custom_values($key));
-			$value = implode($values,', ');
+			$value = implode($values, ', ');
 
 			/**
 			 * Filters the HTML output of the li element in the post custom fields list.
@@ -1033,7 +1033,7 @@ 
 			 * @param string $key   Meta key.
 			 * @param string $value Meta value.
 			 */
-			echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
+			echo apply_filters('the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value);
 		}
 		echo "</ul>\n";
 	}
@@ -1071,7 +1071,7 @@ 
  * }
  * @return string HTML content, if not displaying.
  */
-function wp_dropdown_pages( $args = '' ) {
+function wp_dropdown_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'child_of' => 0,
 		'selected' => 0, 'echo' => 1,
@@ -1082,29 +1082,29 @@ 
 		'value_field' => 'ID',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 	$output = '';
 	// Back-compat with old system where both id and name were based on $name argument
-	if ( empty( $r['id'] ) ) {
+	if (empty($r['id'])) {
 		$r['id'] = $r['name'];
 	}
 
-	if ( ! empty( $pages ) ) {
+	if ( ! empty($pages)) {
 		$class = '';
-		if ( ! empty( $r['class'] ) ) {
-			$class = " class='" . esc_attr( $r['class'] ) . "'";
+		if ( ! empty($r['class'])) {
+			$class = " class='".esc_attr($r['class'])."'";
 		}
 
-		$output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n";
-		if ( $r['show_option_no_change'] ) {
-			$output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+		$output = "<select name='".esc_attr($r['name'])."'".$class." id='".esc_attr($r['id'])."'>\n";
+		if ($r['show_option_no_change']) {
+			$output .= "\t<option value=\"-1\">".$r['show_option_no_change']."</option>\n";
 		}
-		if ( $r['show_option_none'] ) {
-			$output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+		if ($r['show_option_none']) {
+			$output .= "\t<option value=\"".esc_attr($r['option_none_value']).'">'.$r['show_option_none']."</option>\n";
 		}
-		$output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
+		$output .= walk_page_dropdown_tree($pages, $r['depth'], $r);
 		$output .= "</select>\n";
 	}
 
@@ -1118,9 +1118,9 @@ 
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
  	 */
-	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
+	$html = apply_filters('wp_dropdown_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1166,14 +1166,14 @@ 
  * }
  * @return string|void HTML list of pages.
  */
-function wp_list_pages( $args = '' ) {
+function wp_list_pages($args = '') {
 	$defaults = array(
 		'depth'        => 0,
 		'show_date'    => '',
-		'date_format'  => get_option( 'date_format' ),
+		'date_format'  => get_option('date_format'),
 		'child_of'     => 0,
 		'exclude'      => '',
-		'title_li'     => __( 'Pages' ),
+		'title_li'     => __('Pages'),
 		'echo'         => 1,
 		'authors'      => '',
 		'sort_column'  => 'menu_order, post_title',
@@ -1183,9 +1183,9 @@ 
 		'walker'       => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	if ( ! in_array( $r['item_spacing'], array( 'preserve', 'discard' ), true ) ) {
+	if ( ! in_array($r['item_spacing'], array('preserve', 'discard'), true)) {
 		// invalid value, fall back to default.
 		$r['item_spacing'] = $defaults['item_spacing'];
 	}
@@ -1194,10 +1194,10 @@ 
 	$current_page = 0;
 
 	// sanitize, mostly to keep spaces out
-	$r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
+	$r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
 
 	// Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-	$exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
+	$exclude_array = ($r['exclude']) ? explode(',', $r['exclude']) : array();
 
 	/**
 	 * Filters the array of pages to exclude from the pages list.
@@ -1206,29 +1206,29 @@ 
 	 *
 	 * @param array $exclude_array An array of page IDs to exclude.
 	 */
-	$r['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
+	$r['exclude'] = implode(',', apply_filters('wp_list_pages_excludes', $exclude_array));
 
 	// Query pages.
 	$r['hierarchical'] = 0;
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 
-	if ( ! empty( $pages ) ) {
-		if ( $r['title_li'] ) {
-			$output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+	if ( ! empty($pages)) {
+		if ($r['title_li']) {
+			$output .= '<li class="pagenav">'.$r['title_li'].'<ul>';
 		}
 		global $wp_query;
-		if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
+		if (is_page() || is_attachment() || $wp_query->is_posts_page) {
 			$current_page = get_queried_object_id();
-		} elseif ( is_singular() ) {
+		} elseif (is_singular()) {
 			$queried_object = get_queried_object();
-			if ( is_post_type_hierarchical( $queried_object->post_type ) ) {
+			if (is_post_type_hierarchical($queried_object->post_type)) {
 				$current_page = $queried_object->ID;
 			}
 		}
 
-		$output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
+		$output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
 
-		if ( $r['title_li'] ) {
+		if ($r['title_li']) {
 			$output .= '</ul></li>';
 		}
 	}
@@ -1245,9 +1245,9 @@ 
 	 * @param array  $r      An array of page-listing arguments.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
 	 */
-	$html = apply_filters( 'wp_list_pages', $output, $r, $pages );
+	$html = apply_filters('wp_list_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	} else {
 		return $html;
@@ -1285,7 +1285,7 @@ 
  * }
  * @return string|void HTML menu
  */
-function wp_page_menu( $args = array() ) {
+function wp_page_menu($args = array()) {
 	$defaults = array(
 		'sort_column'  => 'menu_order, post_title',
 		'menu_id'      => '',
@@ -1299,14 +1299,14 @@ 
 		'item_spacing' => 'discard',
 		'walker'       => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ) ) ) {
+	if ( ! in_array($args['item_spacing'], array('preserve', 'discard'))) {
 		// invalid value, fall back to default.
 		$args['item_spacing'] = $defaults['item_spacing'];
 	}
 
-	if ( 'preserve' === $args['item_spacing'] ) {
+	if ('preserve' === $args['item_spacing']) {
 		$t = "\t";
 		$n = "\n";
 	} else {
@@ -1323,25 +1323,25 @@ 
 	 *
 	 * @param array $args An array of page menu arguments.
 	 */
-	$args = apply_filters( 'wp_page_menu_args', $args );
+	$args = apply_filters('wp_page_menu_args', $args);
 
 	$menu = '';
 
 	$list_args = $args;
 
 	// Show Home in the menu
-	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
+	if ( ! empty($args['show_home'])) {
+		if (true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'])
 			$text = __('Home');
 		else
 			$text = $args['show_home'];
 		$class = '';
-		if ( is_front_page() && !is_paged() )
+		if (is_front_page() && ! is_paged())
 			$class = 'class="current_page_item"';
-		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+		$menu .= '<li '.$class.'><a href="'.home_url('/').'">'.$args['link_before'].$text.$args['link_after'].'</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
-			if ( !empty( $list_args['exclude'] ) ) {
+			if ( ! empty($list_args['exclude'])) {
 				$list_args['exclude'] .= ',';
 			} else {
 				$list_args['exclude'] = '';
@@ -1352,38 +1352,38 @@ 
 
 	$list_args['echo'] = false;
 	$list_args['title_li'] = '';
-	$menu .= wp_list_pages( $list_args );
+	$menu .= wp_list_pages($list_args);
 
-	$container = sanitize_text_field( $args['container'] );
+	$container = sanitize_text_field($args['container']);
 
 	// Fallback in case `wp_nav_menu()` was called without a container.
-	if ( empty( $container ) ) {
+	if (empty($container)) {
 		$container = 'div';
 	}
 
-	if ( $menu ) {
+	if ($menu) {
 
 		// wp_nav_menu doesn't set before and after
-		if ( isset( $args['fallback_cb'] ) &&
+		if (isset($args['fallback_cb']) &&
 			'wp_page_menu' === $args['fallback_cb'] &&
-			'ul' !== $container ) {
+			'ul' !== $container) {
 			$args['before'] = "<ul>{$n}";
 			$args['after'] = '</ul>';
 		}
 
-		$menu = $args['before'] . $menu . $args['after'];
+		$menu = $args['before'].$menu.$args['after'];
 	}
 
 	$attrs = '';
-	if ( ! empty( $args['menu_id'] ) ) {
-		$attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"';
+	if ( ! empty($args['menu_id'])) {
+		$attrs .= ' id="'.esc_attr($args['menu_id']).'"';
 	}
 
-	if ( ! empty( $args['menu_class'] ) ) {
-		$attrs .= ' class="' . esc_attr( $args['menu_class'] ) . '"';
+	if ( ! empty($args['menu_class'])) {
+		$attrs .= ' class="'.esc_attr($args['menu_class']).'"';
 	}
 
-	$menu = "<{$container}{$attrs}>" . $menu . "</{$container}>{$n}";
+	$menu = "<{$container}{$attrs}>".$menu."</{$container}>{$n}";
 
 	/**
 	 * Filters the HTML output of a page-based menu.
@@ -1395,8 +1395,8 @@ 
 	 * @param string $menu The HTML output.
 	 * @param array  $args An array of arguments.
 	 */
-	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
+	$menu = apply_filters('wp_page_menu', $menu, $args);
+	if ($args['echo'])
 		echo $menu;
 	else
 		return $menu;
@@ -1418,15 +1418,15 @@ 
  * @param array $r
  * @return string
  */
-function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
+function walk_page_tree($pages, $depth, $current_page, $r) {
+	if (empty($r['walker']))
 		$walker = new Walker_Page;
 	else
 		$walker = $r['walker'];
 
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+	foreach ((array) $pages as $page) {
+		if ($page->post_parent)
+			$r['pages_with_children'][$page->post_parent] = true;
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1444,7 +1444,7 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if (empty($args[2]['walker'])) // the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
 	else
 		$walker = $args[2]['walker'];
@@ -1466,11 +1466,11 @@ 
  * @param bool        $deprecated   Deprecated. Not used.
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
-function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $permalink = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.5.0');
 
-	if ( $fullsize )
+	if ($fullsize)
 		echo wp_get_attachment_link($id, 'full', $permalink);
 	else
 		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
@@ -1493,31 +1493,31 @@ 
  * @param array|string $attr      Optional. Array or string of attributes. Default empty.
  * @return string HTML content.
  */
-function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
-	$_post = get_post( $id );
+function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '') {
+	$_post = get_post($id);
 
-	if ( empty( $_post ) || ( 'attachment' !== $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) {
-		return __( 'Missing Attachment' );
+	if (empty($_post) || ('attachment' !== $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID)) {
+		return __('Missing Attachment');
 	}
 
-	if ( $permalink ) {
-		$url = get_attachment_link( $_post->ID );
+	if ($permalink) {
+		$url = get_attachment_link($_post->ID);
 	}
 
-	if ( $text ) {
+	if ($text) {
 		$link_text = $text;
-	} elseif ( $size && 'none' != $size ) {
-		$link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr );
+	} elseif ($size && 'none' != $size) {
+		$link_text = wp_get_attachment_image($_post->ID, $size, $icon, $attr);
 	} else {
 		$link_text = '';
 	}
 
-	if ( '' === trim( $link_text ) ) {
+	if ('' === trim($link_text)) {
 		$link_text = $_post->post_title;
 	}
 
-	if ( '' === trim( $link_text ) ) {
-		$link_text = esc_html( pathinfo( get_attached_file( $_post->ID ), PATHINFO_FILENAME ) );
+	if ('' === trim($link_text)) {
+		$link_text = esc_html(pathinfo(get_attached_file($_post->ID), PATHINFO_FILENAME));
 	}
 	/**
 	 * Filters a retrieved attachment page link.
@@ -1532,7 +1532,7 @@ 
 	 * @param bool         $icon      Whether to include an icon. Default false.
 	 * @param string|bool  $text      If string, will be link text. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_link', "<a href='" . esc_url( $url ) . "'>$link_text</a>", $id, $size, $permalink, $icon, $text );
+	return apply_filters('wp_get_attachment_link', "<a href='".esc_url($url)."'>$link_text</a>", $id, $size, $permalink, $icon, $text);
 }
 
 /**
@@ -1546,22 +1546,22 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
+	if (empty($post->post_type) || $post->post_type != 'attachment')
 		return $content;
 
-	if ( wp_attachment_is( 'video', $post ) ) {
-		$meta = wp_get_attachment_metadata( get_the_ID() );
-		$atts = array( 'src' => wp_get_attachment_url() );
-		if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+	if (wp_attachment_is('video', $post)) {
+		$meta = wp_get_attachment_metadata(get_the_ID());
+		$atts = array('src' => wp_get_attachment_url());
+		if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 			$atts['width'] = (int) $meta['width'];
 			$atts['height'] = (int) $meta['height'];
 		}
-		if ( has_post_thumbnail() ) {
-			$atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() );
+		if (has_post_thumbnail()) {
+			$atts['poster'] = wp_get_attachment_url(get_post_thumbnail_id());
 		}
-		$p = wp_video_shortcode( $atts );
-	} elseif ( wp_attachment_is( 'audio', $post ) ) {
-		$p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );
+		$p = wp_video_shortcode($atts);
+	} elseif (wp_attachment_is('audio', $post)) {
+		$p = wp_audio_shortcode(array('src' => wp_get_attachment_url()));
 	} else {
 		$p = '<p class="attachment">';
 		// show the medium sized image representation of the attachment if available, and link to the raw file
@@ -1578,7 +1578,7 @@ 
 	 *
 	 * @param string $p The attachment HTML output.
 	 */
-	$p = apply_filters( 'prepend_attachment', $p );
+	$p = apply_filters('prepend_attachment', $p);
 
 	return "$p\n$content";
 }
@@ -1595,12 +1595,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string HTML content for password form for password protected post.
  */
-function get_the_password_form( $post = 0 ) {
-	$post = get_post( $post );
-	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
-	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
-	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
+function get_the_password_form($post = 0) {
+	$post = get_post($post);
+	$label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
+	$output = '<form action="'.esc_url(site_url('wp-login.php?action=postpass', 'login_post')).'" class="post-password-form" method="post">
+	<p>' . __('This content is password protected. To view it please enter your password below:').'</p>
+	<p><label for="' . $label.'">'.__('Password:').' <input name="post_password" id="'.$label.'" type="password" size="20" /></label> <input type="submit" name="Submit" value="'.esc_attr_x('Enter', 'post password form').'" /></p></form>
 	';
 
 	/**
@@ -1614,7 +1614,7 @@ 
 	 *
 	 * @param string $output The password form HTML output.
 	 */
-	return apply_filters( 'the_password_form', $output );
+	return apply_filters('the_password_form', $output);
 }
 
 /**
@@ -1631,28 +1631,28 @@ 
  * @param string|array $template The specific template name or array of templates to match.
  * @return bool True on success, false on failure.
  */
-function is_page_template( $template = '' ) {
-	if ( ! is_singular() ) {
+function is_page_template($template = '') {
+	if ( ! is_singular()) {
 		return false;
 	}
 
-	$page_template = get_page_template_slug( get_queried_object_id() );
+	$page_template = get_page_template_slug(get_queried_object_id());
 
-	if ( empty( $template ) )
+	if (empty($template))
 		return (bool) $page_template;
 
-	if ( $template == $page_template )
+	if ($template == $page_template)
 		return true;
 
-	if ( is_array( $template ) ) {
-		if ( ( in_array( 'default', $template, true ) && ! $page_template )
-			|| in_array( $page_template, $template, true )
+	if (is_array($template)) {
+		if ((in_array('default', $template, true) && ! $page_template)
+			|| in_array($page_template, $template, true)
 		) {
 			return true;
 		}
 	}
 
-	return ( 'default' === $template && ! $page_template );
+	return ('default' === $template && ! $page_template);
 }
 
 /**
@@ -1665,16 +1665,16 @@ 
  * @return string|false Page template filename. Returns an empty string when the default page template
  * 	is in use. Returns false if the post does not exist.
  */
-function get_page_template_slug( $post = null ) {
-	$post = get_post( $post );
+function get_page_template_slug($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$template = get_post_meta( $post->ID, '_wp_page_template', true );
+	$template = get_post_meta($post->ID, '_wp_page_template', true);
 
-	if ( ! $template || 'default' == $template ) {
+	if ( ! $template || 'default' == $template) {
 		return '';
 	}
 
@@ -1690,28 +1690,28 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
 	/* translators: revision date format, see https://secure.php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 	/* translators: %s: revision date */
-	$autosavef = __( '%s [Autosave]' );
+	$autosavef = __('%s [Autosave]');
 	/* translators: %s: revision date */
-	$currentf  = __( '%s [Current Revision]' );
+	$currentf  = __('%s [Current Revision]');
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( ! wp_is_post_revision($revision))
+		$date = sprintf($currentf, $date);
+	elseif (wp_is_post_autosave($revision))
+		$date = sprintf($autosavef, $date);
 
 	return $date;
 }
@@ -1725,41 +1725,41 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title_expanded($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
-	$author = get_the_author_meta( 'display_name', $revision->post_author );
+	$author = get_the_author_meta('display_name', $revision->post_author);
 	/* translators: revision date format, see https://secure.php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 
-	$gravatar = get_avatar( $revision->post_author, 24 );
+	$gravatar = get_avatar($revision->post_author, 24);
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
-		__( '%1$s %2$s, %3$s ago (%4$s)' ),
+		__('%1$s %2$s, %3$s ago (%4$s)'),
 		$gravatar,
 		$author,
-		human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
+		human_time_diff(strtotime($revision->post_modified), current_time('timestamp')),
 		$date
 	);
 
 	/* translators: %s: revision date with author avatar */
-	$autosavef = __( '%s [Autosave]' );
+	$autosavef = __('%s [Autosave]');
 	/* translators: %s: revision date with author avatar */
-	$currentf  = __( '%s [Current Revision]' );
+	$currentf  = __('%s [Current Revision]');
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( ! wp_is_post_revision($revision))
+		$revision_date_author = sprintf($currentf, $revision_date_author);
+	elseif (wp_is_post_autosave($revision))
+		$revision_date_author = sprintf($autosavef, $revision_date_author);
 
 	/**
 	 * Filters the formatted author and date for a revision.
@@ -1771,7 +1771,7 @@ 
 	 * @param bool    $link                 Whether to link to the revisions page, as passed into
 	 *                                      wp_post_revision_title_expanded().
 	 */
-	return apply_filters( 'wp_post_revision_title_expanded', $revision_date_author, $revision, $link );
+	return apply_filters('wp_post_revision_title_expanded', $revision_date_author, $revision, $link);
 }
 
 /**
@@ -1785,32 +1785,32 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
-function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
+function wp_list_post_revisions($post_id = 0, $type = 'all') {
+	if ( ! $post = get_post($post_id))
 		return;
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
-	if ( is_array( $type ) ) {
-		$type = ! empty( $type['type'] ) ? $type['type']  : $type;
-		_deprecated_argument( __FUNCTION__, '3.6.0' );
+	if (is_array($type)) {
+		$type = ! empty($type['type']) ? $type['type'] : $type;
+		_deprecated_argument(__FUNCTION__, '3.6.0');
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+	if ( ! $revisions = wp_get_post_revisions($post->ID))
 		return;
 
 	$rows = '';
-	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
+	foreach ($revisions as $revision) {
+		if ( ! current_user_can('read_post', $revision->ID))
 			continue;
 
-		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
+		$is_autosave = wp_is_post_autosave($revision);
+		if (('revision' === $type && $is_autosave) || ('autosave' === $type && ! $is_autosave))
 			continue;
 
-		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
+		$rows .= "\t<li>".wp_post_revision_title_expanded($revision)."</li>\n";
 	}
 
-	echo "<div class='hide-if-js'><p>" . __( 'JavaScript must be enabled to use this feature.' ) . "</p></div>\n";
+	echo "<div class='hide-if-js'><p>".__('JavaScript must be enabled to use this feature.')."</p></div>\n";
 
 	echo "<ul class='post-revisions hide-if-no-js'>\n";
 	echo $rows;

src/wp-includes/formatting.php

Indentation +8 added lines, -8 removed lines

@@ -805,7 +805,7 @@ 
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
 		.     '(?![\\w-])'                   // Not followed by word character or hyphen
-		                                     // Unroll the loop: Inside the opening shortcode tag
+											 // Unroll the loop: Inside the opening shortcode tag
 		.     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
 		.     '(?:'
 		.         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
@@ -2613,7 +2613,7 @@ 
 				)
 				(\)?)                                                  # 3: Trailing closing parenthesis (for parethesis balancing post processing)
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
-			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+				  // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
 			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
 
@@ -2717,7 +2717,7 @@ 
 	$rel  = 'nofollow';
 
 	if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-	     preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
+		 preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
 	) {
 		return "<a $text>";
 	}
@@ -3891,7 +3891,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'js_escape', $safe_text, $text );
 }
@@ -3916,7 +3916,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_html', $safe_text, $text );
 }
@@ -3941,7 +3941,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'attribute_escape', $safe_text, $text );
 }
@@ -3962,7 +3962,7 @@ 
 	 * @since 3.1.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_textarea', $safe_text, $text );
 }
@@ -3983,7 +3983,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_tag The tag name after it has been escaped.
- 	 * @param string $tag_name The text before it was escaped.
+	 * @param string $tag_name The text before it was escaped.
 	 */
 	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
 }

Doc Comments +3 added lines, -4 removed lines

@@ -879,7 +879,7 @@ 
  * @staticvar string $_charset
  *
  * @param string     $string         The text which is to be encoded.
- * @param int|string $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
  *                                   both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES.
  *                                   Also compatible with old values; converting single quotes if set to 'single',
  *                                   double if set to 'double' or both if otherwise set.
@@ -952,7 +952,7 @@ 
  * @since 2.8.0
  *
  * @param string     $string The text which is to be decoded.
- * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
  *                                both single and double if set to ENT_QUOTES or
  *                                none if set to ENT_NOQUOTES.
  *                                Also compatible with old _wp_specialchars() values;
@@ -3692,7 +3692,7 @@ 
  * @since 2.8.1
  * @access private
  *
- * @param string|array $search  The value being searched for, otherwise known as the needle.
+ * @param string[] $search  The value being searched for, otherwise known as the needle.
  *                              An array may be used to designate multiple needles.
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
@@ -4358,7 +4358,6 @@ 
  * @link https://secure.php.net/sprintf
  *
  * @param string $pattern   The string which formatted args are inserted.
- * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
 function wp_sprintf( $pattern ) {

Spacing +993 added lines, -994 removed lines

@@ -38,7 +38,7 @@ 
  * @param bool   $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize( $text, $reset = false ) {
+function wptexturize($text, $reset = false) {
 	global $wp_cockneyreplace, $shortcode_tags;
 	static $static_characters = null,
 		$static_replacements = null,
@@ -59,12 +59,12 @@ 
 		$apos_flag = '<!--apos-->';
 
 	// If there's nothing to do, just stop.
-	if ( empty( $text ) || false === $run_texturize ) {
+	if (empty($text) || false === $run_texturize) {
 		return $text;
 	}
 
 	// Set up static variables. Run once only.
-	if ( $reset || ! isset( $static_characters ) ) {
+	if ($reset || ! isset($static_characters)) {
 		/**
 		 * Filters whether to skip running wptexturize().
 		 *
@@ -79,118 +79,118 @@ 
 		 *
 		 * @param bool $run_texturize Whether to short-circuit wptexturize().
 		 */
-		$run_texturize = apply_filters( 'run_wptexturize', $run_texturize );
-		if ( false === $run_texturize ) {
+		$run_texturize = apply_filters('run_wptexturize', $run_texturize);
+		if (false === $run_texturize) {
 			return $text;
 		}
 
 		/* translators: opening curly double quote */
-		$opening_quote = _x( '&#8220;', 'opening curly double quote' );
+		$opening_quote = _x('&#8220;', 'opening curly double quote');
 		/* translators: closing curly double quote */
-		$closing_quote = _x( '&#8221;', 'closing curly double quote' );
+		$closing_quote = _x('&#8221;', 'closing curly double quote');
 
 		/* translators: apostrophe, for example in 'cause or can't */
-		$apos = _x( '&#8217;', 'apostrophe' );
+		$apos = _x('&#8217;', 'apostrophe');
 
 		/* translators: prime, for example in 9' (nine feet) */
-		$prime = _x( '&#8242;', 'prime' );
+		$prime = _x('&#8242;', 'prime');
 		/* translators: double prime, for example in 9" (nine inches) */
-		$double_prime = _x( '&#8243;', 'double prime' );
+		$double_prime = _x('&#8243;', 'double prime');
 
 		/* translators: opening curly single quote */
-		$opening_single_quote = _x( '&#8216;', 'opening curly single quote' );
+		$opening_single_quote = _x('&#8216;', 'opening curly single quote');
 		/* translators: closing curly single quote */
-		$closing_single_quote = _x( '&#8217;', 'closing curly single quote' );
+		$closing_single_quote = _x('&#8217;', 'closing curly single quote');
 
 		/* translators: en dash */
-		$en_dash = _x( '&#8211;', 'en dash' );
+		$en_dash = _x('&#8211;', 'en dash');
 		/* translators: em dash */
-		$em_dash = _x( '&#8212;', 'em dash' );
+		$em_dash = _x('&#8212;', 'em dash');
 
 		$default_no_texturize_tags = array('pre', 'code', 'kbd', 'style', 'script', 'tt');
 		$default_no_texturize_shortcodes = array('code');
 
 		// if a plugin has provided an autocorrect array, use it
-		if ( isset($wp_cockneyreplace) ) {
-			$cockney = array_keys( $wp_cockneyreplace );
-			$cockneyreplace = array_values( $wp_cockneyreplace );
+		if (isset($wp_cockneyreplace)) {
+			$cockney = array_keys($wp_cockneyreplace);
+			$cockneyreplace = array_values($wp_cockneyreplace);
 		} else {
 			/* translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,
 			 * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
-			$cockney = explode( ',', _x( "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
-				'Comma-separated list of words to texturize in your language' ) );
+			$cockney = explode(',', _x("'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
+				'Comma-separated list of words to texturize in your language'));
 
-			$cockneyreplace = explode( ',', _x( '&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
-				'Comma-separated list of replacement words in your language' ) );
+			$cockneyreplace = explode(',', _x('&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
+				'Comma-separated list of replacement words in your language'));
 		}
 
-		$static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
-		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
+		$static_characters = array_merge(array('...', '``', '\'\'', ' (tm)'), $cockney);
+		$static_replacements = array_merge(array('&#8230;', $opening_quote, $closing_quote, ' &#8482;'), $cockneyreplace);
 
 
 		// Pattern-based replacements of characters.
 		// Sort the remaining patterns into several arrays for performance tuning.
-		$dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+		$dynamic_characters = array('apos' => array(), 'quote' => array(), 'dash' => array());
+		$dynamic_replacements = array('apos' => array(), 'quote' => array(), 'dash' => array());
 		$dynamic = array();
 		$spaces = wp_spaces_regexp();
 
 		// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
-		if ( "'" !== $apos || "'" !== $closing_single_quote ) {
-			$dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
+		if ("'" !== $apos || "'" !== $closing_single_quote) {
+			$dynamic['/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_single_quote;
 		}
-		if ( "'" !== $apos || '"' !== $closing_quote ) {
-			$dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_quote;
+		if ("'" !== $apos || '"' !== $closing_quote) {
+			$dynamic['/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_quote;
 		}
 
 		// '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;
 		}
 
 		// Quoted Numbers like '0.42'
-		if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $open_sq_flag . '$1' . $closing_single_quote;
+		if ("'" !== $opening_single_quote && "'" !== $closing_single_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')\'(\d[.,\d]*)\'/'] = $open_sq_flag.'$1'.$closing_single_quote;
 		}
 
 		// Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
-		if ( "'" !== $opening_single_quote ) {
-			$dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $open_sq_flag;
+		if ("'" !== $opening_single_quote) {
+			$dynamic['/(?<=\A|[([{"\-]|&lt;|'.$spaces.')\'/'] = $open_sq_flag;
 		}
 
 		// Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/(?<!'.$spaces.')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|'.$spaces.')/'] = $apos_flag;
 		}
 
-		$dynamic_characters['apos'] = array_keys( $dynamic );
-		$dynamic_replacements['apos'] = array_values( $dynamic );
+		$dynamic_characters['apos'] = array_keys($dynamic);
+		$dynamic_replacements['apos'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Quoted Numbers like "42"
-		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $open_q_flag . '$1' . $closing_quote;
+		if ('"' !== $opening_quote && '"' !== $closing_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')"(\d[.,\d]*)"/'] = $open_q_flag.'$1'.$closing_quote;
 		}
 
 		// Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
-		if ( '"' !== $opening_quote ) {
-			$dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $open_q_flag;
+		if ('"' !== $opening_quote) {
+			$dynamic['/(?<=\A|[([{\-]|&lt;|'.$spaces.')"(?!'.$spaces.')/'] = $open_q_flag;
 		}
 
-		$dynamic_characters['quote'] = array_keys( $dynamic );
-		$dynamic_replacements['quote'] = array_values( $dynamic );
+		$dynamic_characters['quote'] = array_keys($dynamic);
+		$dynamic_replacements['quote'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Dashes and spaces
-		$dynamic[ '/---/' ] = $em_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
-		$dynamic[ '/(?<!xn)--/' ] = $en_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
+		$dynamic['/---/'] = $em_dash;
+		$dynamic['/(?<=^|'.$spaces.')--(?=$|'.$spaces.')/'] = $em_dash;
+		$dynamic['/(?<!xn)--/'] = $en_dash;
+		$dynamic['/(?<=^|'.$spaces.')-(?=$|'.$spaces.')/'] = $en_dash;
 
-		$dynamic_characters['dash'] = array_keys( $dynamic );
-		$dynamic_replacements['dash'] = array_values( $dynamic );
+		$dynamic_characters['dash'] = array_keys($dynamic);
+		$dynamic_replacements['dash'] = array_values($dynamic);
 	}
 
 	// Must do this every time in case plugins use these filters in a context sensitive manner
@@ -201,7 +201,7 @@ 
 	 *
 	 * @param array $default_no_texturize_tags An array of HTML element names.
 	 */
-	$no_texturize_tags = apply_filters( 'no_texturize_tags', $default_no_texturize_tags );
+	$no_texturize_tags = apply_filters('no_texturize_tags', $default_no_texturize_tags);
 	/**
 	 * Filters the list of shortcodes not to texturize.
 	 *
@@ -209,84 +209,84 @@ 
 	 *
 	 * @param array $default_no_texturize_shortcodes An array of shortcode names.
 	 */
-	$no_texturize_shortcodes = apply_filters( 'no_texturize_shortcodes', $default_no_texturize_shortcodes );
+	$no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', $default_no_texturize_shortcodes);
 
 	$no_texturize_tags_stack = array();
 	$no_texturize_shortcodes_stack = array();
 
 	// Look for shortcodes and HTML elements.
 
-	preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
-	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
-	$found_shortcodes = ! empty( $tagnames );
-	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
-	$regex = _get_wptexturize_split_regex( $shortcode_regex );
+	preg_match_all('@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches);
+	$tagnames = array_intersect(array_keys($shortcode_tags), $matches[1]);
+	$found_shortcodes = ! empty($tagnames);
+	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex($tagnames) : '';
+	$regex = _get_wptexturize_split_regex($shortcode_regex);
 
-	$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+	$textarr = preg_split($regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	foreach ( $textarr as &$curl ) {
+	foreach ($textarr as &$curl) {
 		// Only call _wptexturize_pushpop_element if $curl is a delimiter.
 		$first = $curl[0];
-		if ( '<' === $first ) {
-			if ( '<!--' === substr( $curl, 0, 4 ) ) {
+		if ('<' === $first) {
+			if ('<!--' === substr($curl, 0, 4)) {
 				// This is an HTML comment delimiter.
 				continue;
 			} else {
 				// This is an HTML element delimiter.
 
 				// Replace each & with &#038; unless it already looks like an entity.
-				$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+				$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 
-				_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
+				_wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags);
 			}
 
-		} elseif ( '' === trim( $curl ) ) {
+		} elseif ('' === trim($curl)) {
 			// This is a newline between delimiters.  Performance improves when we check this.
 			continue;
 
-		} elseif ( '[' === $first && $found_shortcodes && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
+		} elseif ('[' === $first && $found_shortcodes && 1 === preg_match('/^'.$shortcode_regex.'$/', $curl)) {
 			// This is a shortcode delimiter.
 
-			if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+			if ('[[' !== substr($curl, 0, 2) && ']]' !== substr($curl, -2)) {
 				// Looks like a normal shortcode.
-				_wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
+				_wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes);
 			} else {
 				// Looks like an escaped shortcode.
 				continue;
 			}
 
-		} elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {
+		} elseif (empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
 			// This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.
 
-			$curl = str_replace( $static_characters, $static_replacements, $curl );
+			$curl = str_replace($static_characters, $static_replacements, $curl);
 
-			if ( false !== strpos( $curl, "'" ) ) {
-				$curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
-				$curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
-				$curl = str_replace( $apos_flag, $apos, $curl );
-				$curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
+			if (false !== strpos($curl, "'")) {
+				$curl = preg_replace($dynamic_characters['apos'], $dynamic_replacements['apos'], $curl);
+				$curl = wptexturize_primes($curl, "'", $prime, $open_sq_flag, $closing_single_quote);
+				$curl = str_replace($apos_flag, $apos, $curl);
+				$curl = str_replace($open_sq_flag, $opening_single_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '"' ) ) {
-				$curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
-				$curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
-				$curl = str_replace( $open_q_flag, $opening_quote, $curl );
+			if (false !== strpos($curl, '"')) {
+				$curl = preg_replace($dynamic_characters['quote'], $dynamic_replacements['quote'], $curl);
+				$curl = wptexturize_primes($curl, '"', $double_prime, $open_q_flag, $closing_quote);
+				$curl = str_replace($open_q_flag, $opening_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '-' ) ) {
-				$curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
+			if (false !== strpos($curl, '-')) {
+				$curl = preg_replace($dynamic_characters['dash'], $dynamic_replacements['dash'], $curl);
 			}
 
 			// 9x9 (times), but never 0x9999
-			if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {
+			if (1 === preg_match('/(?<=\d)x\d/', $curl)) {
 				// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
-				$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
+				$curl = preg_replace('/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl);
 			}
 
 			// Replace each & with &#038; unless it already looks like an entity.
-			$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+			$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 		}
 	}
 
-	return implode( '', $textarr );
+	return implode('', $textarr);
 }
 
 /**
@@ -303,59 +303,59 @@ 
  * @param string $close_quote The closing quote char to use for replacement.
  * @return string The $haystack value after primes and quotes replacements.
  */
-function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quote ) {
+function wptexturize_primes($haystack, $needle, $prime, $open_quote, $close_quote) {
 	$spaces = wp_spaces_regexp();
 	$flag = '<!--wp-prime-or-quote-->';
-	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ")/";
+	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|".$spaces.")/";
 	$prime_pattern    = "/(?<=\\d)$needle/";
 	$flag_after_digit = "/(?<=\\d)$flag/";
 	$flag_no_digit    = "/(?<!\\d)$flag/";
 
-	$sentences = explode( $open_quote, $haystack );
+	$sentences = explode($open_quote, $haystack);
 
-	foreach ( $sentences as $key => &$sentence ) {
-		if ( false === strpos( $sentence, $needle ) ) {
+	foreach ($sentences as $key => &$sentence) {
+		if (false === strpos($sentence, $needle)) {
 			continue;
-		} elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
-			$sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
-			if ( $count > 1 ) {
+		} elseif (0 !== $key && 0 === substr_count($sentence, $close_quote)) {
+			$sentence = preg_replace($quote_pattern, $flag, $sentence, -1, $count);
+			if ($count > 1) {
 				// This sentence appears to have multiple closing quotes.  Attempt Vulcan logic.
-				$sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );
-				if ( 0 === $count2 ) {
+				$sentence = preg_replace($flag_no_digit, $close_quote, $sentence, -1, $count2);
+				if (0 === $count2) {
 					// Try looking for a quote followed by a period.
-					$count2 = substr_count( $sentence, "$flag." );
-					if ( $count2 > 0 ) {
+					$count2 = substr_count($sentence, "$flag.");
+					if ($count2 > 0) {
 						// Assume the rightmost quote-period match is the end of quotation.
-						$pos = strrpos( $sentence, "$flag." );
+						$pos = strrpos($sentence, "$flag.");
 					} else {
 						// When all else fails, make the rightmost candidate a closing quote.
 						// This is most likely to be problematic in the context of bug #18549.
-						$pos = strrpos( $sentence, $flag );
+						$pos = strrpos($sentence, $flag);
 					}
-					$sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
+					$sentence = substr_replace($sentence, $close_quote, $pos, strlen($flag));
 				}
 				// Use conventional replacement on any remaining primes and quotes.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-				$sentence = preg_replace( $flag_after_digit, $prime, $sentence );
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-			} elseif ( 1 == $count ) {
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
+				$sentence = preg_replace($flag_after_digit, $prime, $sentence);
+				$sentence = str_replace($flag, $close_quote, $sentence);
+			} elseif (1 == $count) {
 				// Found only one closing quote candidate, so give it priority over primes.
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = str_replace($flag, $close_quote, $sentence);
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			} else {
 				// No closing quotes found.  Just run primes pattern.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			}
 		} else {
-			$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-			$sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
+			$sentence = preg_replace($prime_pattern, $prime, $sentence);
+			$sentence = preg_replace($quote_pattern, $close_quote, $sentence);
 		}
-		if ( '"' == $needle && false !== strpos( $sentence, '"' ) ) {
-			$sentence = str_replace( '"', $close_quote, $sentence );
+		if ('"' == $needle && false !== strpos($sentence, '"')) {
+			$sentence = str_replace('"', $close_quote, $sentence);
 		}
 	}
 
-	return implode( $open_quote, $sentences );
+	return implode($open_quote, $sentences);
 }
 
 /**
@@ -372,12 +372,12 @@ 
  * @param array  $stack List of open tag elements.
  * @param array  $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
  */
-function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
+function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
 	// Is it an opening tag or closing tag?
-	if ( isset( $text[1] ) && '/' !== $text[1] ) {
+	if (isset($text[1]) && '/' !== $text[1]) {
 		$opening_tag = true;
 		$name_offset = 1;
-	} elseif ( 0 == count( $stack ) ) {
+	} elseif (0 == count($stack)) {
 		// Stack is empty. Just stop.
 		return;
 	} else {
@@ -386,17 +386,17 @@ 
 	}
 
 	// Parse out the tag name.
-	$space = strpos( $text, ' ' );
-	if ( false === $space ) {
+	$space = strpos($text, ' ');
+	if (false === $space) {
 		$space = -1;
 	} else {
 		$space -= $name_offset;
 	}
-	$tag = substr( $text, $name_offset, $space );
+	$tag = substr($text, $name_offset, $space);
 
 	// Handle disabled tags.
-	if ( in_array( $tag, $disabled_elements ) ) {
-		if ( $opening_tag ) {
+	if (in_array($tag, $disabled_elements)) {
+		if ($opening_tag) {
 			/*
 			 * This disables texturize until we find a closing tag of our type
 			 * (e.g. <pre>) even if there was invalid nesting before that
@@ -405,9 +405,9 @@ 
 			 *          "baba" won't be texturize
 			 */
 
-			array_push( $stack, $tag );
-		} elseif ( end( $stack ) == $tag ) {
-			array_pop( $stack );
+			array_push($stack, $tag);
+		} elseif (end($stack) == $tag) {
+			array_pop($stack);
 		}
 	}
 }
@@ -426,38 +426,38 @@ 
  *                    after paragraphing. Default true.
  * @return string Text which has been converted into correct paragraph tags.
  */
-function wpautop( $pee, $br = true ) {
+function wpautop($pee, $br = true) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
+	if (trim($pee) === '')
 		return '';
 
 	// Just to make things a little easier, pad the end.
-	$pee = $pee . "\n";
+	$pee = $pee."\n";
 
 	/*
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos($pee, '<pre') !== false ) {
-		$pee_parts = explode( '</pre>', $pee );
+	if (strpos($pee, '<pre') !== false) {
+		$pee_parts = explode('</pre>', $pee);
 		$last_pee = array_pop($pee_parts);
 		$pee = '';
 		$i = 0;
 
-		foreach ( $pee_parts as $pee_part ) {
+		foreach ($pee_parts as $pee_part) {
 			$start = strpos($pee_part, '<pre');
 
 			// Malformed html?
-			if ( $start === false ) {
+			if ($start === false) {
 				$pee .= $pee_part;
 				continue;
 			}
 
 			$name = "<pre wp-pre-tag-$i></pre>";
-			$pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+			$pre_tags[$name] = substr($pee_part, $start).'</pre>';
 
-			$pee .= substr( $pee_part, 0, $start ) . $name;
+			$pee .= substr($pee_part, 0, $start).$name;
 			$i++;
 		}
 
@@ -469,47 +469,47 @@ 
 	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a double line break above block-level opening tags.
-	$pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n\n$1", $pee);
+	$pee = preg_replace('!(<'.$allblocks.'[\s/>])!', "\n\n$1", $pee);
 
 	// Add a double line break below block-level closing tags.
-	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+	$pee = preg_replace('!(</'.$allblocks.'>)!', "$1\n\n", $pee);
 
 	// Standardize newline characters to "\n".
 	$pee = str_replace(array("\r\n", "\r"), "\n", $pee);
 
 	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
+	$pee = wp_replace_in_html_tags($pee, array("\n" => " <!-- wpnl --> "));
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( strpos( $pee, '<option' ) !== false ) {
-		$pee = preg_replace( '|\s*<option|', '<option', $pee );
-		$pee = preg_replace( '|</option>\s*|', '</option>', $pee );
+	if (strpos($pee, '<option') !== false) {
+		$pee = preg_replace('|\s*<option|', '<option', $pee);
+		$pee = preg_replace('|</option>\s*|', '</option>', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
 	 * so they don't get autop'd.
 	 */
-	if ( strpos( $pee, '</object>' ) !== false ) {
-		$pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
-		$pee = preg_replace( '|\s*</object>|', '</object>', $pee );
-		$pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '</object>') !== false) {
+		$pee = preg_replace('|(<object[^>]*>)\s*|', '$1', $pee);
+		$pee = preg_replace('|\s*</object>|', '</object>', $pee);
+		$pee = preg_replace('%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <audio> and <video> elements,
 	 * before and after <source> and <track> elements.
 	 */
-	if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
-		$pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
-		$pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
-		$pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '<source') !== false || strpos($pee, '<track') !== false) {
+		$pee = preg_replace('%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee);
+		$pee = preg_replace('%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee);
+		$pee = preg_replace('%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	// Collapse line breaks before and after <figcaption> elements.
-	if ( strpos( $pee, '<figcaption' ) !== false ) {
-		$pee = preg_replace( '|\s*(<figcaption[^>]*>)|', '$1', $pee );
-		$pee = preg_replace( '|</figcaption>\s*|', '</figcaption>', $pee );
+	if (strpos($pee, '<figcaption') !== false) {
+		$pee = preg_replace('|\s*(<figcaption[^>]*>)|', '$1', $pee);
+		$pee = preg_replace('|</figcaption>\s*|', '</figcaption>', $pee);
 	}
 
 	// Remove more than two contiguous line breaks.
@@ -522,8 +522,8 @@ 
 	$pee = '';
 
 	// Rebuild the content as a string, wrapping every bit with a <p>.
-	foreach ( $pees as $tinkle ) {
-		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+	foreach ($pees as $tinkle) {
+		$pee .= '<p>'.trim($tinkle, "\n")."</p>\n";
 	}
 
 	// Under certain strange conditions it could create a P of entirely whitespace.
@@ -533,7 +533,7 @@ 
 	$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
 
 	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// In some cases <li> may get wrapped in <p>, fix them.
 	$pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
@@ -543,18 +543,18 @@ 
 	$pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
 
 	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)!', "$1", $pee);
 
 	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// Optionally insert line breaks.
-	if ( $br ) {
+	if ($br) {
 		// Replace newlines that shouldn't be touched with a placeholder.
 		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
 
 		// Normalize <br>
-		$pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
+		$pee = str_replace(array('<br>', '<br/>'), '<br />', $pee);
 
 		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
 		$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
@@ -564,19 +564,19 @@ 
 	}
 
 	// If a <br /> tag is after an opening or closing block tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*<br />!', "$1", $pee);
 
 	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
 	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
+	$pee = preg_replace("|\n</p>$|", '</p>', $pee);
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
+	if ( ! empty($pre_tags))
 		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
 	// Restore newlines in all elements.
-	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
-		$pee = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $pee );
+	if (false !== strpos($pee, '<!-- wpnl -->')) {
+		$pee = str_replace(array(' <!-- wpnl --> ', '<!-- wpnl -->'), "\n", $pee);
 	}
 
 	return $pee;
@@ -590,8 +590,8 @@ 
  * @param string $input The text which has to be formatted.
  * @return array The formatted text.
  */
-function wp_html_split( $input ) {
-	return preg_split( get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+function wp_html_split($input) {
+	return preg_split(get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 }
 
 /**
@@ -604,14 +604,14 @@ 
 function get_html_split_regex() {
 	static $regex;
 
-	if ( ! isset( $regex ) ) {
+	if ( ! isset($regex)) {
 		$comments =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
 		$cdata =
 			  '!\[CDATA\['  // Start of comment, after the <.
@@ -620,7 +620,7 @@ 
 			.     '](?!]>)' // One ] not followed by end of comment.
 			.     '[^\]]*+' // Consume non-].
 			. ')*+'         // Loop possessively.
-			. '(?:]]>)?';   // End of comment. If not found, match all input.
+			. '(?:]]>)?'; // End of comment. If not found, match all input.
 
 		$escaped =
 			  '(?='           // Is the element escaped?
@@ -659,19 +659,19 @@ 
  * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex().  Optional.
  * @return string The regular expression
  */
-function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
+function _get_wptexturize_split_regex($shortcode_regex = '') {
 	static $html_regex;
 
-	if ( ! isset( $html_regex ) ) {
+	if ( ! isset($html_regex)) {
 		$comment_regex =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
-		$html_regex =			 // Needs replaced with wp_html_split() per Shortcode API Roadmap.
+		$html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
 			  '<'                // Find start of element.
 			. '(?(?=!--)'        // Is this a comment?
 			.     $comment_regex // Find end of comment.
@@ -680,10 +680,10 @@ 
 			. ')';
 	}
 
-	if ( empty( $shortcode_regex ) ) {
-		$regex = '/(' . $html_regex . ')/';
+	if (empty($shortcode_regex)) {
+		$regex = '/('.$html_regex.')/';
 	} else {
-		$regex = '/(' . $html_regex . '|' . $shortcode_regex . ')/';
+		$regex = '/('.$html_regex.'|'.$shortcode_regex.')/';
 	}
 
 	return $regex;
@@ -700,8 +700,8 @@ 
  * @param array $tagnames List of shortcodes to find.
  * @return string The regular expression
  */
-function _get_wptexturize_shortcode_regex( $tagnames ) {
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+function _get_wptexturize_shortcode_regex($tagnames) {
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
 	$regex =
 		  '\['              // Find start of shortcode.
@@ -713,7 +713,7 @@ 
 		.     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.
 		. ')*+'             // Possessive critical.
 		. '\]'              // Find end of shortcode.
-		. '\]?';            // Shortcodes may end with ]]
+		. '\]?'; // Shortcodes may end with ]]
 
 	return $regex;
 }
@@ -727,32 +727,32 @@ 
  * @param array $replace_pairs In the form array('from' => 'to', ...).
  * @return string The formatted text.
  */
-function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
+function wp_replace_in_html_tags($haystack, $replace_pairs) {
 	// Find all elements.
-	$textarr = wp_html_split( $haystack );
+	$textarr = wp_html_split($haystack);
 	$changed = false;
 
 	// Optimize when searching for one item.
-	if ( 1 === count( $replace_pairs ) ) {
+	if (1 === count($replace_pairs)) {
 		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
+		foreach ($replace_pairs as $needle => $replace);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			if (false !== strpos($textarr[$i], $needle)) {
+				$textarr[$i] = str_replace($needle, $replace, $textarr[$i]);
 				$changed = true;
 			}
 		}
 	} else {
 		// Extract all $needles.
-		$needles = array_keys( $replace_pairs );
+		$needles = array_keys($replace_pairs);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			foreach ($needles as $needle) {
+				if (false !== strpos($textarr[$i], $needle)) {
+					$textarr[$i] = strtr($textarr[$i], $replace_pairs);
 					$changed = true;
 					// After one strtr() break out of the foreach loop and look at next element.
 					break;
@@ -761,8 +761,8 @@ 
 		}
 	}
 
-	if ( $changed ) {
-		$haystack = implode( $textarr );
+	if ($changed) {
+		$haystack = implode($textarr);
 	}
 
 	return $haystack;
@@ -777,8 +777,8 @@ 
  * @param array $matches preg_replace_callback matches array
  * @return string
  */
-function _autop_newline_preservation_helper( $matches ) {
-	return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
+function _autop_newline_preservation_helper($matches) {
+	return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 }
 
 /**
@@ -793,20 +793,20 @@ 
  * @param string $pee The content.
  * @return string The filtered content.
  */
-function shortcode_unautop( $pee ) {
+function shortcode_unautop($pee) {
 	global $shortcode_tags;
 
-	if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags)) {
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	$tagregexp = join('|', array_map('preg_quote', array_keys($shortcode_tags)));
 	$spaces = wp_spaces_regexp();
 
 	$pattern =
 		  '/'
 		. '<p>'                              // Opening paragraph
-		. '(?:' . $spaces . ')*+'            // Optional leading whitespace
+		. '(?:'.$spaces.')*+'            // Optional leading whitespace
 		. '('                                // 1: The shortcode
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
@@ -831,11 +831,11 @@ 
 		.         ')?'
 		.     ')'
 		. ')'
-		. '(?:' . $spaces . ')*+'            // optional trailing whitespace
+		. '(?:'.$spaces.')*+'            // optional trailing whitespace
 		. '<\\/p>'                           // closing paragraph
 		. '/';
 
-	return preg_replace( $pattern, '$1', $pee );
+	return preg_replace($pattern, '$1', $pee);
 }
 
 /**
@@ -850,20 +850,20 @@ 
  * @param string $str The string to be checked
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
-function seems_utf8( $str ) {
+function seems_utf8($str) {
 	mbstring_binary_safe_encoding();
 	$length = strlen($str);
 	reset_mbstring_encoding();
-	for ($i=0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$c = ord($str[$i]);
 		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
+		elseif (($c & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) $n = 3; // 11110bbb
+		elseif (($c & 0xFC) == 0xF8) $n = 4; // 111110bb
+		elseif (($c & 0xFE) == 0xFC) $n = 5; // 1111110b
 		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
 			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
 				return false;
 		}
@@ -894,55 +894,55 @@ 
  * @param bool       $double_encode  Optional. Whether to encode existing html entities. Default is false.
  * @return string The encoded text with HTML entities.
  */
-function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+function _wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if (0 === strlen($string))
 		return '';
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if ( ! preg_match('/[&<>"\']/', $string))
 		return $string;
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if (empty($quote_style))
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true))
 		$quote_style = ENT_QUOTES;
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
-	if ( ! $charset ) {
+	if ( ! $charset) {
 		static $_charset = null;
-		if ( ! isset( $_charset ) ) {
+		if ( ! isset($_charset)) {
 			$alloptions = wp_load_alloptions();
-			$_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+			$_charset = isset($alloptions['blog_charset']) ? $alloptions['blog_charset'] : '';
 		}
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
+	if (in_array($charset, array('utf8', 'utf-8', 'UTF8')))
 		$charset = 'UTF-8';
 
 	$_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
+	if ($quote_style === 'double') {
 		$quote_style = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
+	} elseif ($quote_style === 'single') {
 		$quote_style = ENT_NOQUOTES;
 	}
 
-	if ( ! $double_encode ) {
+	if ( ! $double_encode) {
 		// Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
 		// This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
-		$string = wp_kses_normalize_entities( $string );
+		$string = wp_kses_normalize_entities($string);
 	}
 
-	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
+	$string = @htmlspecialchars($string, $quote_style, $charset, $double_encode);
 
 	// Back-compat.
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ('single' === $_quote_style)
+		$string = str_replace("'", '&#039;', $string);
 
 	return $string;
 }
@@ -967,52 +967,52 @@ 
  *                                Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
+function wp_specialchars_decode($string, $quote_style = ENT_NOQUOTES) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
+	if (strpos($string, '&') === false) {
 		return $string;
 	}
 
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
+	if (empty($quote_style)) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true)) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
+	$single = array('&#039;'  => '\'', '&#x27;' => '\'');
+	$single_preg = array('/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;');
+	$double = array('&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"');
+	$double_preg = array('/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;');
+	$others = array('&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&');
+	$others_preg = array('/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;');
+
+	if ($quote_style === ENT_QUOTES) {
+		$translation = array_merge($single, $double, $others);
+		$translation_preg = array_merge($single_preg, $double_preg, $others_preg);
+	} elseif ($quote_style === ENT_COMPAT || $quote_style === 'double') {
+		$translation = array_merge($double, $others);
+		$translation_preg = array_merge($double_preg, $others_preg);
+	} elseif ($quote_style === 'single') {
+		$translation = array_merge($single, $others);
+		$translation_preg = array_merge($single_preg, $others_preg);
+	} elseif ($quote_style === ENT_NOQUOTES) {
 		$translation = $others;
 		$translation_preg = $others_preg;
 	}
 
 	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$string = preg_replace(array_keys($translation_preg), array_values($translation_preg), $string);
 
 	// Replace characters according to translation table
-	return strtr( $string, $translation );
+	return strtr($string, $translation);
 }
 
 /**
@@ -1027,40 +1027,40 @@ 
  * @param bool    $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
  * @return string The checked text.
  */
-function wp_check_invalid_utf8( $string, $strip = false ) {
+function wp_check_invalid_utf8($string, $strip = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Store the site charset as a static to avoid multiple calls to get_option()
 	static $is_utf8 = null;
-	if ( ! isset( $is_utf8 ) ) {
-		$is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
+	if ( ! isset($is_utf8)) {
+		$is_utf8 = in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8'));
 	}
-	if ( ! $is_utf8 ) {
+	if ( ! $is_utf8) {
 		return $string;
 	}
 
 	// Check for support for utf8 in the installed PCRE library once and store the result in a static
 	static $utf8_pcre = null;
-	if ( ! isset( $utf8_pcre ) ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ( ! isset($utf8_pcre)) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( !$utf8_pcre ) {
+	if ( ! $utf8_pcre) {
 		return $string;
 	}
 
 	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
+	if (1 === @preg_match('/^./us', $string)) {
 		return $string;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+	if ($strip && function_exists('iconv')) {
+		return iconv('utf-8', 'utf-8', $string);
 	}
 
 	return '';
@@ -1075,30 +1075,30 @@ 
  * @param int    $length Max  length of the string
  * @return string String with Unicode encoded for URI.
  */
-function utf8_uri_encode( $utf8_string, $length = 0 ) {
+function utf8_uri_encode($utf8_string, $length = 0) {
 	$unicode = '';
 	$values = array();
 	$num_octets = 1;
 	$unicode_length = 0;
 
 	mbstring_binary_safe_encoding();
-	$string_length = strlen( $utf8_string );
+	$string_length = strlen($utf8_string);
 	reset_mbstring_encoding();
 
-	for ($i = 0; $i < $string_length; $i++ ) {
+	for ($i = 0; $i < $string_length; $i++) {
 
-		$value = ord( $utf8_string[ $i ] );
+		$value = ord($utf8_string[$i]);
 
-		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
+		if ($value < 128) {
+			if ($length && ($unicode_length >= $length))
 				break;
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
-			if ( count( $values ) == 0 ) {
-				if ( $value < 224 ) {
+			if (count($values) == 0) {
+				if ($value < 224) {
 					$num_octets = 2;
-				} elseif ( $value < 240 ) {
+				} elseif ($value < 240) {
 					$num_octets = 3;
 				} else {
 					$num_octets = 4;
@@ -1107,11 +1107,11 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
+			if ($length && ($unicode_length + ($num_octets * 3)) > $length)
 				break;
-			if ( count( $values ) == $num_octets ) {
-				for ( $j = 0; $j < $num_octets; $j++ ) {
-					$unicode .= '%' . dechex( $values[ $j ] );
+			if (count($values) == $num_octets) {
+				for ($j = 0; $j < $num_octets; $j++) {
+					$unicode .= '%'.dechex($values[$j]);
 				}
 
 				$unicode_length += $num_octets * 3;
@@ -1511,8 +1511,8 @@ 
  * @param string $string Text that might have accent characters
  * @return string Filtered string with replaced "nice" characters.
  */
-function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
+function remove_accents($string) {
+	if ( ! preg_match('/[\x80-\xff]/', $string))
 		return $string;
 
 	if (seems_utf8($string)) {
@@ -1522,7 +1522,7 @@ 
 		'À' => 'A', 'Á' => 'A',
 		'Â' => 'A', 'Ã' => 'A',
 		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
+		'Æ' => 'AE', 'Ç' => 'C',
 		'È' => 'E', 'É' => 'E',
 		'Ê' => 'E', 'Ë' => 'E',
 		'Ì' => 'I', 'Í' => 'I',
@@ -1533,11 +1533,11 @@ 
 		'Ö' => 'O', 'Ù' => 'U',
 		'Ú' => 'U', 'Û' => 'U',
 		'Ü' => 'U', 'Ý' => 'Y',
-		'Þ' => 'TH','ß' => 's',
+		'Þ' => 'TH', 'ß' => 's',
 		'à' => 'a', 'á' => 'a',
 		'â' => 'a', 'ã' => 'a',
 		'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c',
+		'æ' => 'ae', 'ç' => 'c',
 		'è' => 'e', 'é' => 'e',
 		'ê' => 'e', 'ë' => 'e',
 		'ì' => 'i', 'í' => 'i',
@@ -1576,7 +1576,7 @@ 
 		'Ĭ' => 'I', 'ĭ' => 'i',
 		'Į' => 'I', 'į' => 'i',
 		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
+		'IJ' => 'IJ', 'ij' => 'ij',
 		'Ĵ' => 'J', 'ĵ' => 'j',
 		'Ķ' => 'K', 'ķ' => 'k',
 		'ĸ' => 'k', 'Ĺ' => 'L',
@@ -1592,13 +1592,13 @@ 
 		'Ō' => 'O', 'ō' => 'o',
 		'Ŏ' => 'O', 'ŏ' => 'o',
 		'Ő' => 'O', 'ő' => 'o',
-		'Œ' => 'OE','œ' => 'oe',
-		'Ŕ' => 'R','ŕ' => 'r',
-		'Ŗ' => 'R','ŗ' => 'r',
-		'Ř' => 'R','ř' => 'r',
-		'Ś' => 'S','ś' => 's',
-		'Ŝ' => 'S','ŝ' => 's',
-		'Ş' => 'S','ş' => 's',
+		'Œ' => 'OE', 'œ' => 'oe',
+		'Ŕ' => 'R', 'ŕ' => 'r',
+		'Ŗ' => 'R', 'ŗ' => 'r',
+		'Ř' => 'R', 'ř' => 'r',
+		'Ś' => 'S', 'ś' => 's',
+		'Ŝ' => 'S', 'ŝ' => 's',
+		'Ş' => 'S', 'ş' => 's',
 		'Š' => 'S', 'š' => 's',
 		'Ţ' => 'T', 'ţ' => 't',
 		'Ť' => 'T', 'ť' => 't',
@@ -1695,26 +1695,26 @@ 
 		// Used for locale-specific rules
 		$locale = get_locale();
 
-		if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {
-			$chars[ 'Ä' ] = 'Ae';
-			$chars[ 'ä' ] = 'ae';
-			$chars[ 'Ö' ] = 'Oe';
-			$chars[ 'ö' ] = 'oe';
-			$chars[ 'Ü' ] = 'Ue';
-			$chars[ 'ü' ] = 'ue';
-			$chars[ 'ß' ] = 'ss';
-		} elseif ( 'da_DK' === $locale ) {
-			$chars[ 'Æ' ] = 'Ae';
- 			$chars[ 'æ' ] = 'ae';
-			$chars[ 'Ø' ] = 'Oe';
-			$chars[ 'ø' ] = 'oe';
-			$chars[ 'Å' ] = 'Aa';
-			$chars[ 'å' ] = 'aa';
-		} elseif ( 'ca' === $locale ) {
-			$chars[ 'l·l' ] = 'll';
-		} elseif ( 'sr_RS' === $locale || 'bs_BA' === $locale ) {
-			$chars[ 'Đ' ] = 'DJ';
-			$chars[ 'đ' ] = 'dj';
+		if ('de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale) {
+			$chars['Ä'] = 'Ae';
+			$chars['ä'] = 'ae';
+			$chars['Ö'] = 'Oe';
+			$chars['ö'] = 'oe';
+			$chars['Ü'] = 'Ue';
+			$chars['ü'] = 'ue';
+			$chars['ß'] = 'ss';
+		} elseif ('da_DK' === $locale) {
+			$chars['Æ'] = 'Ae';
+ 			$chars['æ'] = 'ae';
+			$chars['Ø'] = 'Oe';
+			$chars['ø'] = 'oe';
+			$chars['Å'] = 'Aa';
+			$chars['å'] = 'aa';
+		} elseif ('ca' === $locale) {
+			$chars['l·l'] = 'll';
+		} elseif ('sr_RS' === $locale || 'bs_BA' === $locale) {
+			$chars['Đ'] = 'DJ';
+			$chars['đ'] = 'dj';
 		}
 
 		$string = strtr($string, $chars);
@@ -1759,7 +1759,7 @@ 
  * @param string $filename The filename to be sanitized
  * @return string The sanitized filename
  */
-function sanitize_file_name( $filename ) {
+function sanitize_file_name($filename) {
 	$filename_raw = $filename;
 	$special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
 	/**
@@ -1770,18 +1770,18 @@ 
 	 * @param array  $special_chars Characters to remove.
 	 * @param string $filename_raw  Filename as it was passed into sanitize_file_name().
 	 */
-	$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-	$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
-	$filename = str_replace( $special_chars, '', $filename );
-	$filename = str_replace( array( '%20', '+' ), '-', $filename );
-	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-	$filename = trim( $filename, '.-_' );
-
-	if ( false === strpos( $filename, '.' ) ) {
+	$special_chars = apply_filters('sanitize_file_name_chars', $special_chars, $filename_raw);
+	$filename = preg_replace("#\x{00a0}#siu", ' ', $filename);
+	$filename = str_replace($special_chars, '', $filename);
+	$filename = str_replace(array('%20', '+'), '-', $filename);
+	$filename = preg_replace('/[\r\n\t -]+/', '-', $filename);
+	$filename = trim($filename, '.-_');
+
+	if (false === strpos($filename, '.')) {
 		$mime_types = wp_get_mime_types();
-		$filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
-		if ( $filetype['ext'] === $filename ) {
-			$filename = 'unnamed-file.' . $filetype['ext'];
+		$filetype = wp_check_filetype('test.'.$filename, $mime_types);
+		if ($filetype['ext'] === $filename) {
+			$filename = 'unnamed-file.'.$filetype['ext'];
 		}
 	}
 
@@ -1789,7 +1789,7 @@ 
 	$parts = explode('.', $filename);
 
 	// Return if only one extension
-	if ( count( $parts ) <= 2 ) {
+	if (count($parts) <= 2) {
 		/**
 		 * Filters a sanitized filename string.
 		 *
@@ -1798,7 +1798,7 @@ 
 		 * @param string $filename     Sanitized filename.
 		 * @param string $filename_raw The filename prior to sanitization.
 		 */
-		return apply_filters( 'sanitize_file_name', $filename, $filename_raw );
+		return apply_filters('sanitize_file_name', $filename, $filename_raw);
 	}
 
 	// Process multiple extensions
@@ -1810,23 +1810,23 @@ 
 	 * Loop over any intermediate extensions. Postfix them with a trailing underscore
 	 * if they are a 2 - 5 character long alpha string not in the extension whitelist.
 	 */
-	foreach ( (array) $parts as $part) {
-		$filename .= '.' . $part;
+	foreach ((array) $parts as $part) {
+		$filename .= '.'.$part;
 
-		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+		if (preg_match("/^[a-zA-Z]{2,5}\d?$/", $part)) {
 			$allowed = false;
-			foreach ( $mimes as $ext_preg => $mime_match ) {
-				$ext_preg = '!^(' . $ext_preg . ')$!i';
-				if ( preg_match( $ext_preg, $part ) ) {
+			foreach ($mimes as $ext_preg => $mime_match) {
+				$ext_preg = '!^('.$ext_preg.')$!i';
+				if (preg_match($ext_preg, $part)) {
 					$allowed = true;
 					break;
 				}
 			}
-			if ( !$allowed )
+			if ( ! $allowed)
 				$filename .= '_';
 		}
 	}
-	$filename .= '.' . $extension;
+	$filename .= '.'.$extension;
 	/** This filter is documented in wp-includes/formatting.php */
 	return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }
@@ -1845,21 +1845,21 @@ 
  * @param bool   $strict   If set limits $username to specific characters. Default false.
  * @return string The sanitized username, after passing through filters.
  */
-function sanitize_user( $username, $strict = false ) {
+function sanitize_user($username, $strict = false) {
 	$raw_username = $username;
-	$username = wp_strip_all_tags( $username );
-	$username = remove_accents( $username );
+	$username = wp_strip_all_tags($username);
+	$username = remove_accents($username);
 	// Kill octets
-	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
+	$username = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $username);
+	$username = preg_replace('/&.+?;/', '', $username); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ($strict)
+		$username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
 
-	$username = trim( $username );
+	$username = trim($username);
 	// Consolidate contiguous whitespace
-	$username = preg_replace( '|\s+|', ' ', $username );
+	$username = preg_replace('|\s+|', ' ', $username);
 
 	/**
 	 * Filters a sanitized username string.
@@ -1870,7 +1870,7 @@ 
 	 * @param string $raw_username The username prior to sanitization.
 	 * @param bool   $strict       Whether to limit the sanitization to specific characters. Default false.
 	 */
-	return apply_filters( 'sanitize_user', $username, $raw_username, $strict );
+	return apply_filters('sanitize_user', $username, $raw_username, $strict);
 }
 
 /**
@@ -1883,10 +1883,10 @@ 
  * @param string $key String key
  * @return string Sanitized key
  */
-function sanitize_key( $key ) {
+function sanitize_key($key) {
 	$raw_key = $key;
-	$key = strtolower( $key );
-	$key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+	$key = strtolower($key);
+	$key = preg_replace('/[^a-z0-9_\-]/', '', $key);
 
 	/**
 	 * Filters a sanitized key string.
@@ -1896,7 +1896,7 @@ 
 	 * @param string $key     Sanitized key.
 	 * @param string $raw_key The key prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_key', $key, $raw_key );
+	return apply_filters('sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -1913,10 +1913,10 @@ 
  * @param string $context        Optional. The operation for which the string is sanitized
  * @return string The sanitized string.
  */
-function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
+function sanitize_title($title, $fallback_title = '', $context = 'save') {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
+	if ('save' == $context)
 		$title = remove_accents($title);
 
 	/**
@@ -1928,9 +1928,9 @@ 
 	 * @param string $raw_title The title prior to sanitization.
 	 * @param string $context   The context for which the title is being sanitized.
 	 */
-	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
+	$title = apply_filters('sanitize_title', $title, $raw_title, $context);
 
-	if ( '' === $title || false === $title )
+	if ('' === $title || false === $title)
 		$title = $fallback_title;
 
 	return $title;
@@ -1946,8 +1946,8 @@ 
  * @param string $title The string to be sanitized.
  * @return string The sanitized string.
  */
-function sanitize_title_for_query( $title ) {
-	return sanitize_title( $title, '', 'query' );
+function sanitize_title_for_query($title) {
+	return sanitize_title($title, '', 'query');
 }
 
 /**
@@ -1963,7 +1963,7 @@ 
  * @param string $context   Optional. The operation for which the string is sanitized.
  * @return string The sanitized title.
  */
-function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
+function sanitize_title_with_dashes($title, $raw_title = '', $context = 'display') {
 	$title = strip_tags($title);
 	// Preserve escaped octets.
 	$title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
@@ -1981,14 +1981,14 @@ 
 
 	$title = strtolower($title);
 
-	if ( 'save' == $context ) {
+	if ('save' == $context) {
 		// Convert nbsp, ndash and mdash to hyphens
-		$title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+		$title = str_replace(array('%c2%a0', '%e2%80%93', '%e2%80%94'), '-', $title);
 		// Convert nbsp, ndash and mdash HTML entities to hyphens
-		$title = str_replace( array( '&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;' ), '-', $title );
+		$title = str_replace(array('&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;'), '-', $title);
 
 		// Strip these characters entirely
-		$title = str_replace( array(
+		$title = str_replace(array(
 			// iexcl and iquest
 			'%c2%a1', '%c2%bf',
 			// angle quotes
@@ -2002,10 +2002,10 @@ 
 			'%c2%b4', '%cb%8a', '%cc%81', '%cd%81',
 			// grave accent, macron, caron
 			'%cc%80', '%cc%84', '%cc%8c',
-		), '', $title );
+		), '', $title);
 
 		// Convert times to x
-		$title = str_replace( '%c3%97', 'x', $title );
+		$title = str_replace('%c3%97', 'x', $title);
 	}
 
 	$title = preg_replace('/&.+?;/', '', $title); // kill entities
@@ -2032,8 +2032,8 @@ 
  * @param string $orderby Order by clause to be validated.
  * @return string|false Returns $orderby if valid, false otherwise.
  */
-function sanitize_sql_orderby( $orderby ) {
-	if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
+function sanitize_sql_orderby($orderby) {
+	if (preg_match('/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby) || preg_match('/^\s*RAND\(\s*\)\s*$/i', $orderby)) {
 		return $orderby;
 	}
 	return false;
@@ -2054,15 +2054,15 @@ 
  * 	Defaults to an empty string.
  * @return string The sanitized value
  */
-function sanitize_html_class( $class, $fallback = '' ) {
+function sanitize_html_class($class, $fallback = '') {
 	//Strip out any % encoded octets
-	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+	$sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
 
 	//Limit to A-Z,a-z,0-9,_,-
-	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
+	$sanitized = preg_replace('/[^A-Za-z0-9_-]/', '', $sanitized);
 
-	if ( '' == $sanitized && $fallback ) {
-		return sanitize_html_class( $fallback );
+	if ('' == $sanitized && $fallback) {
+		return sanitize_html_class($fallback);
 	}
 	/**
 	 * Filters a sanitized HTML class string.
@@ -2073,7 +2073,7 @@ 
 	 * @param string $class     HTML class before sanitization.
 	 * @param string $fallback  The fallback string.
 	 */
-	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
+	return apply_filters('sanitize_html_class', $sanitized, $class, $fallback);
 }
 
 /**
@@ -2085,13 +2085,13 @@ 
  * @param string $deprecated Not used.
  * @return string Converted string.
  */
-function convert_chars( $content, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '0.71' );
+function convert_chars($content, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '0.71');
 	}
 
-	if ( strpos( $content, '&' ) !== false ) {
-		$content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content );
+	if (strpos($content, '&') !== false) {
+		$content = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content);
 	}
 
 	return $content;
@@ -2105,12 +2105,12 @@ 
  * @param string $content String with entities that need converting.
  * @return string Converted string.
  */
-function convert_invalid_entities( $content ) {
+function convert_invalid_entities($content) {
 	$wp_htmltranswinuni = array(
 		'&#128;' => '&#8364;', // the Euro sign
 		'&#129;' => '',
 		'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
-		'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
+		'&#131;' => '&#402;', // they would look weird on non-Windows browsers
 		'&#132;' => '&#8222;',
 		'&#133;' => '&#8230;',
 		'&#134;' => '&#8224;',
@@ -2141,8 +2141,8 @@ 
 		'&#159;' => '&#376;'
 	);
 
-	if ( strpos( $content, '&#1' ) !== false ) {
-		$content = strtr( $content, $wp_htmltranswinuni );
+	if (strpos($content, '&#1') !== false) {
+		$content = strtr($content, $wp_htmltranswinuni);
 	}
 
 	return $content;
@@ -2157,9 +2157,9 @@ 
  * @param bool   $force If true, forces balancing, ignoring the value of the option. Default false.
  * @return string Balanced text
  */
-function balanceTags( $text, $force = false ) {
-	if ( $force || get_option('use_balanceTags') == 1 ) {
-		return force_balance_tags( $text );
+function balanceTags($text, $force = false) {
+	if ($force || get_option('use_balanceTags') == 1) {
+		return force_balance_tags($text);
 	} else {
 		return $text;
 	}
@@ -2183,22 +2183,22 @@ 
  * @param string $text Text to be balanced.
  * @return string Balanced text.
  */
-function force_balance_tags( $text ) {
+function force_balance_tags($text) {
 	$tagstack = array();
 	$stacksize = 0;
 	$tagqueue = '';
 	$newtext = '';
 	// Known single-entity/self-closing tags
-	$single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
+	$single_tags = array('area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source');
 	// Tags that can be immediately nested within themselves
-	$nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
+	$nestable_tags = array('blockquote', 'div', 'object', 'q', 'span');
 
 	// WP bug fix for comments - in case you REALLY meant to type '< !--'
 	$text = str_replace('< !--', '<    !--', $text);
 	// WP bug fix for LOVE <3 (and other situations with '<' before a number)
 	$text = preg_replace('#<([0-9]{1})#', '&lt;$1', $text);
 
-	while ( preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex) ) {
+	while (preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex)) {
 		$newtext .= $tagqueue;
 
 		$i = strpos($text, $regex[0]);
@@ -2207,25 +2207,25 @@ 
 		// clear the shifter
 		$tagqueue = '';
 		// Pop or Push
-		if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
-			$tag = strtolower(substr($regex[1],1));
+		if (isset($regex[1][0]) && '/' == $regex[1][0]) { // End Tag
+			$tag = strtolower(substr($regex[1], 1));
 			// if too many closing tags
-			if ( $stacksize <= 0 ) {
+			if ($stacksize <= 0) {
 				$tag = '';
 				// or close to be safe $tag = '/' . $tag;
 			}
 			// if stacktop value = tag close value then pop
-			elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
-				$tag = '</' . $tag . '>'; // Close Tag
+			elseif ($tagstack[$stacksize - 1] == $tag) { // found closing tag
+				$tag = '</'.$tag.'>'; // Close Tag
 				// Pop
-				array_pop( $tagstack );
+				array_pop($tagstack);
 				$stacksize--;
 			} else { // closing tag not at top, search for it
-				for ( $j = $stacksize-1; $j >= 0; $j-- ) {
-					if ( $tagstack[$j] == $tag ) {
+				for ($j = $stacksize - 1; $j >= 0; $j--) {
+					if ($tagstack[$j] == $tag) {
 					// add tag to tagqueue
-						for ( $k = $stacksize-1; $k >= $j; $k--) {
-							$tagqueue .= '</' . array_pop( $tagstack ) . '>';
+						for ($k = $stacksize - 1; $k >= $j; $k--) {
+							$tagqueue .= '</'.array_pop($tagstack).'>';
 							$stacksize--;
 						}
 						break;
@@ -2239,43 +2239,43 @@ 
 			// Tag Cleaning
 
 			// If it's an empty tag "< >", do nothing
-			if ( '' == $tag ) {
+			if ('' == $tag) {
 				// do nothing
 			}
 			// ElseIf it presents itself as a self-closing tag...
-			elseif ( substr( $regex[2], -1 ) == '/' ) {
+			elseif (substr($regex[2], -1) == '/') {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array($tag, $single_tags))
+					$regex[2] = trim(substr($regex[2], 0, -1))."></$tag";
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
-			elseif ( in_array($tag, $single_tags) ) {
+			elseif (in_array($tag, $single_tags)) {
 				$regex[2] .= '/';
 			}
 			// Else it's not a single-entity tag
 			else {
 				// If the top of the stack is the same as the tag we want to push, close previous tag
-				if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
-					$tagqueue = '</' . array_pop( $tagstack ) . '>';
+				if ($stacksize > 0 && ! in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag) {
+					$tagqueue = '</'.array_pop($tagstack).'>';
 					$stacksize--;
 				}
-				$stacksize = array_push( $tagstack, $tag );
+				$stacksize = array_push($tagstack, $tag);
 			}
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty($attributes) && $attributes[0] != '>')
+				$attributes = ' '.$attributes;
 
-			$tag = '<' . $tag . $attributes . '>';
+			$tag = '<'.$tag.$attributes.'>';
 			//If already queuing a close tag, then put this tag on, too
-			if ( !empty($tagqueue) ) {
+			if ( ! empty($tagqueue)) {
 				$tagqueue .= $tag;
 				$tag = '';
 			}
 		}
-		$newtext .= substr($text, 0, $i) . $tag;
+		$newtext .= substr($text, 0, $i).$tag;
 		$text = substr($text, $i + $l);
 	}
 
@@ -2286,12 +2286,12 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while ($x = array_pop($tagstack))
+		$newtext .= '</'.$x.'>'; // Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
-	$newtext = str_replace("< !--","<!--",$newtext);
-	$newtext = str_replace("<    !--","< !--",$newtext);
+	$newtext = str_replace("< !--", "<!--", $newtext);
+	$newtext = str_replace("<    !--", "< !--", $newtext);
 
 	return $newtext;
 }
@@ -2312,7 +2312,7 @@ 
  *                          Default false.
  * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
  */
-function format_to_edit( $content, $rich_text = false ) {
+function format_to_edit($content, $rich_text = false) {
 	/**
 	 * Filters the text to be formatted for editing.
 	 *
@@ -2320,9 +2320,9 @@ 
 	 *
 	 * @param string $content The text, prior to formatting for editing.
 	 */
-	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	$content = apply_filters('format_to_edit', $content);
+	if ( ! $rich_text)
+		$content = esc_textarea($content);
 	return $content;
 }
 
@@ -2343,8 +2343,8 @@ 
  * @param int $threshold  Digit places number needs to be to not have zeros added.
  * @return string Adds leading zeros to number if needed.
  */
-function zeroise( $number, $threshold ) {
-	return sprintf( '%0' . $threshold . 's', $number );
+function zeroise($number, $threshold) {
+	return sprintf('%0'.$threshold.'s', $number);
 }
 
 /**
@@ -2355,10 +2355,10 @@ 
  * @param string $string Value to which backslashes will be added.
  * @return string String with backslashes inserted.
  */
-function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
-	return addcslashes( $string, 'A..Za..z' );
+function backslashit($string) {
+	if (isset($string[0]) && $string[0] >= '0' && $string[0] <= '9')
+		$string = '\\\\'.$string;
+	return addcslashes($string, 'A..Za..z');
 }
 
 /**
@@ -2375,8 +2375,8 @@ 
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit( $string ) {
-	return untrailingslashit( $string ) . '/';
+function trailingslashit($string) {
+	return untrailingslashit($string).'/';
 }
 
 /**
@@ -2390,8 +2390,8 @@ 
  * @param string $string What to remove the trailing slashes from.
  * @return string String without the trailing slashes.
  */
-function untrailingslashit( $string ) {
-	return rtrim( $string, '/\\' );
+function untrailingslashit($string) {
+	return rtrim($string, '/\\');
 }
 
 /**
@@ -2406,7 +2406,7 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
+	if (get_magic_quotes_gpc())
 		$gpc = stripslashes($gpc);
 
 	return wp_slash($gpc);
@@ -2420,8 +2420,8 @@ 
  * @param mixed $value The value to be stripped.
  * @return mixed Stripped value.
  */
-function stripslashes_deep( $value ) {
-	return map_deep( $value, 'stripslashes_from_strings_only' );
+function stripslashes_deep($value) {
+	return map_deep($value, 'stripslashes_from_strings_only');
 }
 
 /**
@@ -2432,8 +2432,8 @@ 
  * @param mixed $value The array or string to be stripped.
  * @return mixed $value The stripped value.
  */
-function stripslashes_from_strings_only( $value ) {
-	return is_string( $value ) ? stripslashes( $value ) : $value;
+function stripslashes_from_strings_only($value) {
+	return is_string($value) ? stripslashes($value) : $value;
 }
 
 /**
@@ -2444,8 +2444,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function urlencode_deep( $value ) {
-	return map_deep( $value, 'urlencode' );
+function urlencode_deep($value) {
+	return map_deep($value, 'urlencode');
 }
 
 /**
@@ -2456,8 +2456,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function rawurlencode_deep( $value ) {
-	return map_deep( $value, 'rawurlencode' );
+function rawurlencode_deep($value) {
+	return map_deep($value, 'rawurlencode');
 }
 
 /**
@@ -2468,8 +2468,8 @@ 
  * @param mixed $value The array or string to be decoded.
  * @return mixed $value The decoded value.
  */
-function urldecode_deep( $value ) {
-	return map_deep( $value, 'urldecode' );
+function urldecode_deep($value) {
+	return map_deep($value, 'urldecode');
 }
 
 /**
@@ -2481,20 +2481,20 @@ 
  * @param int    $hex_encoding  Optional. Set to 1 to enable hex encoding.
  * @return string Converted email address.
  */
-function antispambot( $email_address, $hex_encoding = 0 ) {
+function antispambot($email_address, $hex_encoding = 0) {
 	$email_no_spam_address = '';
-	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
-		$j = rand( 0, 1 + $hex_encoding );
-		if ( $j == 0 ) {
-			$email_no_spam_address .= '&#' . ord( $email_address[$i] ) . ';';
-		} elseif ( $j == 1 ) {
+	for ($i = 0, $len = strlen($email_address); $i < $len; $i++) {
+		$j = rand(0, 1 + $hex_encoding);
+		if ($j == 0) {
+			$email_no_spam_address .= '&#'.ord($email_address[$i]).';';
+		} elseif ($j == 1) {
 			$email_no_spam_address .= $email_address[$i];
-		} elseif ( $j == 2 ) {
-			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[$i] ) ), 2 );
+		} elseif ($j == 2) {
+			$email_no_spam_address .= '%'.zeroise(dechex(ord($email_address[$i])), 2);
 		}
 	}
 
-	return str_replace( '@', '&#64;', $email_no_spam_address );
+	return str_replace('@', '&#64;', $email_no_spam_address);
 }
 
 /**
@@ -2508,10 +2508,10 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URI address.
  */
-function _make_url_clickable_cb( $matches ) {
+function _make_url_clickable_cb($matches) {
 	$url = $matches[2];
 
-	if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+	if (')' == $matches[3] && strpos($url, '(')) {
 		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
 		// Then we can let the parenthesis balancer do its thing below.
 		$url .= $matches[3];
@@ -2521,16 +2521,16 @@ 
 	}
 
 	// Include parentheses in the URL only if paired
-	while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-		$suffix = strrchr( $url, ')' ) . $suffix;
-		$url = substr( $url, 0, strrpos( $url, ')' ) );
+	while (substr_count($url, '(') < substr_count($url, ')')) {
+		$suffix = strrchr($url, ')').$suffix;
+		$url = substr($url, 0, strrpos($url, ')'));
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
+	if (empty($url))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+	return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -2544,22 +2544,22 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URL address.
  */
-function _make_web_ftp_clickable_cb( $matches ) {
+function _make_web_ftp_clickable_cb($matches) {
 	$ret = '';
 	$dest = $matches[2];
-	$dest = 'http://' . $dest;
+	$dest = 'http://'.$dest;
 
 	// removed trailing [.,;:)] from URL
-	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+	if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
 		$ret = substr($dest, -1);
-		$dest = substr($dest, 0, strlen($dest)-1);
+		$dest = substr($dest, 0, strlen($dest) - 1);
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
+	if (empty($dest))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+	return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -2573,9 +2573,9 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with email address.
  */
-function _make_email_clickable_cb( $matches ) {
-	$email = $matches[2] . '@' . $matches[3];
-	return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+function _make_email_clickable_cb($matches) {
+	$email = $matches[2].'@'.$matches[3];
+	return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -2589,30 +2589,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
 	$r = '';
-	$textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+	$textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-	foreach ( $textarr as $piece ) {
+	foreach ($textarr as $piece) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
+		if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece) || preg_match('|^<script[\s>]|i', $piece) || preg_match('|^<style[\s>]|i', $piece))
 			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
+		elseif ($nested_code_pre && ('</code>' === strtolower($piece) || '</pre>' === strtolower($piece) || '</script>' === strtolower($piece) || '</style>' === strtolower($piece)))
 			$nested_code_pre--;
 
-		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+		if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
 			$r .= $piece;
 			continue;
 		}
 
 		// Long strings might contain expensive edge cases ...
-		if ( 10000 < strlen( $piece ) ) {
+		if (10000 < strlen($piece)) {
 			// ... break it up
-			foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-				if ( 2101 < strlen( $chunk ) ) {
+			foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+				if (2101 < strlen($chunk)) {
 					$r .= $chunk; // Too big, no whitespace: bail.
 				} else {
-					$r .= make_clickable( $chunk );
+					$r .= make_clickable($chunk);
 				}
 			}
 		} else {
@@ -2633,18 +2633,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
 			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+			$ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-			$ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-			$ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+			$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+			$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-			$ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+			$ret = substr($ret, 1, -1); // Remove our whitespace padding.
 			$r .= $ret;
 		}
 	}
 
 	// Cleanup of accidental links within links
-	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+	return preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
 }
 
 /**
@@ -2676,27 +2676,27 @@ 
  * @param int    $goal   The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
 	$chunks = array();
 
-	$string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+	$string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-	while ( $goal < strlen( $string_nullspace ) ) {
-		$pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+	while ($goal < strlen($string_nullspace)) {
+		$pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-		if ( false === $pos ) {
-			$pos = strpos( $string_nullspace, "\000", $goal + 1 );
-			if ( false === $pos ) {
+		if (false === $pos) {
+			$pos = strpos($string_nullspace, "\000", $goal + 1);
+			if (false === $pos) {
 				break;
 			}
 		}
 
-		$chunks[] = substr( $string, 0, $pos + 1 );
-		$string = substr( $string, $pos + 1 );
-		$string_nullspace = substr( $string_nullspace, $pos + 1 );
+		$chunks[] = substr($string, 0, $pos + 1);
+		$string = substr($string, $pos + 1);
+		$string_nullspace = substr($string_nullspace, $pos + 1);
 	}
 
-	if ( $string ) {
+	if ($string) {
 		$chunks[] = $string;
 	}
 
@@ -2711,11 +2711,11 @@ 
  * @param string $text Content that may contain HTML A elements.
  * @return string Converted content.
  */
-function wp_rel_nofollow( $text ) {
+function wp_rel_nofollow($text) {
 	// This is a pre save filter, so text is already escaped.
 	$text = stripslashes($text);
 	$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
-	return wp_slash( $text );
+	return wp_slash($text);
 }
 
 /**
@@ -2729,30 +2729,30 @@ 
  * @param array $matches Single Match
  * @return string HTML A Element with rel nofollow.
  */
-function wp_rel_nofollow_callback( $matches ) {
+function wp_rel_nofollow_callback($matches) {
 	$text = $matches[1];
-	$atts = shortcode_parse_atts( $matches[1] );
+	$atts = shortcode_parse_atts($matches[1]);
 	$rel  = 'nofollow';
 
-	if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-	     preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
+	if (preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'http')).')%i', $text) ||
+	     preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'https')).')%i', $text)
 	) {
 		return "<a $text>";
 	}
 
-	if ( ! empty( $atts['rel'] ) ) {
-		$parts = array_map( 'trim', explode( ' ', $atts['rel'] ) );
-		if ( false === array_search( 'nofollow', $parts ) ) {
+	if ( ! empty($atts['rel'])) {
+		$parts = array_map('trim', explode(' ', $atts['rel']));
+		if (false === array_search('nofollow', $parts)) {
 			$parts[] = 'nofollow';
 		}
-		$rel = implode( ' ', $parts );
-		unset( $atts['rel'] );
+		$rel = implode(' ', $parts);
+		unset($atts['rel']);
 
 		$html = '';
-		foreach ( $atts as $name => $value ) {
+		foreach ($atts as $name => $value) {
 			$html .= "{$name}=\"$value\" ";
 		}
-		$text = trim( $html );
+		$text = trim($html);
 	}
 	return "<a $text rel=\"$rel\">";
 }
@@ -2772,21 +2772,21 @@ 
  * @param array $matches Single match. Smiley code to convert to image.
  * @return string Image string for smiley.
  */
-function translate_smiley( $matches ) {
+function translate_smiley($matches) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
+	if (count($matches) == 0)
 		return '';
 
-	$smiley = trim( reset( $matches ) );
-	$img = $wpsmiliestrans[ $smiley ];
+	$smiley = trim(reset($matches));
+	$img = $wpsmiliestrans[$smiley];
 
 	$matches = array();
-	$ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
-	$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+	$ext = preg_match('/\.([^.]+)$/', $img, $matches) ? strtolower($matches[1]) : false;
+	$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
 
 	// Don't convert smilies that aren't images - they're probably emoji.
-	if ( ! in_array( $ext, $image_exts ) ) {
+	if ( ! in_array($ext, $image_exts)) {
 		return $img;
 	}
 
@@ -2799,9 +2799,9 @@ 
 	 * @param string $img        Filename for the smiley image.
 	 * @param string $site_url   Site URL, as returned by site_url().
 	 */
-	$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+	$src_url = apply_filters('smilies_src', includes_url("images/smilies/$img"), $img, site_url());
 
-	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
+	return sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url($src_url), esc_attr($smiley));
 }
 
 /**
@@ -2817,33 +2817,33 @@ 
  * @param string $text Content to convert smilies from text.
  * @return string Converted content with text smilies replaced with images.
  */
-function convert_smilies( $text ) {
+function convert_smilies($text) {
 	global $wp_smiliessearch;
 	$output = '';
-	if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
+	if (get_option('use_smilies') && ! empty($wp_smiliessearch)) {
 		// HTML loop taken from texturize function, could possible be consolidated
-		$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
-		$stop = count( $textarr );// loop stuff
+		$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
+		$stop = count($textarr); // loop stuff
 
 		// Ignore proessing of specific tags
 		$tags_to_ignore = 'code|pre|style|script|textarea';
 		$ignore_block_element = '';
 
-		for ( $i = 0; $i < $stop; $i++ ) {
+		for ($i = 0; $i < $stop; $i++) {
 			$content = $textarr[$i];
 
 			// If we're in an ignore block, wait until we find its closing tag
-			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 				$ignore_block_element = $matches[1];
 			}
 
 			// If it's not a tag and not in ignore block
-			if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
-				$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
+			if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
+				$content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
 			}
 
 			// did we exit ignore block
-			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+			if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 				$ignore_block_element = '';
 			}
 
@@ -2867,12 +2867,12 @@ 
  * @param bool   $deprecated Deprecated.
  * @return string|bool Either false or the valid email address.
  */
-function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+function is_email($email, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 6 ) {
+	if (strlen($email) < 6) {
 		/**
 		 * Filters whether an email address is valid.
 		 *
@@ -2886,65 +2886,65 @@ 
 		 * @param string $email    The email address being checked.
 		 * @param string $context  Context under which the email was tested.
 		 */
-		return apply_filters( 'is_email', false, $email, 'email_too_short' );
+		return apply_filters('is_email', false, $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'email_no_at' );
+		return apply_filters('is_email', false, $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	if ( !preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+	if ( ! preg_match('/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
+		return apply_filters('is_email', false, $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	if ( preg_match( '/\.{2,}/', $domain ) ) {
+	if (preg_match('/\.{2,}/', $domain)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );
+		return apply_filters('is_email', false, $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	if ( trim( $domain, " \t\n\r\0\x0B." ) !== $domain ) {
+	if (trim($domain, " \t\n\r\0\x0B.") !== $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_limits' );
+		return apply_filters('is_email', false, $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_no_periods' );
+		return apply_filters('is_email', false, $email, 'domain_no_periods');
 	}
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens and whitespace
-		if ( trim( $sub, " \t\n\r\0\x0B-" ) !== $sub ) {
+		if (trim($sub, " \t\n\r\0\x0B-") !== $sub) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_hyphen_limits' );
+			return apply_filters('is_email', false, $email, 'sub_hyphen_limits');
 		}
 
 		// Test for invalid characters
-		if ( !preg_match('/^[a-z0-9-]+$/i', $sub ) ) {
+		if ( ! preg_match('/^[a-z0-9-]+$/i', $sub)) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
+			return apply_filters('is_email', false, $email, 'sub_invalid_chars');
 		}
 	}
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'is_email', $email, $email, null );
+	return apply_filters('is_email', $email, $email, null);
 }
 
 /**
@@ -2955,13 +2955,13 @@ 
  * @param string $string Subject line
  * @return string Converted string to ASCII
  */
-function wp_iso_descrambler( $string ) {
+function wp_iso_descrambler($string) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+	if ( ! preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
 		return $string;
 	} else {
 		$subject = str_replace('_', ' ', $matches[2]);
-		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
+		return preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
 	}
 }
 
@@ -2974,8 +2974,8 @@ 
  * @param array $match The preg_replace_callback matches array
  * @return string Converted chars
  */
-function _wp_iso_convert( $match ) {
-	return chr( hexdec( strtolower( $match[1] ) ) );
+function _wp_iso_convert($match) {
+	return chr(hexdec(strtolower($match[1])));
 }
 
 /**
@@ -2992,25 +2992,25 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string GMT version of the date provided.
  */
-function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( $tz ) );
-		if ( ! $datetime ) {
-			return gmdate( $format, 0 );
+function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone($tz));
+		if ( ! $datetime) {
+			return gmdate($format, 0);
 		}
-		$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
-		$string_gmt = $datetime->format( $format );
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+		$string_gmt = $datetime->format($format);
 	} else {
-		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) ) {
-			$datetime = strtotime( $string );
-			if ( false === $datetime ) {
-				return gmdate( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches)) {
+			$datetime = strtotime($string);
+			if (false === $datetime) {
+				return gmdate($format, 0);
 			}
-			return gmdate( $format, $datetime );
+			return gmdate($format, $datetime);
 		}
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_gmt;
 }
@@ -3029,19 +3029,19 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string Formatted date relative to the timezone / GMT offset.
  */
-function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
-		$datetime->setTimezone( new DateTimeZone( $tz ) );
-		$string_localtime = $datetime->format( $format );
+function get_date_from_gmt($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone('UTC'));
+		if ( ! $datetime)
+			return date($format, 0);
+		$datetime->setTimezone(new DateTimeZone($tz));
+		$string_localtime = $datetime->format($format);
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches))
+			return date($format, 0);
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_localtime = gmdate($format, $string_time + get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_localtime;
 }
@@ -3054,7 +3054,7 @@ 
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
  * @return int|float The offset in seconds.
  */
-function iso8601_timezone_to_offset( $timezone ) {
+function iso8601_timezone_to_offset($timezone) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
 	if ($timezone == 'Z') {
 		$offset = 0;
@@ -3076,14 +3076,14 @@ 
  * @param string $timezone    Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
  * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
  */
-function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
+function iso8601_to_datetime($date_string, $timezone = 'user') {
 	$timezone = strtolower($timezone);
 
 	if ($timezone == 'gmt') {
 
 		preg_match('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits);
 
-		if (!empty($date_bits[7])) { // we have a timezone, so let's compute an offset
+		if ( ! empty($date_bits[7])) { // we have a timezone, so let's compute an offset
 			$offset = iso8601_timezone_to_offset($date_bits[7]);
 		} else { // we don't have a timezone, so we assume user local timezone (not server's!)
 			$offset = HOUR_IN_SECONDS * get_option('gmt_offset');
@@ -3107,9 +3107,9 @@ 
  * @param string $email Email address to filter.
  * @return string Filtered email address.
  */
-function sanitize_email( $email ) {
+function sanitize_email($email) {
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 6 ) {
+	if (strlen($email) < 6) {
 		/**
 		 * Filters a sanitized email address.
 		 *
@@ -3123,82 +3123,82 @@ 
 		 * @param string $email   The email address, as provided to sanitize_email().
 		 * @param string $message A message to pass to the user.
 		 */
-		return apply_filters( 'sanitize_email', '', $email, 'email_too_short' );
+		return apply_filters('sanitize_email', '', $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
+		return apply_filters('sanitize_email', '', $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	$local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );
-	if ( '' === $local ) {
+	$local = preg_replace('/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local);
+	if ('' === $local) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'local_invalid_chars' );
+		return apply_filters('sanitize_email', '', $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	$domain = preg_replace( '/\.{2,}/', '', $domain );
-	if ( '' === $domain ) {
+	$domain = preg_replace('/\.{2,}/', '', $domain);
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_sequence' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	$domain = trim( $domain, " \t\n\r\0\x0B." );
-	if ( '' === $domain ) {
+	$domain = trim($domain, " \t\n\r\0\x0B.");
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_limits' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_periods');
 	}
 
 	// Create an array that will contain valid subs
 	$new_subs = array();
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens
-		$sub = trim( $sub, " \t\n\r\0\x0B-" );
+		$sub = trim($sub, " \t\n\r\0\x0B-");
 
 		// Test for invalid characters
-		$sub = preg_replace( '/[^a-z0-9-]+/i', '', $sub );
+		$sub = preg_replace('/[^a-z0-9-]+/i', '', $sub);
 
 		// If there's anything left, add it to the valid subs
-		if ( '' !== $sub ) {
+		if ('' !== $sub) {
 			$new_subs[] = $sub;
 		}
 	}
 
 	// If there aren't 2 or more valid subs
-	if ( 2 > count( $new_subs ) ) {
+	if (2 > count($new_subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_valid_subs');
 	}
 
 	// Join valid subs into the new domain
-	$domain = join( '.', $new_subs );
+	$domain = join('.', $new_subs);
 
 	// Put the email back together
-	$email = $local . '@' . $domain;
+	$email = $local.'@'.$domain;
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'sanitize_email', $email, $email, null );
+	return apply_filters('sanitize_email', $email, $email, null);
 }
 
 /**
@@ -3213,49 +3213,49 @@ 
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
  * @return string Human readable time difference.
  */
-function human_time_diff( $from, $to = '' ) {
-	if ( empty( $to ) ) {
+function human_time_diff($from, $to = '') {
+	if (empty($to)) {
 		$to = time();
 	}
 
-	$diff = (int) abs( $to - $from );
+	$diff = (int) abs($to - $from);
 
-	if ( $diff < HOUR_IN_SECONDS ) {
-		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
+	if ($diff < HOUR_IN_SECONDS) {
+		$mins = round($diff / MINUTE_IN_SECONDS);
+		if ($mins <= 1)
 			$mins = 1;
 		/* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
-		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
-	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
-		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
+		$since = sprintf(_n('%s min', '%s mins', $mins), $mins);
+	} elseif ($diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS) {
+		$hours = round($diff / HOUR_IN_SECONDS);
+		if ($hours <= 1)
 			$hours = 1;
 		/* translators: Time difference between two dates, in hours. 1: Number of hours */
-		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
-	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
-		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
+		$since = sprintf(_n('%s hour', '%s hours', $hours), $hours);
+	} elseif ($diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS) {
+		$days = round($diff / DAY_IN_SECONDS);
+		if ($days <= 1)
 			$days = 1;
 		/* translators: Time difference between two dates, in days. 1: Number of days */
-		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
-	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
-		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
+		$since = sprintf(_n('%s day', '%s days', $days), $days);
+	} elseif ($diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS) {
+		$weeks = round($diff / WEEK_IN_SECONDS);
+		if ($weeks <= 1)
 			$weeks = 1;
 		/* translators: Time difference between two dates, in weeks. 1: Number of weeks */
-		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
-	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
-		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
+		$since = sprintf(_n('%s week', '%s weeks', $weeks), $weeks);
+	} elseif ($diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS) {
+		$months = round($diff / MONTH_IN_SECONDS);
+		if ($months <= 1)
 			$months = 1;
 		/* translators: Time difference between two dates, in months. 1: Number of months */
-		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
-	} elseif ( $diff >= YEAR_IN_SECONDS ) {
-		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
+		$since = sprintf(_n('%s month', '%s months', $months), $months);
+	} elseif ($diff >= YEAR_IN_SECONDS) {
+		$years = round($diff / YEAR_IN_SECONDS);
+		if ($years <= 1)
 			$years = 1;
 		/* translators: Time difference between two dates, in years. 1: Number of years */
-		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
+		$since = sprintf(_n('%s year', '%s years', $years), $years);
 	}
 
 	/**
@@ -3268,7 +3268,7 @@ 
 	 * @param int    $from  Unix timestamp from which the difference begins.
 	 * @param int    $to    Unix timestamp to end the time difference.
 	 */
-	return apply_filters( 'human_time_diff', $since, $diff, $from, $to );
+	return apply_filters('human_time_diff', $since, $diff, $from, $to);
 }
 
 /**
@@ -3286,15 +3286,15 @@ 
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
  * @return string The excerpt.
  */
-function wp_trim_excerpt( $text = '' ) {
+function wp_trim_excerpt($text = '') {
 	$raw_excerpt = $text;
-	if ( '' == $text ) {
+	if ('' == $text) {
 		$text = get_the_content('');
 
-		$text = strip_shortcodes( $text );
+		$text = strip_shortcodes($text);
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$text = apply_filters( 'the_content', $text );
+		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]&gt;', $text);
 
 		/**
@@ -3304,7 +3304,7 @@ 
 		 *
 		 * @param int $number The number of words. Default 55.
 		 */
-		$excerpt_length = apply_filters( 'excerpt_length', 55 );
+		$excerpt_length = apply_filters('excerpt_length', 55);
 		/**
 		 * Filters the string in the "more" link displayed after a trimmed excerpt.
 		 *
@@ -3312,8 +3312,8 @@ 
 		 *
 		 * @param string $more_string The string shown within the more link.
 		 */
-		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
-		$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+		$excerpt_more = apply_filters('excerpt_more', ' '.'[&hellip;]');
+		$text = wp_trim_words($text, $excerpt_length, $excerpt_more);
 	}
 	/**
 	 * Filters the trimmed excerpt string.
@@ -3323,7 +3323,7 @@ 
 	 * @param string $text        The trimmed text.
 	 * @param string $raw_excerpt The text prior to trimming.
 	 */
-	return apply_filters( 'wp_trim_excerpt', $text, $raw_excerpt );
+	return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }
 
 /**
@@ -3340,35 +3340,35 @@ 
  * @param string $more      Optional. What to append if $text needs to be trimmed. Default '&hellip;'.
  * @return string Trimmed text.
  */
-function wp_trim_words( $text, $num_words = 55, $more = null ) {
-	if ( null === $more ) {
-		$more = __( '&hellip;' );
+function wp_trim_words($text, $num_words = 55, $more = null) {
+	if (null === $more) {
+		$more = __('&hellip;');
 	}
 
 	$original_text = $text;
-	$text = wp_strip_all_tags( $text );
+	$text = wp_strip_all_tags($text);
 
 	/*
 	 * translators: If your word count is based on single characters (e.g. East Asian characters),
 	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 	 * Do not translate into your own language.
 	 */
-	if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-		preg_match_all( '/./u', $text, $words_array );
-		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+	if (strpos(_x('words', 'Word count type. Do not translate!'), 'characters') === 0 && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+		$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+		preg_match_all('/./u', $text, $words_array);
+		$words_array = array_slice($words_array[0], 0, $num_words + 1);
 		$sep = '';
 	} else {
-		$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+		$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 		$sep = ' ';
 	}
 
-	if ( count( $words_array ) > $num_words ) {
-		array_pop( $words_array );
-		$text = implode( $sep, $words_array );
-		$text = $text . $more;
+	if (count($words_array) > $num_words) {
+		array_pop($words_array);
+		$text = implode($sep, $words_array);
+		$text = $text.$more;
 	} else {
-		$text = implode( $sep, $words_array );
+		$text = implode($sep, $words_array);
 	}
 
 	/**
@@ -3381,7 +3381,7 @@ 
 	 * @param string $more          An optional string to append to the end of the trimmed text, e.g. &hellip;.
 	 * @param string $original_text The text before it was trimmed.
 	 */
-	return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+	return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 }
 
 /**
@@ -3392,7 +3392,7 @@ 
  * @param string $text The text within which entities will be converted.
  * @return string Text with converted entities.
  */
-function ent2ncr( $text ) {
+function ent2ncr($text) {
 
 	/**
 	 * Filters text before named entities are converted into numbered entities.
@@ -3404,8 +3404,8 @@ 
 	 * @param null   $converted_text The text to be converted. Default null.
 	 * @param string $text           The text prior to entity conversion.
 	 */
-	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
+	$filtered = apply_filters('pre_ent2ncr', null, $text);
+	if (null !== $filtered)
 		return $filtered;
 
 	$to_ncr = array(
@@ -3667,7 +3667,7 @@ 
 		'&diams;' => '&#9830;'
 	);
 
-	return str_replace( array_keys($to_ncr), array_values($to_ncr), $text );
+	return str_replace(array_keys($to_ncr), array_values($to_ncr), $text);
 }
 
 /**
@@ -3688,9 +3688,9 @@ 
  *                               It is usually either 'html' or 'tinymce'.
  * @return string The formatted text after filter is applied.
  */
-function format_for_editor( $text, $default_editor = null ) {
-	if ( $text ) {
-		$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+function format_for_editor($text, $default_editor = null) {
+	if ($text) {
+		$text = htmlspecialchars($text, ENT_NOQUOTES, get_option('blog_charset'));
 	}
 
 	/**
@@ -3702,7 +3702,7 @@ 
 	 * @param string $default_editor The default editor for the current user.
 	 *                               It is usually either 'html' or 'tinymce'.
 	 */
-	return apply_filters( 'format_for_editor', $text, $default_editor );
+	return apply_filters('format_for_editor', $text, $default_editor);
 }
 
 /**
@@ -3720,12 +3720,12 @@ 
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
 	$subject = (string) $subject;
 
 	$count = 1;
-	while ( $count ) {
-		$subject = str_replace( $search, '', $subject, $count );
+	while ($count) {
+		$subject = str_replace($search, '', $subject, $count);
 	}
 
 	return $subject;
@@ -3745,9 +3745,9 @@ 
  * @param string|array $data Unescaped data
  * @return string|array Escaped data
  */
-function esc_sql( $data ) {
+function esc_sql($data) {
 	global $wpdb;
-	return $wpdb->_escape( $data );
+	return $wpdb->_escape($data);
 }
 
 /**
@@ -3765,20 +3765,20 @@ 
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
 	$original_url = $url;
 
-	if ( '' == $url )
+	if ('' == $url)
 		return $url;
 
-	$url = str_replace( ' ', '%20', $url );
+	$url = str_replace(' ', '%20', $url);
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 
-	if ( '' === $url ) {
+	if ('' === $url) {
 		return $url;
 	}
 
-	if ( 0 !== stripos( $url, 'mailto:' ) ) {
+	if (0 !== stripos($url, 'mailto:')) {
 		$strip = array('%0d', '%0a', '%0D', '%0A');
 		$url = _deep_replace($strip, $url);
 	}
@@ -3788,61 +3788,61 @@ 
 	 * presume it needs http:// prepended (unless a relative
 	 * link starting with /, # or ? or a php file).
 	 */
-	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+	if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) &&
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url))
+		$url = 'http://'.$url;
 
 	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $_context ) {
-		$url = wp_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
+	if ('display' == $_context) {
+		$url = wp_kses_normalize_entities($url);
+		$url = str_replace('&amp;', '&#038;', $url);
+		$url = str_replace("'", '&#039;', $url);
 	}
 
-	if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
+	if ((false !== strpos($url, '[')) || (false !== strpos($url, ']'))) {
 
-		$parsed = wp_parse_url( $url );
+		$parsed = wp_parse_url($url);
 		$front  = '';
 
-		if ( isset( $parsed['scheme'] ) ) {
-			$front .= $parsed['scheme'] . '://';
-		} elseif ( '/' === $url[0] ) {
+		if (isset($parsed['scheme'])) {
+			$front .= $parsed['scheme'].'://';
+		} elseif ('/' === $url[0]) {
 			$front .= '//';
 		}
 
-		if ( isset( $parsed['user'] ) ) {
+		if (isset($parsed['user'])) {
 			$front .= $parsed['user'];
 		}
 
-		if ( isset( $parsed['pass'] ) ) {
-			$front .= ':' . $parsed['pass'];
+		if (isset($parsed['pass'])) {
+			$front .= ':'.$parsed['pass'];
 		}
 
-		if ( isset( $parsed['user'] ) || isset( $parsed['pass'] ) ) {
+		if (isset($parsed['user']) || isset($parsed['pass'])) {
 			$front .= '@';
 		}
 
-		if ( isset( $parsed['host'] ) ) {
+		if (isset($parsed['host'])) {
 			$front .= $parsed['host'];
 		}
 
-		if ( isset( $parsed['port'] ) ) {
-			$front .= ':' . $parsed['port'];
+		if (isset($parsed['port'])) {
+			$front .= ':'.$parsed['port'];
 		}
 
-		$end_dirty = str_replace( $front, '', $url );
-		$end_clean = str_replace( array( '[', ']' ), array( '%5B', '%5D' ), $end_dirty );
-		$url       = str_replace( $end_dirty, $end_clean, $url );
+		$end_dirty = str_replace($front, '', $url);
+		$end_clean = str_replace(array('[', ']'), array('%5B', '%5D'), $end_dirty);
+		$url       = str_replace($end_dirty, $end_clean, $url);
 
 	}
 
-	if ( '/' === $url[0] ) {
+	if ('/' === $url[0]) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
+		if ( ! is_array($protocols))
 			$protocols = wp_allowed_protocols();
-		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
+		$good_protocol_url = wp_kses_bad_protocol($url, $protocols);
+		if (strtolower($good_protocol_url) != strtolower($url))
 			return '';
 	}
 
@@ -3855,7 +3855,7 @@ 
 	 * @param string $original_url      The URL prior to cleaning.
 	 * @param string $_context          If 'display', replace ampersands and single quotes only.
 	 */
-	return apply_filters( 'clean_url', $good_protocol_url, $original_url, $_context );
+	return apply_filters('clean_url', $good_protocol_url, $original_url, $_context);
 }
 
 /**
@@ -3867,8 +3867,8 @@ 
  * @param array  $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function esc_url_raw( $url, $protocols = null ) {
-	return esc_url( $url, $protocols, 'db' );
+function esc_url_raw($url, $protocols = null) {
+	return esc_url($url, $protocols, 'db');
 }
 
 /**
@@ -3881,10 +3881,10 @@ 
  * @param string $myHTML The text to be converted.
  * @return string Converted text.
  */
-function htmlentities2( $myHTML ) {
-	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+function htmlentities2($myHTML) {
+	$translation_table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
 	$translation_table[chr(38)] = '&';
-	return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
+	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table));
 }
 
 /**
@@ -3899,12 +3899,12 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function esc_js( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
+function esc_js($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_COMPAT);
+	$safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
+	$safe_text = str_replace("\r", '', $safe_text);
+	$safe_text = str_replace("\n", '\\n', addslashes($safe_text));
 	/**
 	 * Filters a string cleaned and escaped for output in JavaScript.
 	 *
@@ -3916,7 +3916,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'js_escape', $safe_text, $text );
+	return apply_filters('js_escape', $safe_text, $text);
 }
 
 /**
@@ -3927,9 +3927,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_html( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_html($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filters a string cleaned and escaped for output in HTML.
 	 *
@@ -3941,7 +3941,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_html', $safe_text, $text );
+	return apply_filters('esc_html', $safe_text, $text);
 }
 
 /**
@@ -3952,9 +3952,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_attr( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_attr($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filters a string cleaned and escaped for output in an HTML attribute.
 	 *
@@ -3966,7 +3966,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'attribute_escape', $safe_text, $text );
+	return apply_filters('attribute_escape', $safe_text, $text);
 }
 
 /**
@@ -3977,8 +3977,8 @@ 
  * @param string $text
  * @return string
  */
-function esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES, get_option( 'blog_charset' ) );
+function esc_textarea($text) {
+	$safe_text = htmlspecialchars($text, ENT_QUOTES, get_option('blog_charset'));
 	/**
 	 * Filters a string cleaned and escaped for output in a textarea element.
 	 *
@@ -3987,7 +3987,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_textarea', $safe_text, $text );
+	return apply_filters('esc_textarea', $safe_text, $text);
 }
 
 /**
@@ -3998,8 +3998,8 @@ 
  * @param string $tag_name
  * @return string
  */
-function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
+function tag_escape($tag_name) {
+	$safe_tag = strtolower(preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name));
 	/**
 	 * Filters a string cleaned and escaped for output as an HTML tag.
 	 *
@@ -4008,7 +4008,7 @@ 
 	 * @param string $safe_tag The tag name after it has been escaped.
  	 * @param string $tag_name The text before it was escaped.
 	 */
-	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
+	return apply_filters('tag_escape', $safe_tag, $tag_name);
 }
 
 /**
@@ -4023,8 +4023,8 @@ 
  * @param string $link Full URL path.
  * @return string Absolute path.
  */
-function wp_make_link_relative( $link ) {
-	return preg_replace( '|^(https?:)?//[^/]+(/?.*)|i', '$2', $link );
+function wp_make_link_relative($link) {
+	return preg_replace('|^(https?:)?//[^/]+(/?.*)|i', '$2', $link);
 }
 
 /**
@@ -4041,22 +4041,22 @@ 
  * @param string $value  The unsanitised value.
  * @return string Sanitized value.
  */
-function sanitize_option( $option, $value ) {
+function sanitize_option($option, $value) {
 	global $wpdb;
 
 	$original_value = $value;
 	$error = '';
 
-	switch ( $option ) {
+	switch ($option) {
 		case 'admin_email' :
 		case 'new_admin_email' :
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = sanitize_email( $value );
-				if ( ! is_email( $value ) ) {
-					$error = __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' );
+				$value = sanitize_email($value);
+				if ( ! is_email($value)) {
+					$error = __('The email address entered did not appear to be a valid email address. Please enter a valid email address.');
 				}
 			}
 			break;
@@ -4083,36 +4083,36 @@ 
 		case 'users_can_register':
 		case 'start_of_week':
 		case 'site_icon':
-			$value = absint( $value );
+			$value = absint($value);
 			break;
 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
+			if (empty($value))
 				$value = 1;
-			if ( $value < -1 )
+			if ($value < -1)
 				$value = abs($value);
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
+			if ($value == '0' || $value == '')
 				$value = 'closed';
 			break;
 
 		case 'blogdescription':
 		case 'blogname':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( $value !== $original_value ) {
-				$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', wp_encode_emoji( $original_value ) );
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if ($value !== $original_value) {
+				$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', wp_encode_emoji($original_value));
 			}
 
-			if ( is_wp_error( $value ) ) {
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_html( $value );
+				$value = esc_html($value);
 			}
 			break;
 
@@ -4122,10 +4122,10 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
+			if (null === $value)
 				$value = 1;
 			else
-				$value = intval( $value );
+				$value = intval($value);
 			break;
 
 		case 'date_format':
@@ -4134,20 +4134,20 @@ 
 		case 'mailserver_login':
 		case 'mailserver_pass':
 		case 'upload_path':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = strip_tags( $value );
-				$value = wp_kses_data( $value );
+				$value = strip_tags($value);
+				$value = wp_kses_data($value);
 			}
 			break;
 
 		case 'ping_sites':
-			$value = explode( "\n", $value );
-			$value = array_filter( array_map( 'trim', $value ) );
-			$value = array_filter( array_map( 'esc_url_raw', $value ) );
-			$value = implode( "\n", $value );
+			$value = explode("\n", $value);
+			$value = array_filter(array_map('trim', $value));
+			$value = array_filter(array_map('esc_url_raw', $value));
+			$value = implode("\n", $value);
 			break;
 
 		case 'gmt_offset':
@@ -4155,128 +4155,128 @@ 
 			break;
 
 		case 'siteurl':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'home':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'WPLANG':
 			$allowed = get_available_languages();
-			if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
+			if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG) {
 				$allowed[] = WPLANG;
 			}
-			if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
-				$value = get_option( $option );
+			if ( ! in_array($value, $allowed) && ! empty($value)) {
+				$value = get_option($option);
 			}
 			break;
 
 		case 'illegal_names':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array($value))
+					$value = explode(' ', $value);
 
-				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$value = array_values(array_filter(array_map('trim', $value)));
 
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'limited_email_domains':
 		case 'banned_email_domains':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array($value))
+					$value = explode("\n", $value);
 
-				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$domains = array_values(array_filter(array_map('trim', $value)));
 				$value = array();
 
-				foreach ( $domains as $domain ) {
-					if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
+				foreach ($domains as $domain) {
+					if ( ! preg_match('/(--|\.\.)/', $domain) && preg_match('|^([a-zA-Z0-9-\.])+$|', $domain)) {
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'timezone_string':
 			$allowed_zones = timezone_identifiers_list();
-			if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
-				$error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
+			if ( ! in_array($value, $allowed_zones) && ! empty($value)) {
+				$error = __('The timezone you have entered is not valid. Please select a valid timezone.');
 			}
 			break;
 
 		case 'permalink_structure':
 		case 'category_base':
 		case 'tag_base':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_url_raw( $value );
-				$value = str_replace( 'http://', '', $value );
+				$value = esc_url_raw($value);
+				$value = str_replace('http://', '', $value);
 			}
 
-			if ( 'permalink_structure' === $option && '' !== $value && ! preg_match( '/%[^\/%]+%/', $value ) ) {
+			if ('permalink_structure' === $option && '' !== $value && ! preg_match('/%[^\/%]+%/', $value)) {
 				$error = sprintf(
 					/* translators: %s: Codex URL */
-					__( 'A structure tag is required when using custom permalinks. <a href="%s">Learn more</a>' ),
-					__( 'https://codex.wordpress.org/Using_Permalinks#Choosing_your_permalink_structure' )
+					__('A structure tag is required when using custom permalinks. <a href="%s">Learn more</a>'),
+					__('https://codex.wordpress.org/Using_Permalinks#Choosing_your_permalink_structure')
 				);
 			}
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
+			if ( ! get_role($value) && get_role('subscriber'))
 				$value = 'subscriber';
 			break;
 
 		case 'moderation_keys':
 		case 'blacklist_keys':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = explode( "\n", $value );
-				$value = array_filter( array_map( 'trim', $value ) );
-				$value = array_unique( $value );
-				$value = implode( "\n", $value );
+				$value = explode("\n", $value);
+				$value = array_filter(array_map('trim', $value));
+				$value = array_unique($value);
+				$value = implode("\n", $value);
 			}
 			break;
 	}
 
-	if ( ! empty( $error ) ) {
-		$value = get_option( $option );
-		if ( function_exists( 'add_settings_error' ) ) {
-			add_settings_error( $option, "invalid_{$option}", $error );
+	if ( ! empty($error)) {
+		$value = get_option($option);
+		if (function_exists('add_settings_error')) {
+			add_settings_error($option, "invalid_{$option}", $error);
 		}
 	}
 
@@ -4290,7 +4290,7 @@ 
 	 * @param string $option         The option name.
 	 * @param string $original_value The original value passed to the function.
 	 */
-	return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
+	return apply_filters("sanitize_option_{$option}", $value, $option, $original_value);
 }
 
 /**
@@ -4304,18 +4304,18 @@ 
  * @param callable $callback The function to map onto $value.
  * @return mixed The value with the callback applied to all non-arrays and non-objects inside it.
  */
-function map_deep( $value, $callback ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $index => $item ) {
-			$value[ $index ] = map_deep( $item, $callback );
+function map_deep($value, $callback) {
+	if (is_array($value)) {
+		foreach ($value as $index => $item) {
+			$value[$index] = map_deep($item, $callback);
 		}
-	} elseif ( is_object( $value ) ) {
-		$object_vars = get_object_vars( $value );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$value->$property_name = map_deep( $property_value, $callback );
+	} elseif (is_object($value)) {
+		$object_vars = get_object_vars($value);
+		foreach ($object_vars as $property_name => $property_value) {
+			$value->$property_name = map_deep($property_value, $callback);
 		}
 	} else {
-		$value = call_user_func( $callback, $value );
+		$value = call_user_func($callback, $value);
 	}
 
 	return $value;
@@ -4332,10 +4332,10 @@ 
  * @param string $string The string to be parsed.
  * @param array  $array  Variables will be stored in this array.
  */
-function wp_parse_str( $string, &$array ) {
-	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+function wp_parse_str($string, &$array) {
+	parse_str($string, $array);
+	if (get_magic_quotes_gpc())
+		$array = stripslashes_deep($array);
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
@@ -4343,7 +4343,7 @@ 
 	 *
 	 * @param array $array The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$array = apply_filters('wp_parse_str', $array);
 }
 
 /**
@@ -4356,7 +4356,7 @@ 
  * @param string $text Text to be converted.
  * @return string Converted text.
  */
-function wp_pre_kses_less_than( $text ) {
+function wp_pre_kses_less_than($text) {
 	return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
 }
 
@@ -4368,8 +4368,8 @@ 
  * @param array $matches Populated by matches to preg_replace.
  * @return string The text returned after esc_html if needed.
  */
-function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
+function wp_pre_kses_less_than_callback($matches) {
+	if (false === strpos($matches[0], '>'))
 		return esc_html($matches[0]);
 	return $matches[0];
 }
@@ -4384,21 +4384,21 @@ 
  * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
-function wp_sprintf( $pattern ) {
+function wp_sprintf($pattern) {
 	$args = func_get_args();
 	$len = strlen($pattern);
 	$start = 0;
 	$result = '';
 	$arg_index = 0;
-	while ( $len > $start ) {
+	while ($len > $start) {
 		// Last character: append and break
-		if ( strlen($pattern) - 1 == $start ) {
+		if (strlen($pattern) - 1 == $start) {
 			$result .= substr($pattern, -1);
 			break;
 		}
 
 		// Literal %: append and continue
-		if ( substr($pattern, $start, 2) == '%%' ) {
+		if (substr($pattern, $start, 2) == '%%') {
 			$start += 2;
 			$result .= '%';
 			continue;
@@ -4406,14 +4406,14 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
+		if (false === $end)
 			$end = $len;
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
-		if ( $pattern[$start] == '%' ) {
+		if ($pattern[$start] == '%') {
 			// Find numbered arguments or take the next one in order
-			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
+			if (preg_match('/^%(\d+)\$/', $fragment, $matches)) {
 				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
 				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
 			} else {
@@ -4431,11 +4431,11 @@ 
 			 * @param string $fragment A fragment from the pattern.
 			 * @param string $arg      The argument.
 			 */
-			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
+			$_fragment = apply_filters('wp_sprintf', $fragment, $arg);
+			if ($_fragment != $fragment)
 				$fragment = $_fragment;
 			else
-				$fragment = sprintf($fragment, strval($arg) );
+				$fragment = sprintf($fragment, strval($arg));
 		}
 
 		// Append to result and move to next fragment
@@ -4458,13 +4458,13 @@ 
  * @param array  $args    List items to prepend to the content and replace '%l'.
  * @return string Localized list items and rest of the content.
  */
-function wp_sprintf_l( $pattern, $args ) {
+function wp_sprintf_l($pattern, $args) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
+	if (substr($pattern, 0, 2) != '%l')
 		return $pattern;
 
 	// Nothing to work with
-	if ( empty($args) )
+	if (empty($args))
 		return '';
 
 	/**
@@ -4478,30 +4478,30 @@ 
 	 *
 	 * @param array $delimiters An array of translated delimiters.
 	 */
-	$l = apply_filters( 'wp_sprintf_l', array(
+	$l = apply_filters('wp_sprintf_l', array(
 		/* translators: used to join items in a list with more than 2 items */
-		'between'          => sprintf( __('%s, %s'), '', '' ),
+		'between'          => sprintf(__('%s, %s'), '', ''),
 		/* translators: used to join last two items in a list with more than 2 times */
-		'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
+		'between_last_two' => sprintf(__('%s, and %s'), '', ''),
 		/* translators: used to join items in a list with only 2 items */
-		'between_only_two' => sprintf( __('%s and %s'), '', '' ),
-	) );
+		'between_only_two' => sprintf(__('%s and %s'), '', ''),
+	));
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if (count($args) == 1)
+		$result .= $l['between_only_two'].array_shift($args);
 	// Loop when more than two args
 	$i = count($args);
-	while ( $i ) {
+	while ($i) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
+		if (0 == $i)
+			$result .= $l['between_last_two'].$arg;
 		else
-			$result .= $l['between'] . $arg;
+			$result .= $l['between'].$arg;
 	}
-	return $result . substr($pattern, 2);
+	return $result.substr($pattern, 2);
 }
 
 /**
@@ -4518,15 +4518,15 @@ 
  * @param string $more  Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
+function wp_html_excerpt($str, $count, $more = null) {
+	if (null === $more)
 		$more = '';
-	$str = wp_strip_all_tags( $str, true );
-	$excerpt = mb_substr( $str, 0, $count );
+	$str = wp_strip_all_tags($str, true);
+	$excerpt = mb_substr($str, 0, $count);
 	// remove part of an entity at the end
-	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	$excerpt = preg_replace('/&[^;\s]{0,6}$/', '', $excerpt);
+	if ($str != $excerpt)
+		$excerpt = trim($excerpt).$more;
 	return $excerpt;
 }
 
@@ -4545,11 +4545,11 @@ 
  * @param array  $attrs   The attributes which should be processed.
  * @return string The processed content.
  */
-function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+function links_add_base_url($content, $base, $attrs = array('src', 'href')) {
 	global $_links_add_base;
 	$_links_add_base = $base;
-	$attrs = implode('|', (array)$attrs);
-	return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
+	$attrs = implode('|', (array) $attrs);
+	return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content);
 }
 
 /**
@@ -4563,13 +4563,12 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_base( $m ) {
+function _links_add_base($m) {
 	global $_links_add_base;
 	//1 = attribute name  2 = quotation mark  3 = URL
-	return $m[1] . '=' . $m[2] .
-		( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
-			$m[3] :
-			WP_Http::make_absolute_url( $m[3], $_links_add_base )
+	return $m[1].'='.$m[2].
+		(preg_match('#^(\w{1,20}):#', $m[3], $protocol) && in_array($protocol[1], wp_allowed_protocols()) ?
+			$m[3] : WP_Http::make_absolute_url($m[3], $_links_add_base)
 		)
 		. $m[2];
 }
@@ -4591,11 +4590,11 @@ 
  * @param array  $tags    An array of tags to apply to.
  * @return string The processed content.
  */
-function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+function links_add_target($content, $target = '_blank', $tags = array('a')) {
 	global $_links_add_target;
 	$_links_add_target = $target;
-	$tags = implode('|', (array)$tags);
-	return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
+	$tags = implode('|', (array) $tags);
+	return preg_replace_callback("!<($tags)([^>]*)>!i", '_links_add_target', $content);
 }
 
 /**
@@ -4609,11 +4608,11 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_target( $m ) {
+function _links_add_target($m) {
 	global $_links_add_target;
 	$tag = $m[1];
 	$link = preg_replace('|( target=([\'"])(.*?)\2)|i', '', $m[2]);
-	return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
+	return '<'.$tag.$link.' target="'.esc_attr($_links_add_target).'">';
 }
 
 /**
@@ -4624,10 +4623,10 @@ 
  * @param string $str The string to normalize.
  * @return string The normalized string.
  */
-function normalize_whitespace( $str ) {
-	$str  = trim( $str );
-	$str  = str_replace( "\r", "\n", $str );
-	$str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
+function normalize_whitespace($str) {
+	$str  = trim($str);
+	$str  = str_replace("\r", "\n", $str);
+	$str  = preg_replace(array('/\n+/', '/[ \t]+/'), array("\n", ' '), $str);
 	return $str;
 }
 
@@ -4645,13 +4644,13 @@ 
  * @return string The processed string.
  */
 function wp_strip_all_tags($string, $remove_breaks = false) {
-	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
+	$string = preg_replace('@<(script|style)[^>]*?>.*?</\\1>@si', '', $string);
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
+	if ($remove_breaks)
 		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
 
-	return trim( $string );
+	return trim($string);
 }
 
 /**
@@ -4672,8 +4671,8 @@ 
  * @param string $str String to sanitize.
  * @return string Sanitized string.
  */
-function sanitize_text_field( $str ) {
-	$filtered = _sanitize_text_fields( $str, false );
+function sanitize_text_field($str) {
+	$filtered = _sanitize_text_fields($str, false);
 
 	/**
 	 * Filters a sanitized text field string.
@@ -4683,7 +4682,7 @@ 
 	 * @param string $filtered The sanitized string.
 	 * @param string $str      The string prior to being sanitized.
 	 */
-	return apply_filters( 'sanitize_text_field', $filtered, $str );
+	return apply_filters('sanitize_text_field', $filtered, $str);
 }
 
 /**
@@ -4700,8 +4699,8 @@ 
  * @param string $str String to sanitize.
  * @return string Sanitized string.
  */
-function sanitize_textarea_field( $str ) {
-	$filtered = _sanitize_text_fields( $str, true );
+function sanitize_textarea_field($str) {
+	$filtered = _sanitize_text_fields($str, true);
 
 	/**
 	 * Filters a sanitized textarea field string.
@@ -4711,7 +4710,7 @@ 
 	 * @param string $filtered The sanitized string.
 	 * @param string $str      The string prior to being sanitized.
 	 */
-	return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+	return apply_filters('sanitize_textarea_field', $filtered, $str);
 }
 
 /**
@@ -4724,33 +4723,33 @@ 
  * @param bool $keep_newlines optional Whether to keep newlines. Default: false.
  * @return string Sanitized string.
  */
-function _sanitize_text_fields( $str, $keep_newlines = false ) {
-	$filtered = wp_check_invalid_utf8( $str );
+function _sanitize_text_fields($str, $keep_newlines = false) {
+	$filtered = wp_check_invalid_utf8($str);
 
-	if ( strpos($filtered, '<') !== false ) {
-		$filtered = wp_pre_kses_less_than( $filtered );
+	if (strpos($filtered, '<') !== false) {
+		$filtered = wp_pre_kses_less_than($filtered);
 		// This will strip extra whitespace for us.
-		$filtered = wp_strip_all_tags( $filtered, false );
+		$filtered = wp_strip_all_tags($filtered, false);
 
 		// Use html entities in a special case to make sure no later
 		// newline stripping stage could lead to a functional tag
 		$filtered = str_replace("<\n", "&lt;\n", $filtered);
 	}
 
-	if ( ! $keep_newlines ) {
-		$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+	if ( ! $keep_newlines) {
+		$filtered = preg_replace('/[\r\n\t ]+/', ' ', $filtered);
 	}
-	$filtered = trim( $filtered );
+	$filtered = trim($filtered);
 
 	$found = false;
-	while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+	while (preg_match('/%[a-f0-9]{2}/i', $filtered, $match)) {
 		$filtered = str_replace($match[0], '', $filtered);
 		$found = true;
 	}
 
-	if ( $found ) {
+	if ($found) {
 		// Strip out the whitespace that may now exist after removing the octets.
-		$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/ +/', ' ', $filtered));
 	}
 
 	return $filtered;
@@ -4765,8 +4764,8 @@ 
  * @param string $suffix If the filename ends in suffix this will also be cut off.
  * @return string
  */
-function wp_basename( $path, $suffix = '' ) {
-	return urldecode( basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) );
+function wp_basename($path, $suffix = '') {
+	return urldecode(basename(str_replace(array('%2F', '%5C'), '/', urlencode($path)), $suffix));
 }
 
 /**
@@ -4781,19 +4780,19 @@ 
  * @param string $text The text to be modified.
  * @return string The modified text.
  */
-function capital_P_dangit( $text ) {
+function capital_P_dangit($text) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ('the_title' === $current_filter || 'wp_title' === $current_filter)
+		return str_replace('Wordpress', 'WordPress', $text);
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
-	if ( false === $dblq ) {
-		$dblq = _x( '&#8220;', 'opening curly double quote' );
+	if (false === $dblq) {
+		$dblq = _x('&#8220;', 'opening curly double quote');
 	}
 	return str_replace(
-		array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
-		array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+		array(' Wordpress', '&#8216;Wordpress', $dblq.'Wordpress', '>Wordpress', '(Wordpress'),
+		array(' WordPress', '&#8216;WordPress', $dblq.'WordPress', '>WordPress', '(WordPress'),
 	$text );
 }
 
@@ -4805,8 +4804,8 @@ 
  * @param string $mime_type Mime type
  * @return string Sanitized mime type
  */
-function sanitize_mime_type( $mime_type ) {
-	$sani_mime_type = preg_replace( '/[^-+*.a-zA-Z0-9\/]/', '', $mime_type );
+function sanitize_mime_type($mime_type) {
+	$sani_mime_type = preg_replace('/[^-+*.a-zA-Z0-9\/]/', '', $mime_type);
 	/**
 	 * Filters a mime type following sanitization.
 	 *
@@ -4815,7 +4814,7 @@ 
 	 * @param string $sani_mime_type The sanitized mime type.
 	 * @param string $mime_type      The mime type prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_mime_type', $sani_mime_type, $mime_type );
+	return apply_filters('sanitize_mime_type', $sani_mime_type, $mime_type);
 }
 
 /**
@@ -4826,14 +4825,14 @@ 
  * @param string $to_ping Space or carriage return separated URLs
  * @return string URLs starting with the http or https protocol, separated by a carriage return.
  */
-function sanitize_trackback_urls( $to_ping ) {
-	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
-	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+function sanitize_trackback_urls($to_ping) {
+	$urls_to_ping = preg_split('/[\r\n\t ]/', trim($to_ping), -1, PREG_SPLIT_NO_EMPTY);
+	foreach ($urls_to_ping as $k => $url) {
+		if ( ! preg_match('#^https?://.#i', $url))
+			unset($urls_to_ping[$k]);
 	}
-	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
-	$urls_to_ping = implode( "\n", $urls_to_ping );
+	$urls_to_ping = array_map('esc_url_raw', $urls_to_ping);
+	$urls_to_ping = implode("\n", $urls_to_ping);
 	/**
 	 * Filters a list of trackback URLs following sanitization.
 	 *
@@ -4845,7 +4844,7 @@ 
 	 * @param string $urls_to_ping Sanitized space or carriage return separated URLs.
 	 * @param string $to_ping      Space or carriage return separated URLs before sanitization.
 	 */
-	return apply_filters( 'sanitize_trackback_urls', $urls_to_ping, $to_ping );
+	return apply_filters('sanitize_trackback_urls', $urls_to_ping, $to_ping);
 }
 
 /**
@@ -4859,17 +4858,17 @@ 
  * @param string|array $value String or array of strings to slash.
  * @return string|array Slashed $value
  */
-function wp_slash( $value ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$value[$k] = wp_slash( $v );
+function wp_slash($value) {
+	if (is_array($value)) {
+		foreach ($value as $k => $v) {
+			if (is_array($v)) {
+				$value[$k] = wp_slash($v);
 			} else {
-				$value[$k] = addslashes( $v );
+				$value[$k] = addslashes($v);
 			}
 		}
 	} else {
-		$value = addslashes( $value );
+		$value = addslashes($value);
 	}
 
 	return $value;
@@ -4886,8 +4885,8 @@ 
  * @param string|array $value String or array of strings to unslash.
  * @return string|array Unslashed $value
  */
-function wp_unslash( $value ) {
-	return stripslashes_deep( $value );
+function wp_unslash($value) {
+	return stripslashes_deep($value);
 }
 
 /**
@@ -4898,13 +4897,13 @@ 
  * @param string $content A string which might contain a URL.
  * @return string|false The found URL.
  */
-function get_url_in_content( $content ) {
-	if ( empty( $content ) ) {
+function get_url_in_content($content) {
+	if (empty($content)) {
 		return false;
 	}
 
-	if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
-		return esc_url_raw( $matches[2] );
+	if (preg_match('/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches)) {
+		return esc_url_raw($matches[2]);
 	}
 
 	return false;
@@ -4926,7 +4925,7 @@ 
 function wp_spaces_regexp() {
 	static $spaces = '';
 
-	if ( empty( $spaces ) ) {
+	if (empty($spaces)) {
 		/**
 		 * Filters the regexp for common whitespace characters.
 		 *
@@ -4939,7 +4938,7 @@ 
 		 *
 		 * @param string $spaces Regexp pattern for matching common whitespace characters.
 		 */
-		$spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
+		$spaces = apply_filters('wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;');
 	}
 
 	return $spaces;
@@ -4955,7 +4954,7 @@ 
 function print_emoji_styles() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4987,7 +4986,7 @@ 
 function print_emoji_detection_script() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -5012,7 +5011,7 @@ 
 		 *
 		 * @param string The emoji base URL for png images.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' ),
+		'baseUrl' => apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/'),
 
 		/**
 		 * Filters the extension of the emoji png files.
@@ -5021,7 +5020,7 @@ 
 		 *
 		 * @param string The emoji extension for png files. Default .png.
 		 */
-		'ext' => apply_filters( 'emoji_ext', '.png' ),
+		'ext' => apply_filters('emoji_ext', '.png'),
 
 		/**
 		 * Filters the URL where emoji SVG images are hosted.
@@ -5030,7 +5029,7 @@ 
 		 *
 		 * @param string The emoji base URL for svg images.
 		 */
-		'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/' ),
+		'svgUrl' => apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/'),
 
 		/**
 		 * Filters the extension of the emoji SVG files.
@@ -5039,29 +5038,29 @@ 
 		 *
 		 * @param string The emoji extension for svg files. Default .svg.
 		 */
-		'svgExt' => apply_filters( 'emoji_svg_ext', '.svg' ),
+		'svgExt' => apply_filters('emoji_svg_ext', '.svg'),
 	);
 
-	$version = 'ver=' . get_bloginfo( 'version' );
+	$version = 'ver='.get_bloginfo('version');
 
-	if ( SCRIPT_DEBUG ) {
+	if (SCRIPT_DEBUG) {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
+			'wpemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji.js?$version"), 'wpemoji'),
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
+			'twemoji' => apply_filters('script_loader_src', includes_url("js/twemoji.js?$version"), 'twemoji'),
 		);
 
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
-			<?php readfile( ABSPATH . WPINC . "/js/wp-emoji-loader.js" ); ?>
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
+			<?php readfile(ABSPATH.WPINC."/js/wp-emoji-loader.js"); ?>
 		</script>
 		<?php
 	} else {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'concatemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+			'concatemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji-release.min.js?$version"), 'concatemoji'),
 		);
 
 		/*
@@ -5076,7 +5075,7 @@ 
 		 */
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
 			include "js/wp-emoji-loader.min.js"
 		</script>
 		<?php
@@ -5096,8 +5095,8 @@ 
  * @param string $content The content to encode.
  * @return string The encoded content.
  */
-function wp_encode_emoji( $content ) {
-	if ( function_exists( 'mb_convert_encoding' ) ) {
+function wp_encode_emoji($content) {
+	if (function_exists('mb_convert_encoding')) {
 		$regex = '/(
 		     \x23\xE2\x83\xA3               # Digits
 		     [\x30-\x39]\xE2\x83\xA3
@@ -5109,18 +5108,18 @@ 
 		)/x';
 
 		$matches = array();
-		if ( preg_match_all( $regex, $content, $matches ) ) {
-			if ( ! empty( $matches[1] ) ) {
-				foreach ( $matches[1] as $emoji ) {
+		if (preg_match_all($regex, $content, $matches)) {
+			if ( ! empty($matches[1])) {
+				foreach ($matches[1] as $emoji) {
 					/*
 					 * UTF-32's hex encoding is the same as HTML's hex encoding.
 					 * So, by converting the emoji from UTF-8 to UTF-32, we magically
 					 * get the correct hex encoding.
 					 */
-					$unpacked = unpack( 'H*', mb_convert_encoding( $emoji, 'UTF-32', 'UTF-8' ) );
-					if ( isset( $unpacked[1] ) ) {
-						$entity = '&#x' . ltrim( $unpacked[1], '0' ) . ';';
-						$content = str_replace( $emoji, $entity, $content );
+					$unpacked = unpack('H*', mb_convert_encoding($emoji, 'UTF-32', 'UTF-8'));
+					if (isset($unpacked[1])) {
+						$entity = '&#x'.ltrim($unpacked[1], '0').';';
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
@@ -5138,14 +5137,14 @@ 
  * @param string $text The content to encode.
  * @return string The encoded content.
  */
-function wp_staticize_emoji( $text ) {
-	$text = wp_encode_emoji( $text );
+function wp_staticize_emoji($text) {
+	$text = wp_encode_emoji($text);
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' );
+	$cdn_url = apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/');
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$ext = apply_filters( 'emoji_ext', '.png' );
+	$ext = apply_filters('emoji_ext', '.png');
 
 	$output = '';
 	/*
@@ -5154,33 +5153,33 @@ 
 	 *
 	 * First, capture the tags as well as in between.
 	 */
-	$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-	$stop = count( $textarr );
+	$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+	$stop = count($textarr);
 
 	// Ignore processing of specific tags.
 	$tags_to_ignore = 'code|pre|style|script|textarea';
 	$ignore_block_element = '';
 
-	for ( $i = 0; $i < $stop; $i++ ) {
+	for ($i = 0; $i < $stop; $i++) {
 		$content = $textarr[$i];
 
 		// If we're in an ignore block, wait until we find its closing tag.
-		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+		if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 			$ignore_block_element = $matches[1];
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+		if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
 			$matches = array();
-			if ( preg_match_all( '/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
-				if ( ! empty( $matches[0] ) ) {
-					foreach ( $matches[0] as $flag ) {
-						$chars = str_replace( array( '&#x', ';'), '', $flag );
+			if (preg_match_all('/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches)) {
+				if ( ! empty($matches[0])) {
+					foreach ($matches[0] as $flag) {
+						$chars = str_replace(array('&#x', ';'), '', $flag);
 
-						list( $char1, $char2 ) = str_split( $chars, 5 );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+						list($char1, $char2) = str_split($chars, 5);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char1.'-'.$char2.$ext, html_entity_decode($flag));
 
-						$content = str_replace( $flag, $entity, $content );
+						$content = str_replace($flag, $entity, $content);
 					}
 				}
 			}
@@ -5189,20 +5188,20 @@ 
 			$regex = '/(&#x[2-3][0-9a-f]{3};|&#x1f[1-6][0-9a-f]{2};)/';
 
 			$matches = array();
-			if ( preg_match_all( $regex, $content, $matches ) ) {
-				if ( ! empty( $matches[1] ) ) {
-					foreach ( $matches[1] as $emoji ) {
-						$char = str_replace( array( '&#x', ';'), '', $emoji );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+			if (preg_match_all($regex, $content, $matches)) {
+				if ( ! empty($matches[1])) {
+					foreach ($matches[1] as $emoji) {
+						$char = str_replace(array('&#x', ';'), '', $emoji);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char.$ext, html_entity_decode($emoji));
 
-						$content = str_replace( $emoji, $entity, $content );
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
 		}
 
 		// Did we exit ignore block.
-		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+		if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 			$ignore_block_element = '';
 		}
 
@@ -5220,8 +5219,8 @@ 
  * @param array $mail The email data array.
  * @return array The email data array, with emoji in the message staticized.
  */
-function wp_staticize_emoji_for_email( $mail ) {
-	if ( ! isset( $mail['message'] ) ) {
+function wp_staticize_emoji_for_email($mail) {
+	if ( ! isset($mail['message'])) {
 		return $mail;
 	}
 
@@ -5233,47 +5232,47 @@ 
 	 * is handling changing the Content-Type.
 	 */
 	$headers = array();
-	if ( isset( $mail['headers'] ) ) {
-		if ( is_array( $mail['headers'] ) ) {
+	if (isset($mail['headers'])) {
+		if (is_array($mail['headers'])) {
 			$headers = $mail['headers'];
 		} else {
-			$headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+			$headers = explode("\n", str_replace("\r\n", "\n", $mail['headers']));
 		}
 	}
 
-	foreach ( $headers as $header ) {
-		if ( strpos($header, ':') === false ) {
+	foreach ($headers as $header) {
+		if (strpos($header, ':') === false) {
 			continue;
 		}
 
 		// Explode them out.
-		list( $name, $content ) = explode( ':', trim( $header ), 2 );
+		list($name, $content) = explode(':', trim($header), 2);
 
 		// Cleanup crew.
-		$name    = trim( $name    );
-		$content = trim( $content );
+		$name    = trim($name);
+		$content = trim($content);
 
-		if ( 'content-type' === strtolower( $name ) ) {
-			if ( strpos( $content, ';' ) !== false ) {
-				list( $type, $charset ) = explode( ';', $content );
-				$content_type = trim( $type );
+		if ('content-type' === strtolower($name)) {
+			if (strpos($content, ';') !== false) {
+				list($type, $charset) = explode(';', $content);
+				$content_type = trim($type);
 			} else {
-				$content_type = trim( $content );
+				$content_type = trim($content);
 			}
 			break;
 		}
 	}
 
 	// Set Content-Type if we don't have a content-type from the input headers.
-	if ( ! isset( $content_type ) ) {
+	if ( ! isset($content_type)) {
 		$content_type = 'text/plain';
 	}
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
-	if ( 'text/html' === $content_type ) {
-		$mail['message'] = wp_staticize_emoji( $mail['message'] );
+	if ('text/html' === $content_type) {
+		$mail['message'] = wp_staticize_emoji($mail['message']);
 	}
 
 	return $mail;
@@ -5289,12 +5288,12 @@ 
  * @param int    $length Optional. Maximum length of the shortened URL. Default 35 characters.
  * @return string Shortened URL.
  */
-function url_shorten( $url, $length = 35 ) {
-	$stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
-	$short_url = untrailingslashit( $stripped );
+function url_shorten($url, $length = 35) {
+	$stripped = str_replace(array('https://', 'http://', 'www.'), '', $url);
+	$short_url = untrailingslashit($stripped);
 
-	if ( strlen( $short_url ) > $length ) {
-		$short_url = substr( $short_url, 0, $length - 3 ) . '&hellip;';
+	if (strlen($short_url) > $length) {
+		$short_url = substr($short_url, 0, $length - 3).'&hellip;';
 	}
 	return $short_url;
 }
@@ -5310,13 +5309,13 @@ 
  * @param string $color
  * @return string|void
  */
-function sanitize_hex_color( $color ) {
-	if ( '' === $color ) {
+function sanitize_hex_color($color) {
+	if ('' === $color) {
 		return '';
 	}
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+	if (preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color)) {
 		return $color;
 	}
 }
@@ -5335,14 +5334,14 @@ 
  * @param string $color
  * @return string|null
  */
-function sanitize_hex_color_no_hash( $color ) {
-	$color = ltrim( $color, '#' );
+function sanitize_hex_color_no_hash($color) {
+	$color = ltrim($color, '#');
 
-	if ( '' === $color ) {
+	if ('' === $color) {
 		return '';
 	}
 
-	return sanitize_hex_color( '#' . $color ) ? $color : null;
+	return sanitize_hex_color('#'.$color) ? $color : null;
 }
 
 /**
@@ -5356,9 +5355,9 @@ 
  * @param string $color
  * @return string
  */
-function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) ) {
-		return '#' . $unhashed;
+function maybe_hash_hex_color($color) {
+	if ($unhashed = sanitize_hex_color_no_hash($color)) {
+		return '#'.$unhashed;
 	}
 
 	return $color;

Braces +222 added lines, -139 removed lines

@@ -429,8 +429,9 @@ 
 function wpautop( $pee, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
-		return '';
+	if ( trim($pee) === '' ) {
+			return '';
+	}
 
 	// Just to make things a little easier, pad the end.
 	$pee = $pee . "\n";
@@ -571,8 +572,9 @@ 
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
-		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	if ( !empty($pre_tags) ) {
+			$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	}
 
 	// Restore newlines in all elements.
 	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
@@ -856,16 +858,38 @@ 
 	reset_mbstring_encoding();
 	for ($i=0; $i < $length; $i++) {
 		$c = ord($str[$i]);
-		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
+		if ($c < 0x80) {
+			$n = 0;
+		}
+		// 0bbbbbbb
+		elseif (($c & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif (($c & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif (($c & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
+			return false;
+		}
+		// Does not match any model
 		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
-				return false;
+			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+							return false;
+			}
 		}
 	}
 	return true;
@@ -897,18 +921,21 @@ 
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
-		return '';
+	if ( 0 === strlen( $string ) ) {
+			return '';
+	}
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
-		return $string;
+	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
+			return $string;
+	}
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
-		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
-		$quote_style = ENT_QUOTES;
+	if ( empty( $quote_style ) ) {
+			$quote_style = ENT_NOQUOTES;
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+			$quote_style = ENT_QUOTES;
+	}
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
 	if ( ! $charset ) {
@@ -920,8 +947,9 @@ 
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
-		$charset = 'UTF-8';
+	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
+			$charset = 'UTF-8';
+	}
 
 	$_quote_style = $quote_style;
 
@@ -941,8 +969,9 @@ 
 	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
 	// Back-compat.
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ( 'single' === $_quote_style ) {
+			$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -1090,8 +1119,9 @@ 
 		$value = ord( $utf8_string[ $i ] );
 
 		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
-				break;
+			if ( $length && ( $unicode_length >= $length ) ) {
+							break;
+			}
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
@@ -1107,8 +1137,9 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
-				break;
+			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length ) {
+							break;
+			}
 			if ( count( $values ) == $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
@@ -1512,8 +1543,9 @@ 
  * @return string Filtered string with replaced "nice" characters.
  */
 function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
-		return $string;
+	if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+	}
 
 	if (seems_utf8($string)) {
 		$chars = array(
@@ -1822,8 +1854,9 @@ 
 					break;
 				}
 			}
-			if ( !$allowed )
-				$filename .= '_';
+			if ( !$allowed ) {
+							$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
@@ -1854,8 +1887,9 @@ 
 	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ( $strict ) {
+			$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	}
 
 	$username = trim( $username );
 	// Consolidate contiguous whitespace
@@ -1916,8 +1950,9 @@ 
 function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
-		$title = remove_accents($title);
+	if ( 'save' == $context ) {
+			$title = remove_accents($title);
+	}
 
 	/**
 	 * Filters a sanitized title string.
@@ -1930,8 +1965,9 @@ 
 	 */
 	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
 
-	if ( '' === $title || false === $title )
-		$title = $fallback_title;
+	if ( '' === $title || false === $title ) {
+			$title = $fallback_title;
+	}
 
 	return $title;
 }
@@ -2246,8 +2282,9 @@ 
 			elseif ( substr( $regex[2], -1 ) == '/' ) {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array( $tag, $single_tags ) ) {
+									$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				}
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
 			elseif ( in_array($tag, $single_tags) ) {
@@ -2265,8 +2302,9 @@ 
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty( $attributes ) && $attributes[0] != '>' ) {
+							$attributes = ' ' . $attributes;
+			}
 
 			$tag = '<' . $tag . $attributes . '>';
 			//If already queuing a close tag, then put this tag on, too
@@ -2286,8 +2324,10 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while( $x = array_pop($tagstack) ) {
+			$newtext .= '</' . $x . '>';
+	}
+	// Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
 	$newtext = str_replace("< !--","<!--",$newtext);
@@ -2321,8 +2361,9 @@ 
 	 * @param string $content The text, prior to formatting for editing.
 	 */
 	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	if ( ! $rich_text ) {
+			$content = esc_textarea( $content );
+	}
 	return $content;
 }
 
@@ -2356,8 +2397,9 @@ 
  * @return string String with backslashes inserted.
  */
 function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
+	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
+			$string = '\\\\' . $string;
+	}
 	return addcslashes( $string, 'A..Za..z' );
 }
 
@@ -2406,8 +2448,9 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
+	if ( get_magic_quotes_gpc() ) {
+			$gpc = stripslashes($gpc);
+	}
 
 	return wp_slash($gpc);
 }
@@ -2527,8 +2570,9 @@ 
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
-		return $matches[0];
+	if ( empty($url) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -2556,8 +2600,9 @@ 
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
-		return $matches[0];
+	if ( empty($dest) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
@@ -2595,10 +2640,11 @@ 
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
-			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
-			$nested_code_pre--;
+		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {
+					$nested_code_pre++;
+		} elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) ) {
+					$nested_code_pre--;
+		}
 
 		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
 			$r .= $piece;
@@ -2775,8 +2821,9 @@ 
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
-		return '';
+	if ( count( $matches ) == 0 ) {
+			return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
 	$img = $wpsmiliestrans[ $smiley ];
@@ -2868,8 +2915,9 @@ 
  * @return string|bool Either false or the valid email address.
  */
 function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
 	// Test for the minimum length the email can be
 	if ( strlen( $email ) < 6 ) {
@@ -3033,13 +3081,15 @@ 
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
+		if ( ! $datetime ) {
+					return date( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( $tz ) );
 		$string_localtime = $datetime->format( $format );
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) ) {
+					return date( $format, 0 );
+		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
@@ -3222,38 +3272,44 @@ 
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
-			$mins = 1;
+		if ( $mins <= 1 ) {
+					$mins = 1;
+		}
 		/* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
 		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
-			$hours = 1;
+		if ( $hours <= 1 ) {
+					$hours = 1;
+		}
 		/* translators: Time difference between two dates, in hours. 1: Number of hours */
 		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
 	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
 		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
-			$days = 1;
+		if ( $days <= 1 ) {
+					$days = 1;
+		}
 		/* translators: Time difference between two dates, in days. 1: Number of days */
 		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
 	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
 		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
-			$weeks = 1;
+		if ( $weeks <= 1 ) {
+					$weeks = 1;
+		}
 		/* translators: Time difference between two dates, in weeks. 1: Number of weeks */
 		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
 	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
 		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
-			$months = 1;
+		if ( $months <= 1 ) {
+					$months = 1;
+		}
 		/* translators: Time difference between two dates, in months. 1: Number of months */
 		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
 	} elseif ( $diff >= YEAR_IN_SECONDS ) {
 		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
-			$years = 1;
+		if ( $years <= 1 ) {
+					$years = 1;
+		}
 		/* translators: Time difference between two dates, in years. 1: Number of years */
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
@@ -3405,8 +3461,9 @@ 
 	 * @param string $text           The text prior to entity conversion.
 	 */
 	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
-		return $filtered;
+	if ( null !== $filtered ) {
+			return $filtered;
+	}
 
 	$to_ncr = array(
 		'&quot;' => '&#34;',
@@ -3768,8 +3825,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	$original_url = $url;
 
-	if ( '' == $url )
-		return $url;
+	if ( '' == $url ) {
+			return $url;
+	}
 
 	$url = str_replace( ' ', '%20', $url );
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
@@ -3789,8 +3847,9 @@ 
 	 * link starting with /, # or ? or a php file).
 	 */
 	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+			$url = 'http://' . $url;
+	}
 
 	// Replace ampersands and single quotes only when displaying.
 	if ( 'display' == $_context ) {
@@ -3839,11 +3898,13 @@ 
 	if ( '/' === $url[0] ) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
-			$protocols = wp_allowed_protocols();
+		if ( ! is_array( $protocols ) ) {
+					$protocols = wp_allowed_protocols();
+		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
-			return '';
+		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
+					return '';
+		}
 	}
 
 	/**
@@ -4089,17 +4150,20 @@ 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
-				$value = 1;
-			if ( $value < -1 )
-				$value = abs($value);
+			if ( empty($value) ) {
+							$value = 1;
+			}
+			if ( $value < -1 ) {
+							$value = abs($value);
+			}
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
-				$value = 'closed';
+			if ( $value == '0' || $value == '') {
+							$value = 'closed';
+			}
 			break;
 
 		case 'blogdescription':
@@ -4122,10 +4186,11 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
-				$value = 1;
-			else
-				$value = intval( $value );
+			if ( null === $value ) {
+							$value = 1;
+			} else {
+							$value = intval( $value );
+			}
 			break;
 
 		case 'date_format':
@@ -4195,13 +4260,15 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( ' ', $value );
+				}
 
 				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
 
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -4211,8 +4278,9 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( "\n", $value );
+				}
 
 				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
 				$value = array();
@@ -4222,8 +4290,9 @@ 
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -4255,8 +4324,9 @@ 
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
-				$value = 'subscriber';
+			if ( ! get_role( $value ) && get_role( 'subscriber' ) ) {
+							$value = 'subscriber';
+			}
 			break;
 
 		case 'moderation_keys':
@@ -4334,8 +4404,9 @@ 
  */
 function wp_parse_str( $string, &$array ) {
 	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+	if ( get_magic_quotes_gpc() ) {
+			$array = stripslashes_deep( $array );
+	}
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
@@ -4369,8 +4440,9 @@ 
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
-		return esc_html($matches[0]);
+	if ( false === strpos($matches[0], '>') ) {
+			return esc_html($matches[0]);
+	}
 	return $matches[0];
 }
 
@@ -4406,8 +4478,9 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
-			$end = $len;
+		if ( false === $end ) {
+					$end = $len;
+		}
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
@@ -4432,10 +4505,11 @@ 
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
-				$fragment = $_fragment;
-			else
-				$fragment = sprintf($fragment, strval($arg) );
+			if ( $_fragment != $fragment ) {
+							$fragment = $_fragment;
+			} else {
+							$fragment = sprintf($fragment, strval($arg) );
+			}
 		}
 
 		// Append to result and move to next fragment
@@ -4460,12 +4534,14 @@ 
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
-		return $pattern;
+	if ( substr($pattern, 0, 2) != '%l' ) {
+			return $pattern;
+	}
 
 	// Nothing to work with
-	if ( empty($args) )
-		return '';
+	if ( empty($args) ) {
+			return '';
+	}
 
 	/**
 	 * Filters the translated delimiters used by wp_sprintf_l().
@@ -4489,17 +4565,19 @@ 
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if ( count($args) == 1 ) {
+			$result .= $l['between_only_two'] . array_shift($args);
+	}
 	// Loop when more than two args
 	$i = count($args);
 	while ( $i ) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
-		else
-			$result .= $l['between'] . $arg;
+		if ( 0 == $i ) {
+					$result .= $l['between_last_two'] . $arg;
+		} else {
+					$result .= $l['between'] . $arg;
+		}
 	}
 	return $result . substr($pattern, 2);
 }
@@ -4519,14 +4597,16 @@ 
  * @return string The excerpt.
  */
 function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
-		$more = '';
+	if ( null === $more ) {
+			$more = '';
+	}
 	$str = wp_strip_all_tags( $str, true );
 	$excerpt = mb_substr( $str, 0, $count );
 	// remove part of an entity at the end
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	if ( $str != $excerpt ) {
+			$excerpt = trim( $excerpt ) . $more;
+	}
 	return $excerpt;
 }
 
@@ -4648,8 +4728,9 @@ 
 	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
-		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	if ( $remove_breaks ) {
+			$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	}
 
 	return trim( $string );
 }
@@ -4784,8 +4865,9 @@ 
 function capital_P_dangit( $text ) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {
+			return str_replace( 'Wordpress', 'WordPress', $text );
+	}
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
 	if ( false === $dblq ) {
@@ -4829,8 +4911,9 @@ 
 function sanitize_trackback_urls( $to_ping ) {
 	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
 	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+		if ( !preg_match( '#^https?://.#i', $url ) ) {
+					unset( $urls_to_ping[$k] );
+		}
 	}
 	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
 	$urls_to_ping = implode( "\n", $urls_to_ping );

src/wp-includes/user.php

Indentation +19 added lines, -19 removed lines

@@ -67,13 +67,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 );
 
@@ -1184,7 +1184,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.
@@ -1625,16 +1625,16 @@ 
 	$user = new WP_User( $user_id );
 
 	/**
- 	 * Filters a user's meta values and keys before the user is created or updated.
- 	 *
- 	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
- 	 *
- 	 * @since 4.4.0
- 	 *
- 	 * @param array $meta {
- 	 *     Default meta values and keys for the user.
- 	 *
- 	 *     @type string   $nickname             The user's nickname. Default is the user's username.
+	 * Filters a user's meta values and keys before the user is created or updated.
+	 *
+	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array $meta {
+	 *     Default meta values and keys for the user.
+	 *
+	 *     @type string   $nickname             The user's nickname. Default is the user's username.
 	 *     @type string   $first_name           The user's first name.
 	 *     @type string   $last_name            The user's last name.
 	 *     @type string   $description          The user's description.
@@ -1645,10 +1645,10 @@ 
 	 *                                          not forced.
 	 *     @type bool     $show_admin_bar_front Whether to show the admin bar on the front end for the user.
 	 *                                          Default true.
- 	 * }
+	 * }
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
- 	 */
+	 */
 	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
 
 	// Update user meta.
@@ -1983,7 +1983,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 );
 }

Doc Comments +3 added lines, -3 removed lines

@@ -386,7 +386,7 @@ 
  * @param array        $users       Array of user IDs.
  * @param string|array $post_type   Optional. Single post type or array of post types to check. Defaults to 'post'.
  * @param bool         $public_only Optional. Only return counts for public posts.  Defaults to false.
- * @return array Amount of posts each user has written.
+ * @return WP_User Amount of posts each user has written.
  */
 function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
 	global $wpdb;
@@ -758,7 +758,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.
  */
@@ -1254,7 +1254,7 @@ 
  * @since 3.0.0
  *
  * @param object|WP_User $user User object to be cached
- * @return bool|null Returns false on failure.
+ * @return false|null Returns false on failure.
  */
 function update_user_caches( $user ) {
 	if ( $user instanceof WP_User ) {

Spacing +496 added lines, -496 removed lines

@@ -25,19 +25,19 @@ 
  * @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) ) {
+function wp_signon($credentials = array(), $secure_cookie = '') {
+	if (empty($credentials)) {
 		$credentials = array(); // Back-compat for plugins passing an empty string.
 
-		if ( ! empty($_POST['log']) )
+		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;
@@ -55,9 +55,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();
 
 	/**
@@ -75,7 +75,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;
@@ -84,8 +84,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('', '');
 		}
 
@@ -101,7 +101,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;
 }
 
@@ -116,20 +116,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;
@@ -137,11 +137,11 @@ 
 
 	$user = get_user_by('login', $username);
 
-	if ( !$user ) {
-		return new WP_Error( 'invalid_username',
-			__( '<strong>ERROR</strong>: Invalid username.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_username',
+			__('<strong>ERROR</strong>: Invalid username.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -155,19 +155,19 @@ 
 	 *                                   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',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: user name */
-				__( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
-				'<strong>' . $username . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the username %s is incorrect.'),
+				'<strong>'.$username.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -186,60 +186,60 @@ 
  * @param string                $password Password for authentication.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_authenticate_email_password( $user, $email, $password ) {
-	if ( $user instanceof WP_User ) {
+function wp_authenticate_email_password($user, $email, $password) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty( $email ) || empty( $password ) ) {
-		if ( is_wp_error( $user ) ) {
+	if (empty($email) || empty($password)) {
+		if (is_wp_error($user)) {
 			return $user;
 		}
 
 		$error = new WP_Error();
 
-		if ( empty( $email ) ) {
-			$error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) ); // Uses 'empty_username' for back-compat with wp_signon()
+		if (empty($email)) {
+			$error->add('empty_username', __('<strong>ERROR</strong>: The email field is empty.')); // Uses 'empty_username' for back-compat with wp_signon()
 		}
 
-		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;
 	}
 
-	if ( ! is_email( $email ) ) {
+	if ( ! is_email($email)) {
 		return $user;
 	}
 
-	$user = get_user_by( 'email', $email );
+	$user = get_user_by('email', $email);
 
-	if ( ! $user ) {
-		return new WP_Error( 'invalid_email',
-			__( '<strong>ERROR</strong>: Invalid email address.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_email',
+			__('<strong>ERROR</strong>: Invalid email address.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
+	$user = apply_filters('wp_authenticate_user', $user, $password);
 
-	if ( is_wp_error( $user ) ) {
+	if (is_wp_error($user)) {
 		return $user;
 	}
 
-	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: email address */
-				__( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
-				'<strong>' . $email . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.'),
+				'<strong>'.$email.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -260,23 +260,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.
@@ -294,8 +294,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()) {
 		/**
 		 * Filters whether the user has been marked as a spammer.
 		 *
@@ -304,10 +304,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 ), $user );
+		$spammed = apply_filters('check_is_user_spammed', is_user_spammy($user), $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;
 }
@@ -327,16 +327,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');
 }
 
 /**
@@ -354,12 +354,12 @@ 
  * @param bool         $public_only Optional. Whether to only return counts for public posts. Default false.
  * @return string 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");
 
 	/**
 	 * Filters the number of posts a user has written.
@@ -373,7 +373,7 @@ 
 	 * @param string|array $post_type   Single post type or array of 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, $public_only );
+	return apply_filters('get_usernumposts', $count, $userid, $post_type, $public_only);
 }
 
 /**
@@ -388,24 +388,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;
@@ -423,10 +423,10 @@ 
  * @return int The current user's ID, or 0 if no user is logged in.
  */
 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);
 }
 
 /**
@@ -448,23 +448,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.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.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;
 
@@ -479,7 +479,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);
 }
 
 /**
@@ -503,13 +503,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);
 }
 
 /**
@@ -529,12 +529,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);
 }
 
 /**
@@ -548,9 +548,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);
@@ -572,13 +572,13 @@ 
  * @return array A list of the user's sites. An empty array if the user doesn't exist
  *               or belongs to no sites.
  */
-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 sites
-	if ( empty( $user_id ) )
+	if (empty($user_id))
 		return array();
 
 	/**
@@ -594,47 +594,47 @@ 
 	 * @param bool       $all     Whether the returned array should contain all sites, including
 	 *                            those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	$sites = apply_filters( 'pre_get_blogs_of_user', null, $user_id, $all );
+	$sites = apply_filters('pre_get_blogs_of_user', null, $user_id, $all);
 
-	if ( null !== $sites ) {
+	if (null !== $sites) {
 		return $sites;
 	}
 
-	$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()) {
 		$site_id = get_current_blog_id();
-		$sites = array( $site_id => new stdClass );
-		$sites[ $site_id ]->userblog_id = $site_id;
-		$sites[ $site_id ]->blogname = get_option('blogname');
-		$sites[ $site_id ]->domain = '';
-		$sites[ $site_id ]->path = '';
-		$sites[ $site_id ]->site_id = 1;
-		$sites[ $site_id ]->siteurl = get_option('siteurl');
-		$sites[ $site_id ]->archived = 0;
-		$sites[ $site_id ]->spam = 0;
-		$sites[ $site_id ]->deleted = 0;
+		$sites = array($site_id => new stdClass);
+		$sites[$site_id]->userblog_id = $site_id;
+		$sites[$site_id]->blogname = get_option('blogname');
+		$sites[$site_id]->domain = '';
+		$sites[$site_id]->path = '';
+		$sites[$site_id]->site_id = 1;
+		$sites[$site_id]->siteurl = get_option('siteurl');
+		$sites[$site_id]->archived = 0;
+		$sites[$site_id]->spam = 0;
+		$sites[$site_id]->deleted = 0;
 		return $sites;
 	}
 
 	$site_ids = array();
 
-	if ( isset( $keys[ $wpdb->base_prefix . 'capabilities' ] ) && defined( 'MULTISITE' ) ) {
+	if (isset($keys[$wpdb->base_prefix.'capabilities']) && defined('MULTISITE')) {
 		$site_ids[] = 1;
-		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;
-		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $site_id ) )
+		$site_id = str_replace(array($wpdb->base_prefix, '_capabilities'), '', $key);
+		if ( ! is_numeric($site_id))
 			continue;
 
 		$site_ids[] = (int) $site_id;
@@ -642,21 +642,21 @@ 
 
 	$sites = array();
 
-	if ( ! empty( $site_ids ) ) {
+	if ( ! empty($site_ids)) {
 		$args = array(
 			'number'   => '',
 			'site__in' => $site_ids,
 		);
-		if ( ! $all ) {
+		if ( ! $all) {
 			$args['archived'] = 0;
 			$args['spam']     = 0;
 			$args['deleted']  = 0;
 		}
 
-		$_sites = get_sites( $args );
+		$_sites = get_sites($args);
 
-		foreach ( $_sites as $site ) {
-			$sites[ $site->id ] = (object) array(
+		foreach ($_sites as $site) {
+			$sites[$site->id] = (object) array(
 				'userblog_id' => $site->id,
 				'blogname'    => $site->blogname,
 				'domain'      => $site->domain,
@@ -681,7 +681,7 @@ 
 	 * @param bool  $all     Whether the returned sites array should contain all sites, including
 	 *                       those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	return apply_filters( 'get_blogs_of_user', $sites, $user_id, $all );
+	return apply_filters('get_blogs_of_user', $sites, $user_id, $all);
 }
 
 /**
@@ -693,55 +693,55 @@ 
  * @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) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 	$blog_id = (int) $blog_id;
 
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
 	// Technically not needed, but does save calls to get_site and get_user_meta
 	// in the event that the function is called when a user isn't logged in
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		return false;
 	} else {
-		$user = get_userdata( $user_id );
-		if ( ! $user instanceof WP_User ) {
+		$user = get_userdata($user_id);
+		if ( ! $user instanceof WP_User) {
 			return false;
 		}
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
-	if ( empty( $blog_id ) ) {
+	if (empty($blog_id)) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$blog = get_site( $blog_id );
+	$blog = get_site($blog_id);
 
-	if ( ! $blog || ! isset( $blog->domain ) || $blog->archived || $blog->spam || $blog->deleted ) {
+	if ( ! $blog || ! isset($blog->domain) || $blog->archived || $blog->spam || $blog->deleted) {
 		return false;
 	}
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) ) {
+	$keys = get_user_meta($user_id);
+	if (empty($keys)) {
 		return false;
 	}
 
 	// no underscore before capabilities in $base_capabilities_key
-	$base_capabilities_key = $wpdb->base_prefix . 'capabilities';
-	$site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
+	$base_capabilities_key = $wpdb->base_prefix.'capabilities';
+	$site_capabilities_key = $wpdb->base_prefix.$blog_id.'_capabilities';
 
-	if ( isset( $keys[ $base_capabilities_key ] ) && $blog_id == 1 ) {
+	if (isset($keys[$base_capabilities_key]) && $blog_id == 1) {
 		return true;
 	}
 
-	if ( isset( $keys[ $site_capabilities_key ] ) ) {
+	if (isset($keys[$site_capabilities_key])) {
 		return true;
 	}
 
@@ -845,29 +845,29 @@ 
 	$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[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))";
 		$select_count = implode(', ', $select_count);
 
 		// Add the meta_value index to the selection list, then run the query.
-		$row = $wpdb->get_row( "
+		$row = $wpdb->get_row("
 			SELECT {$select_count}, COUNT(*)
 			FROM {$wpdb->usermeta}
 			INNER JOIN {$wpdb->users} ON user_id = ID
 			WHERE meta_key = '{$blog_prefix}capabilities'
-		", ARRAY_N );
+		", 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;
@@ -880,28 +880,28 @@ 
 		$total_users = (int) $row[$col];
 
 		$result['total_users'] = $total_users;
-		$result['avail_roles'] =& $role_counts;
+		$result['avail_roles'] = & $role_counts;
 	} else {
 		$avail_roles = array(
 			'none' => 0,
 		);
 
-		$users_of_blog = $wpdb->get_col( "
+		$users_of_blog = $wpdb->get_col("
 			SELECT meta_value
 			FROM {$wpdb->usermeta}
 			INNER JOIN {$wpdb->users} ON user_id = ID
 			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;
-			if ( empty( $b_roles ) ) {
+			if (empty($b_roles)) {
 				$avail_roles['none']++;
 			}
-			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;
@@ -909,11 +909,11 @@ 
 			}
 		}
 
-		$result['total_users'] = count( $users_of_blog );
-		$result['avail_roles'] =& $avail_roles;
+		$result['total_users'] = count($users_of_blog);
+		$result['avail_roles'] = & $avail_roles;
 	}
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$result['avail_roles']['none'] = 0;
 	}
 
@@ -944,11 +944,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;
@@ -1028,7 +1028,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',
@@ -1042,16 +1042,16 @@ 
 		'role__not_in' => array(),
 	);
 
-	$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);
 
-	$query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in' ) );
+	$query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in'));
 
-	$fields = array( 'ID', 'user_login' );
+	$fields = array('ID', 'user_login');
 
-	$show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
-	if ( 'display_name_with_login' === $show ) {
+	$show = ! empty($r['show']) ? $r['show'] : 'display_name';
+	if ('display_name_with_login' === $show) {
 		$fields[] = 'display_name';
 	} else {
 		$fields[] = $show;
@@ -1071,56 +1071,56 @@ 
 	 * @param array $query_args The query arguments for get_users().
 	 * @param array $r          The arguments passed to wp_dropdown_users() combined with the defaults.
 	 */
-	$query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $r );
+	$query_args = apply_filters('wp_dropdown_users_args', $query_args, $r);
 
-	$users = get_users( $query_args );
+	$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";
 		}
 
-		if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
+		if ($r['include_selected'] && ($r['selected'] > 0)) {
 			$found_selected = false;
 			$r['selected'] = (int) $r['selected'];
-			foreach ( (array) $users as $user ) {
+			foreach ((array) $users as $user) {
 				$user->ID = (int) $user->ID;
-				if ( $user->ID === $r['selected'] ) {
+				if ($user->ID === $r['selected']) {
 					$found_selected = true;
 				}
 			}
 
-			if ( ! $found_selected ) {
-				$users[] = get_userdata( $r['selected'] );
+			if ( ! $found_selected) {
+				$users[] = get_userdata($r['selected']);
 			}
 		}
 
-		foreach ( (array) $users as $user ) {
-			if ( 'display_name_with_login' === $show ) {
+		foreach ((array) $users as $user) {
+			if ('display_name_with_login' === $show) {
 				/* translators: 1: display name, 2: user_login */
-				$display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login );
-			} elseif ( ! empty( $user->$show ) ) {
+				$display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_login);
+			} elseif ( ! empty($user->$show)) {
 				$display = $user->$show;
 			} else {
-				$display = '(' . $user->user_login . ')';
+				$display = '('.$user->user_login.')';
 			}
 
-			$_selected = selected( $user->ID, $r['selected'], false );
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+			$_selected = selected($user->ID, $r['selected'], false);
+			$output .= "\t<option value='$user->ID'$_selected>".esc_html($display)."</option>\n";
 		}
 
 		$output .= "</select>";
@@ -1133,9 +1133,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;
@@ -1159,22 +1159,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 {
 
 			/**
@@ -1188,17 +1188,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 {
 
 			/**
@@ -1211,14 +1211,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 {
 
 			/**
@@ -1233,17 +1233,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;
 }
@@ -1256,9 +1256,9 @@ 
  * @param object|WP_User $user User object to be cached
  * @return bool|null Returns false on failure.
  */
-function update_user_caches( $user ) {
-	if ( $user instanceof WP_User ) {
-		if ( ! $user->exists() ) {
+function update_user_caches($user) {
+	if ($user instanceof WP_User) {
+		if ( ! $user->exists()) {
 			return false;
 		}
 
@@ -1279,17 +1279,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');
 
 	/**
 	 * Fires immediately after the given user's cache is cleaned.
@@ -1299,7 +1299,7 @@ 
 	 * @param int     $user_id User ID.
 	 * @param WP_User $user    User object.
 	 */
-	do_action( 'clean_user_cache', $user->ID, $user );
+	do_action('clean_user_cache', $user->ID, $user);
 }
 
 /**
@@ -1310,8 +1310,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;
@@ -1325,8 +1325,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;
@@ -1341,9 +1341,9 @@ 
  * @param string $username Username.
  * @return bool Whether username given is valid
  */
-function validate_username( $username ) {
-	$sanitized = sanitize_user( $username, true );
-	$valid = ( $sanitized == $username && ! empty( $sanitized ) );
+function validate_username($username) {
+	$sanitized = sanitize_user($username, true);
+	$valid = ($sanitized == $username && ! empty($sanitized));
 
 	/**
 	 * Filters whether the provided username is valid or not.
@@ -1353,7 +1353,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);
 }
 
 /**
@@ -1408,34 +1408,34 @@ 
  * @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 = get_userdata( $ID );
+		$old_user_data = get_userdata($ID);
 
-		if ( ! $old_user_data ) {
-			return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+		if ( ! $old_user_data) {
+			return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 		}
 
 		// hashed in wp_update_user(), plaintext if called directly
-		$user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass;
+		$user_pass = ! empty($userdata['user_pass']) ? $userdata['user_pass'] : $old_user_data->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);
 
 	/**
 	 * Filters a username after it has been sanitized.
@@ -1446,20 +1446,20 @@ 
 	 *
 	 * @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);
 
 	// user_login must be between 0 and 60 characters.
-	if ( empty( $user_login ) ) {
-		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
-	} elseif ( mb_strlen( $user_login ) > 60 ) {
-		return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) );
+	if (empty($user_login)) {
+		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.'));
+	} elseif (mb_strlen($user_login) > 60) {
+		return new WP_Error('user_login_too_long', __('Username may not be longer than 60 characters.'));
 	}
 
-	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!'));
 	}
 
 	/**
@@ -1469,26 +1469,26 @@ 
 	 *
 	 * @param array $usernames Array of blacklisted usernames.
 	 */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		return new WP_Error( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_login), array_map('strtolower', $illegal_logins))) {
+		return new WP_Error('invalid_username', __('Sorry, that username is not allowed.'));
 	}
 
 	/*
 	 * 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 ( mb_strlen( $user_nicename ) > 50 ) {
-			return new WP_Error( 'user_nicename_too_long', __( 'Nicename may not be longer than 50 characters.' ) );
+	if ( ! empty($userdata['user_nicename'])) {
+		$user_nicename = sanitize_user($userdata['user_nicename'], true);
+		if (mb_strlen($user_nicename) > 50) {
+			return new WP_Error('user_nicename_too_long', __('Nicename may not be longer than 50 characters.'));
 		}
 	} else {
-		$user_nicename = mb_substr( $user_login, 0, 50 );
+		$user_nicename = mb_substr($user_login, 0, 50);
 	}
 
-	$user_nicename = sanitize_title( $user_nicename );
+	$user_nicename = sanitize_title($user_nicename);
 
 	// Store values to save in user meta.
 	$meta = array();
@@ -1500,9 +1500,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'];
 
 	/**
 	 * Filters a user's URL before the user is created or updated.
@@ -1511,9 +1511,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'];
 
 	/**
 	 * Filters a user's email before the user is created or updated.
@@ -1522,20 +1522,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'];
 
 	/**
 	 * Filters a user's nickname before the user is created or updated.
@@ -1544,9 +1544,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'];
 
 	/**
 	 * Filters a user's first name before the user is created or updated.
@@ -1555,9 +1555,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'];
 
 	/**
 	 * Filters a user's last name before the user is created or updated.
@@ -1566,17 +1566,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;
@@ -1592,9 +1592,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'];
 
 	/**
 	 * Filters a user's description before the user is created or updated.
@@ -1603,52 +1603,52 @@ 
 	 *
 	 * @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'];
 
-	$meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
+	$meta['locale'] = isset($userdata['locale']) ? $userdata['locale'] : '';
 
-	$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) {
 			// user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.
-			$base_length = 49 - mb_strlen( $suffix );
-			$alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$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));
+			$base_length = 49 - mb_strlen($suffix);
+			$alt_user_nicename = mb_substr($user_nicename, 0, $base_length)."-$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);
 
 	/**
  	 * Filters a user's meta values and keys before the user is created or updated.
@@ -1675,28 +1675,28 @@ 
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
  	 */
-	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
+	$meta = apply_filters('insert_user_meta', $meta, $user, $update);
 
 	// 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.
 		 *
@@ -1705,7 +1705,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.
@@ -1714,7 +1714,7 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'user_register', $user_id );
+		do_action('user_register', $user_id);
 	}
 
 	return $user_id;
@@ -1737,37 +1737,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'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
+	if ( ! empty($userdata['user_pass']) && $userdata['user_pass'] !== $user_obj->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']);
 
 		/**
 		 * Filters whether to send the password change email.
@@ -1781,10 +1781,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']) {
 		/**
 		 * Filters whether to send the email change email.
 		 *
@@ -1797,28 +1797,28 @@ 
 		 * @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_nicename'], 'userslugs' );
+	wp_cache_delete($user['user_email'], 'useremail');
+	wp_cache_delete($user['user_nicename'], 'userslugs');
 
 	// 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' ), ENT_QUOTES );
+		$blog_name = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
 		$switched_locale = false;
-		if ( ! empty( $send_password_change_email ) || ! empty( $send_email_change_email ) ) {
-			$switched_locale = switch_to_locale( get_user_locale( $user_id ) );
+		if ( ! empty($send_password_change_email) || ! empty($send_email_change_email)) {
+			$switched_locale = switch_to_locale(get_user_locale($user_id));
 		}
 
-		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###.
 
@@ -1834,7 +1834,7 @@ 
 			$pass_change_email = array(
 				'to'      => $user['user_email'],
 				/* translators: User password change notification email subject. 1: Site name */
-				'subject' => __( '[%s] Notice of Password Change' ),
+				'subject' => __('[%s] Notice of Password Change'),
 				'message' => $pass_change_text,
 				'headers' => '',
 			);
@@ -1861,20 +1861,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###', $blog_name, $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $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###', $blog_name, $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITEURL###', home_url(), $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###.
 
@@ -1890,7 +1890,7 @@ 
 			$email_change_email = array(
 				'to'      => $user['user_email'],
 				/* translators: User email change notification email subject. 1: Site name */
-				'subject' => __( '[%s] Notice of Email Change' ),
+				'subject' => __('[%s] Notice of Email Change'),
 				'message' => $email_change_text,
 				'headers' => '',
 			);
@@ -1916,36 +1916,36 @@ 
 			 * @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###', $blog_name, $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $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###', $blog_name, $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITEURL###', home_url(), $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']);
 		}
 
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 	}
 
 	// 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);
 		}
 	}
 
@@ -1968,8 +1968,8 @@ 
  *                      be created.
  */
 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');
@@ -1988,9 +1988,9 @@ 
  * @param WP_User $user WP_User instance.
  * @return array List of user keys to be populated in wp_update_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', 'locale' );
-	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', 'locale');
+	return array_merge($keys, array_keys(wp_get_user_contact_methods($user)));
 }
 
 /**
@@ -2003,13 +2003,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')
 		);
 	}
 
@@ -2021,7 +2021,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);
 }
 
 /**
@@ -2035,8 +2035,8 @@ 
  * @param WP_User $user Optional. WP_User object. Default null.
  * @return array Array of contact methods and their labels.
  */
-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);
 }
 
 /**
@@ -2047,7 +2047,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; ).');
 
 	/**
 	 * Filters the text describing the site's password complexity policy.
@@ -2056,7 +2056,7 @@ 
 	 *
 	 * @param string $hint The password hint text.
 	 */
-	return apply_filters( 'password_hint', $hint );
+	return apply_filters('password_hint', $hint);
 }
 
 /**
@@ -2071,7 +2071,7 @@ 
  *
  * @return string|WP_Error Password reset key on success. WP_Error on error.
  */
-function get_password_reset_key( $user ) {
+function get_password_reset_key($user) {
 	global $wpdb, $wp_hasher;
 
 	/**
@@ -2084,7 +2084,7 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retreive_password', $user->user_login );
+	do_action('retreive_password', $user->user_login);
 
 	/**
 	 * Fires before a new password is retrieved.
@@ -2093,10 +2093,10 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retrieve_password', $user->user_login );
+	do_action('retrieve_password', $user->user_login);
 
 	$allow = true;
-	if ( is_multisite() && is_user_spammy( $user ) ) {
+	if (is_multisite() && is_user_spammy($user)) {
 		$allow = false;
 	}
 
@@ -2108,16 +2108,16 @@ 
 	 * @param bool $allow         Whether to allow the password to be reset. Default true.
 	 * @param int  $user_data->ID The ID of the user attempting to reset a password.
 	 */
-	$allow = apply_filters( 'allow_password_reset', $allow, $user->ID );
+	$allow = apply_filters('allow_password_reset', $allow, $user->ID);
 
-	if ( ! $allow ) {
-		return new WP_Error( 'no_password_reset', __( 'Password reset is not allowed for this user' ) );
-	} elseif ( is_wp_error( $allow ) ) {
+	if ( ! $allow) {
+		return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
+	} elseif (is_wp_error($allow)) {
 		return $allow;
 	}
 
 	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
+	$key = wp_generate_password(20, false);
 
 	/**
 	 * Fires when a password reset key is generated.
@@ -2127,17 +2127,17 @@ 
 	 * @param string $user_login The username for the user.
 	 * @param string $key        The generated password reset key.
 	 */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
+	do_action('retrieve_password_key', $user->user_login, $key);
 
 	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$wp_hasher = new PasswordHash(8, true);
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
-	if ( false === $key_saved ) {
-		return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
+	$hashed = time().':'.$wp_hasher->HashPassword($key);
+	$key_saved = $wpdb->update($wpdb->users, array('user_activation_key' => $hashed), array('user_login' => $user->user_login));
+	if (false === $key_saved) {
+		return new WP_Error('no_password_key_update', __('Could not save password reset key to database.'));
 	}
 
 	return $key;
@@ -2165,19 +2165,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);
 	}
 
 	/**
@@ -2187,31 +2187,31 @@ 
 	 *
 	 * @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;
 	}
 
-	if ( ! $pass_key ) {
-		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	if ( ! $pass_key) {
+		return new WP_Error('invalid_key', __('Invalid key'));
 	}
 
-	$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;
 
 		/**
@@ -2225,10 +2225,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'));
 }
 
 /**
@@ -2239,7 +2239,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.
 	 *
@@ -2248,10 +2248,10 @@ 
 	 * @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);
 
 	/**
 	 * Fires after the user's password is reset.
@@ -2261,7 +2261,7 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'after_password_reset', $user, $new_pass );
+	do_action('after_password_reset', $user, $new_pass);
 }
 
 /**
@@ -2273,10 +2273,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);
 	/**
 	 * Filters the email address of a user being registered.
 	 *
@@ -2284,33 +2284,33 @@ 
 	 *
 	 * @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.'));
 
 	} else {
 		/** This filter is documented in wp-includes/user.php */
-		$illegal_user_logins = array_map( 'strtolower', (array) apply_filters( 'illegal_user_logins', array() ) );
-		if ( in_array( strtolower( $sanitized_user_login ), $illegal_user_logins ) ) {
-			$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+		$illegal_user_logins = array_map('strtolower', (array) apply_filters('illegal_user_logins', array()));
+		if (in_array(strtolower($sanitized_user_login), $illegal_user_logins)) {
+			$errors->add('invalid_username', __('<strong>ERROR</strong>: Sorry, that username is not allowed.'));
 		}
 	}
 
 	// Check the email address
-	if ( $user_email == '' ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email 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 email 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.'));
 	}
 
 	/**
@@ -2324,7 +2324,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);
 
 	/**
 	 * Filters the errors encountered when a new user is being registered.
@@ -2342,19 +2342,19 @@ 
 	 * @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.
 
 	/**
 	 * Fires after a new user registration has been recorded.
@@ -2363,7 +2363,7 @@ 
 	 *
 	 * @param int $user_id ID of the newly registered user.
 	 */
-	do_action( 'register_new_user', $user_id );
+	do_action('register_new_user', $user_id);
 
 	return $user_id;
 }
@@ -2382,8 +2382,8 @@ 
  *                        or an empty string (admin only), 'user', or 'both' (admin and user).
  *                        Default 'both'.
  */
-function wp_send_new_user_notifications( $user_id, $notify = 'both' ) {
-	wp_new_user_notification( $user_id, null, $notify );
+function wp_send_new_user_notifications($user_id, $notify = 'both') {
+	wp_new_user_notification($user_id, null, $notify);
 }
 
 /**
@@ -2394,8 +2394,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'] : '';
 }
 
 /**
@@ -2405,7 +2405,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();
 }
 
@@ -2416,9 +2416,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);
 	}
 }
 
@@ -2429,9 +2429,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);
 	}
 }
 
@@ -2441,7 +2441,7 @@ 
  * @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();
 }
 
@@ -2457,19 +2457,19 @@ 
 function wp_get_users_with_no_role() {
 	global $wpdb;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		return array();
 	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	$regex  = implode( '|', array_keys( wp_roles()->get_names() ) );
-	$regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
-	$users  = $wpdb->get_col( $wpdb->prepare( "
+	$regex  = implode('|', array_keys(wp_roles()->get_names()));
+	$regex  = preg_replace('/[^a-zA-Z_\|-]/', '', $regex);
+	$users  = $wpdb->get_col($wpdb->prepare("
 		SELECT user_id
 		FROM $wpdb->usermeta
 		WHERE meta_key = '{$prefix}capabilities'
 		AND meta_value NOT REGEXP %s
-	", $regex ) );
+	", $regex));
 
 	return $users;
 }
@@ -2496,27 +2496,27 @@ 
 function _wp_get_current_user() {
 	global $current_user;
 
-	if ( ! empty( $current_user ) ) {
-		if ( $current_user instanceof WP_User ) {
+	if ( ! empty($current_user)) {
+		if ($current_user instanceof WP_User) {
 			return $current_user;
 		}
 
 		// Upgrade stdClass to WP_User
-		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+		if (is_object($current_user) && isset($current_user->ID)) {
 			$cur_id = $current_user->ID;
 			$current_user = null;
-			wp_set_current_user( $cur_id );
+			wp_set_current_user($cur_id);
 			return $current_user;
 		}
 
 		// $current_user has a junk value. Force to WP_User with ID 0.
 		$current_user = null;
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-		wp_set_current_user( 0 );
+	if (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
@@ -2533,13 +2533,13 @@ 
 	 *
 	 * @param int|bool $user_id User ID if one has been determined, false otherwise.
 	 */
-	$user_id = apply_filters( 'determine_current_user', false );
-	if ( ! $user_id ) {
-		wp_set_current_user( 0 );
+	$user_id = apply_filters('determine_current_user', false);
+	if ( ! $user_id) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	wp_set_current_user( $user_id );
+	wp_set_current_user($user_id);
 
 	return $current_user;
 }

Braces +132 added lines, -88 removed lines

@@ -29,18 +29,22 @@ 
 	if ( empty($credentials) ) {
 		$credentials = array(); // Back-compat for plugins passing an empty string.
 
-		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.
@@ -57,8 +61,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();
+	}
 
 	/**
 	 * Filters whether to use a secure sign-on cookie.
@@ -121,16 +126,19 @@ 
 	}
 
 	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;
 	}
@@ -156,8 +164,9 @@ 
 	 * @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',
@@ -266,18 +275,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.
 	}
@@ -306,8 +318,9 @@ 
 		 */
 		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $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;
 }
@@ -392,8 +405,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 );
@@ -404,8 +418,9 @@ 
 	}
 
 	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+		if ( ! isset( $count[ $id ] ) ) {
+					$count[ $id ] = 0;
+		}
 	}
 
 	return $count;
@@ -423,8 +438,9 @@ 
  * @return int The current user's ID, or 0 if no user is logged in.
  */
 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 );
 }
@@ -451,22 +467,28 @@ 
 function get_user_option( $option, $user = 0, $deprecated = '' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.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;
+	}
 
 	/**
 	 * Filters a specific user option value.
@@ -506,8 +528,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 );
 }
@@ -532,8 +555,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 );
 }
 
@@ -578,8 +602,9 @@ 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have sites
-	if ( empty( $user_id ) )
-		return array();
+	if ( empty( $user_id ) ) {
+			return array();
+	}
 
 	/**
 	 * Filters the list of a user's sites before it is populated.
@@ -601,8 +626,9 @@ 
 	}
 
 	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
-		return array();
+	if ( empty( $keys ) ) {
+			return array();
+	}
 
 	if ( ! is_multisite() ) {
 		$site_id = get_current_blog_id();
@@ -629,13 +655,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;
+		}
 		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $site_id ) )
-			continue;
+		if ( ! is_numeric( $site_id ) ) {
+					continue;
+		}
 
 		$site_ids[] = (int) $site_id;
 	}
@@ -895,8 +924,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;
+			}
 			if ( empty( $b_roles ) ) {
 				$avail_roles['none']++;
 			}
@@ -944,8 +974,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 ) {
@@ -1159,14 +1190,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_' );
 
@@ -1191,10 +1225,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 */
@@ -1237,8 +1274,9 @@ 
 		}
 	}
 
-	if ( 'user_url' == $field )
-		$value = esc_url($value);
+	if ( 'user_url' == $field ) {
+			$value = esc_url($value);
+	}
 
 	if ( 'attribute' == $context ) {
 		$value = esc_attr( $value );
@@ -1280,11 +1318,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' );
@@ -2165,15 +2205,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';
@@ -2344,8 +2387,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 );