ntwb / wordpress

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

Spacing +58 added lines, -58 removed lines

@@ -96,27 +96,27 @@ 
 	 * @param int $network_id The ID of the network to retrieve.
 	 * @return WP_Network|bool The network's object if found. False if not.
 	 */
-	public static function get_instance( $network_id ) {
+	public static function get_instance($network_id) {
 		global $wpdb;
 
 		$network_id = (int) $network_id;
-		if ( ! $network_id ) {
+		if ( ! $network_id) {
 			return false;
 		}
 
-		$_network = wp_cache_get( $network_id, 'networks' );
+		$_network = wp_cache_get($network_id, 'networks');
 
-		if ( ! $_network ) {
-			$_network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->site} WHERE id = %d LIMIT 1", $network_id ) );
+		if ( ! $_network) {
+			$_network = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->site} WHERE id = %d LIMIT 1", $network_id));
 
-			if ( empty( $_network ) || is_wp_error( $_network ) ) {
+			if (empty($_network) || is_wp_error($_network)) {
 				return false;
 			}
 
-			wp_cache_add( $network_id, $_network, 'networks' );
+			wp_cache_add($network_id, $_network, 'networks');
 		}
 
-		return new WP_Network( $_network );
+		return new WP_Network($_network);
 	}
 
 	/**
@@ -130,8 +130,8 @@ 
 	 *
 	 * @param WP_Network|object $network A network object.
 	 */
-	public function __construct( $network ) {
-		foreach( get_object_vars( $network ) as $key => $value ) {
+	public function __construct($network) {
+		foreach (get_object_vars($network) as $key => $value) {
 			$this->$key = $value;
 		}
 
@@ -150,8 +150,8 @@ 
 	 * @param string $key Property to get.
 	 * @return mixed Value of the property. Null if not available.
 	 */
-	public function __get( $key ) {
-		switch ( $key ) {
+	public function __get($key) {
+		switch ($key) {
 			case 'id';
 				return (int) $this->id;
 			case 'blog_id':
@@ -174,8 +174,8 @@ 
 	 * @param string $key Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $key ) {
-		switch ( $key ) {
+	public function __isset($key) {
+		switch ($key) {
 			case 'id':
 			case 'blog_id':
 			case 'site_id':
@@ -196,8 +196,8 @@ 
 	 * @param string $key   Property to set.
 	 * @param mixed  $value Value to assign to the property.
 	 */
-	public function __set( $key, $value ) {
-		switch ( $key ) {
+	public function __set($key, $value) {
+		switch ($key) {
 			case 'id':
 				$this->id = (int) $value;
 				break;
@@ -217,12 +217,12 @@ 
 	 * @access private
 	 */
 	private function _set_site_name() {
-		if ( ! empty( $this->site_name ) ) {
+		if ( ! empty($this->site_name)) {
 			return;
 		}
 
-		$default = ucfirst( $this->domain );
-		$this->site_name = get_network_option( $this->id, 'site_name', $default );
+		$default = ucfirst($this->domain);
+		$this->site_name = get_network_option($this->id, 'site_name', $default);
 	}
 
 	/**
@@ -235,13 +235,13 @@ 
 	 * @access private
 	 */
 	private function _set_cookie_domain() {
-		if ( ! empty( $this->cookie_domain ) ) {
+		if ( ! empty($this->cookie_domain)) {
 			return;
 		}
 
 		$this->cookie_domain = $this->domain;
-		if ( 'www.' === substr( $this->cookie_domain, 0, 4 ) ) {
-			$this->cookie_domain = substr( $this->cookie_domain, 4 );
+		if ('www.' === substr($this->cookie_domain, 0, 4)) {
+			$this->cookie_domain = substr($this->cookie_domain, 4);
 		}
 	}
 
@@ -264,19 +264,19 @@ 
 	 * @param int|null $segments Path segments to use. Defaults to null, or the full path.
 	 * @return WP_Network|bool Network object if successful. False when no network is found.
 	 */
-	public static function get_by_path( $domain = '', $path = '', $segments = null ) {
+	public static function get_by_path($domain = '', $path = '', $segments = null) {
 		global $wpdb;
 
-		$domains = array( $domain );
-		$pieces  = explode( '.', $domain );
+		$domains = array($domain);
+		$pieces  = explode('.', $domain);
 
 		/*
 		 * It's possible one domain to search is 'com', but it might as well
 		 * be 'localhost' or some other locally mapped domain.
 		 */
-		while ( array_shift( $pieces ) ) {
-			if ( ! empty( $pieces ) ) {
-				$domains[] = implode( '.', $pieces );
+		while (array_shift($pieces)) {
+			if ( ! empty($pieces)) {
+				$domains[] = implode('.', $pieces);
 			}
 		}
 
@@ -290,17 +290,17 @@ 
 		 * drawbacks depending on the setup, so this is best done per-install.
 		 */
 		$using_paths = true;
-		if ( wp_using_ext_object_cache() ) {
-			$using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
-			if ( false === $using_paths ) {
-				$using_paths = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1" );
-				wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
+		if (wp_using_ext_object_cache()) {
+			$using_paths = wp_cache_get('networks_have_paths', 'site-options');
+			if (false === $using_paths) {
+				$using_paths = (int) $wpdb->get_var("SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1");
+				wp_cache_add('networks_have_paths', $using_paths, 'site-options');
 			}
 		}
 
 		$paths = array();
-		if ( $using_paths ) {
-			$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+		if ($using_paths) {
+			$path_segments = array_filter(explode('/', trim($path, '/')));
 
 			/**
 			 * Filters the number of path segments to consider when searching for a site.
@@ -313,15 +313,15 @@ 
 			 * @param string   $domain   The requested domain.
 			 * @param string   $path     The requested path, in full.
 			 */
-			$segments = apply_filters( 'network_by_path_segments_count', $segments, $domain, $path );
+			$segments = apply_filters('network_by_path_segments_count', $segments, $domain, $path);
 
-			if ( ( null !== $segments ) && count( $path_segments ) > $segments ) {
-				$path_segments = array_slice( $path_segments, 0, $segments );
+			if ((null !== $segments) && count($path_segments) > $segments) {
+				$path_segments = array_slice($path_segments, 0, $segments);
 			}
 
-			while ( count( $path_segments ) ) {
-				$paths[] = '/' . implode( '/', $path_segments ) . '/';
-				array_pop( $path_segments );
+			while (count($path_segments)) {
+				$paths[] = '/'.implode('/', $path_segments).'/';
+				array_pop($path_segments);
 			}
 
 			$paths[] = '/';
@@ -346,38 +346,38 @@ 
 		 *                                   Default null, meaning the entire path was to be consulted.
 		 * @param array            $paths    The paths to search for, based on $path and $segments.
 		 */
-		$pre = apply_filters( 'pre_get_network_by_path', null, $domain, $path, $segments, $paths );
-		if ( null !== $pre ) {
+		$pre = apply_filters('pre_get_network_by_path', null, $domain, $path, $segments, $paths);
+		if (null !== $pre) {
 			return $pre;
 		}
 
 		// @todo Consider additional optimization routes, perhaps as an opt-in for plugins.
 		// We already have paths covered. What about how far domains should be drilled down (including www)?
 
-		$search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+		$search_domains = "'".implode("', '", $wpdb->_escape($domains))."'";
 
-		if ( ! $using_paths ) {
-			$network = $wpdb->get_row( "
+		if ( ! $using_paths) {
+			$network = $wpdb->get_row("
 				SELECT * FROM {$wpdb->site}
 				WHERE domain IN ({$search_domains})
 				ORDER BY CHAR_LENGTH(domain)
 				DESC LIMIT 1
-			" );
+			");
 
-			if ( ! empty( $network ) && ! is_wp_error( $network ) ) {
-				return new WP_Network( $network );
+			if ( ! empty($network) && ! is_wp_error($network)) {
+				return new WP_Network($network);
 			}
 
 			return false;
 
 		} else {
-			$search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-			$networks = $wpdb->get_results( "
+			$search_paths = "'".implode("', '", $wpdb->_escape($paths))."'";
+			$networks = $wpdb->get_results("
 				SELECT * FROM {$wpdb->site}
 				WHERE domain IN ({$search_domains})
 				AND path IN ({$search_paths})
 				ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC
-			" );
+			");
 		}
 
 		/*
@@ -386,21 +386,21 @@ 
 		 * a network with the path of / will suffice.
 		 */
 		$found = false;
-		foreach ( $networks as $network ) {
-			if ( ( $network->domain === $domain ) || ( "www.{$network->domain}" === $domain ) ) {
-				if ( in_array( $network->path, $paths, true ) ) {
+		foreach ($networks as $network) {
+			if (($network->domain === $domain) || ("www.{$network->domain}" === $domain)) {
+				if (in_array($network->path, $paths, true)) {
 					$found = true;
 					break;
 				}
 			}
-			if ( $network->path === '/' ) {
+			if ($network->path === '/') {
 				$found = true;
 				break;
 			}
 		}
 
-		if ( true === $found ) {
-			return new WP_Network( $network );
+		if (true === $found) {
+			return new WP_Network($network);
 		}
 
 		return false;

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 = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) );
+	$path = trailingslashit(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/ms-functions.php

Indentation +2 added lines, -2 removed lines

@@ -1534,7 +1534,7 @@ 
 	$current_site = get_current_site();
 
 	/**
- 	 * Filters whether to bypass the welcome email after user activation.
+	 * Filters whether to bypass the welcome email after user activation.
 	 *
 	 * Returning false disables the welcome email.
 	 *
@@ -2054,7 +2054,7 @@ 
  * @return bool
  */
 function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
+	if ( ! ( $user instanceof WP_User ) ) {
 		if ( $user ) {
 			$user = get_user_by( 'login', $user );
 		} else {

Doc Comments +1 added lines, -1 removed lines

@@ -2191,7 +2191,7 @@
  *
  * @staticvar bool $forced_content
  *
- * @param bool $force
+ * @param string|boolean $force
  * @return bool True if forced, false if not forced.
  */
 function force_ssl_content( $force = '' ) {

Spacing +508 added lines, -508 removed lines

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

Braces +280 added lines, -191 removed lines

@@ -42,11 +42,13 @@ 
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
-		return;
+	if ( empty( $blogs ) ) {
+			return;
+	}
 
-	if ( !is_multisite() )
-		return $blogs[$wpdb->blogid];
+	if ( !is_multisite() ) {
+			return $blogs[$wpdb->blogid];
+	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	$first_blog = current($blogs);
@@ -69,15 +71,18 @@ 
 		$ret = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
-					continue;
+				if ( $blog->site_id != $wpdb->siteid ) {
+									continue;
+				}
 				$details = get_site( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+											update_user_meta( $user_id, 'primary_blog', $blog_id );
+					}
+					if ( !get_user_meta($user_id , 'source_domain', true) ) {
+											update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -114,8 +119,9 @@ 
  * @return int
  */
 function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if ( func_num_args() ) {
+			_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
 	return get_site_option( 'blog_count' );
 }
@@ -223,8 +229,9 @@ 
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
-				continue;
+			if ( $blog->userblog_id == $blog_id ) {
+							continue;
+			}
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
@@ -308,10 +315,12 @@ 
 	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) {
+		// blog does not exist
 		return 0;
-	elseif ( $id )
-		return (int) $id;
+	} elseif ( $id ) {
+			return (int) $id;
+	}
 
 	$args = array(
 		'domain' => $domain,
@@ -348,8 +357,9 @@ 
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+	if ( $banned_names && ! is_array( $banned_names ) ) {
+			$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
@@ -360,8 +370,9 @@ 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
-				continue;
+			if ( ! $banned_domain ) {
+							continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -422,8 +433,9 @@ 
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
@@ -441,22 +453,26 @@ 
 		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
 	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if ( is_email_address_unsafe( $user_email ) ) {
+			$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+			$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+			$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	}
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( !is_email( $user_email ) ) {
+			$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
@@ -467,12 +483,14 @@ 
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if ( username_exists($user_name) ) {
+			$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if ( email_exists($user_email) ) {
+			$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -481,20 +499,22 @@ 
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		} else {
+					$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		}
 	}
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		} else {
+					$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		}
 	}
 
 	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
@@ -566,26 +586,31 @@ 
 		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+			$errors->add('blogname', __( 'Please enter a site name.' ) );
+	}
 
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
 		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+			$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	}
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if ( strlen( $blogname ) < 4 && !is_super_admin() ) {
+			$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+			$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+			$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	}
 
 	/**
 	 * Filters the new site name during registration.
@@ -601,8 +626,9 @@ 
 
 	$blog_title = wp_unslash(  $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+			$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
@@ -612,12 +638,14 @@ 
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_network->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($mydomain, $path, $current_network->id) ) {
+			$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) {
+					$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
@@ -625,10 +653,11 @@ 
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		} else {
+					$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		}
 	}
 
 	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
@@ -789,15 +818,18 @@ 
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_network_id() != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
-		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	if ( !is_subdomain_install() || get_current_network_id() != 1 ) {
+			$activate_url = network_site_url("wp-activate.php?key=$key");
+	} else {
+			$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+	}
+	// @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
@@ -894,16 +926,18 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) ) {
+			return false;
+	}
 
 	$user = get_user_by( 'login', $user_login );
 	$switched_locale = switch_to_locale( get_user_locale( $user ) );
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -976,14 +1010,16 @@ 
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if ( empty( $signup ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	}
 
 	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		if ( empty( $signup->domain ) ) {
+					return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+					return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
 	}
 
 	$meta = maybe_unserialize($signup->meta);
@@ -991,21 +1027,24 @@ 
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
-		$user_already_exists = true;
+	if ( ! $user_id ) {
+			$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
+	} else {
+			$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+			return new WP_Error('create_user', __('Could not create user'), $signup);
+	}
 
 	$now = current_time('mysql', true);
 
 	if ( empty($signup->domain) ) {
 		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+					return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		}
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1069,8 +1108,9 @@ 
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
-		return false;
+	if ( is_wp_error( $user_id ) ) {
+			return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1119,25 +1159,29 @@ 
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if ( is_subdomain_install() ) {
+			$domain = str_replace( '@', '', $domain );
+	}
 
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( ! wp_installing() ) {
 		wp_installing( true );
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return new WP_Error('insert_blog', __('Could not create site.'));
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id, $title);
@@ -1146,16 +1190,18 @@ 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
-		else
-			update_option( $key, $value );
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
+					update_blog_status( $blog_id, $key, $value );
+		} else {
+					update_option( $key, $value );
+		}
 	}
 
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1190,12 +1236,14 @@ 
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
@@ -1236,13 +1284,15 @@ 
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1328,8 +1378,9 @@ 
 	$site_id = (int) $site_id;
 
 	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	refresh_blog_details( $blog_id );
@@ -1363,8 +1414,9 @@ 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
+			die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1393,10 +1445,11 @@ 
 	update_option( 'siteurl', $siteurl );
 	update_option( 'home', $home );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
-		update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
+			update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	} else {
+			update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
@@ -1466,8 +1519,9 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1517,15 +1571,17 @@ 
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
-		$current_network->site_name = 'WordPress';
+	if ( empty( $current_network->site_name ) ) {
+			$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New site notification email subject. 1: Network name, 2: New site name */
 	$subject = __( 'New %1$s Site: %2$s' );
@@ -1576,8 +1632,9 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1605,15 +1662,17 @@ 
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
-		$current_network->site_name = 'WordPress';
+	if ( empty( $current_network->site_name ) ) {
+			$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New user notification email subject. 1: Network name, 2: New user login */
 	$subject = __( 'New %1$s User: %2$s' );
@@ -1715,11 +1774,13 @@ 
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
+			return $dirsize[ $directory ][ 'size' ];
+	}
 
-	if ( ! is_array( $dirsize ) )
-		$dirsize = array();
+	if ( ! is_array( $dirsize ) ) {
+			$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
@@ -1763,8 +1824,9 @@ 
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
-						$size += $handlesize;
+					if ($handlesize > 0) {
+											$size += $handlesize;
+					}
 				}
 			}
 		}
@@ -1792,8 +1854,9 @@ 
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+							$site_mimes[$ext_pattern] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1831,9 +1894,10 @@ 
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
+	if ( $user ) {
+			$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	}
+	}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
@@ -1853,8 +1917,9 @@ 
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
-		return $term_id;
+	if ( !global_terms_enabled() ) {
+			return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
@@ -1874,8 +1939,9 @@ 
 		if ( null == $used_global_id ) {
 			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
-				return $term_id;
+			if ( empty( $global_id ) ) {
+							return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
 			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
@@ -1894,8 +1960,9 @@ 
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+		if ( get_option( 'default_category' ) == $term_id ) {
+					update_option( 'default_category', $global_id );
+		}
 
 		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
 		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
@@ -1903,8 +1970,9 @@ 
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
-		$global_terms_recurse = null;
+	if ( $recurse_start ) {
+			$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -1933,8 +2001,9 @@ 
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return $upload;
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return $upload;
+	}
 
 	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
@@ -1963,11 +2032,13 @@ 
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
-		return $result;
+	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) ) {
+			return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] ) {
+			wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -1988,8 +2059,9 @@ 
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
-			$destination = network_home_url();
+		if ( $destination == '%siteurl%' ) {
+					$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -2005,21 +2077,25 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
-		return;
+	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+			return;
+	}
 
 	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
 	$key = array_pop( $parts );
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ( $key == '' ) {
+			$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	if ( !empty( $details ) ) {
+			delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+			wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	}
 
 	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
@@ -2217,11 +2293,14 @@ 
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	if ( ! is_string( $url ) ) {
+			return get_bloginfo( 'url' );
+	}
+	// Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if ( force_ssl_content() && is_ssl() ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2232,12 +2311,14 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
-		return;
+	if ( !is_main_site() ) {
+			return;
+	}
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
-}
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	}
+	}
 
 /**
  * Update the network-wide counts for the current network.
@@ -2270,8 +2351,9 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
+			return;
+	}
 
 	wp_update_network_site_counts();
 }
@@ -2288,8 +2370,9 @@ 
 	$is_small_network = ! wp_is_large_network( 'users' );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
+			return;
+	}
 
 	wp_update_network_user_counts();
 }
@@ -2363,11 +2446,13 @@ 
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = 100;
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = 100;
+	}
 
 	/**
 	 * Filters the upload quota for the current site.
@@ -2392,13 +2477,15 @@ 
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $space_allowed;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $space_allowed;
+	}
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
-		return 0;
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
+			return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2410,8 +2497,9 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2426,8 +2514,9 @@ 
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }

src/wp-includes/class-wp-post-type.php

Spacing +76 added lines, -76 removed lines

@@ -346,10 +346,10 @@ 
 	 * @param array|string $args      Optional. Array or string of arguments for registering a post type.
 	 *                                Default empty array.
 	 */
-	public function __construct( $post_type, $args = array() ) {
+	public function __construct($post_type, $args = array()) {
 		$this->name = $post_type;
 
-		$this->set_props( $args );
+		$this->set_props($args);
 	}
 
 	/**
@@ -360,8 +360,8 @@ 
 	 *
 	 * @param array|string $args Array or string of arguments for registering a post type.
 	 */
-	public function set_props( $args ) {
-		$args = wp_parse_args( $args );
+	public function set_props($args) {
+		$args = wp_parse_args($args);
 
 		/**
 		 * Filter the arguments for registering a post type.
@@ -371,9 +371,9 @@ 
 		 * @param array  $args      Array of arguments for registering a post type.
 		 * @param string $post_type Post type key.
 		 */
-		$args = apply_filters( 'register_post_type_args', $args, $this->name );
+		$args = apply_filters('register_post_type_args', $args, $this->name);
 
-		$has_edit_link = ! empty( $args['_edit_link'] );
+		$has_edit_link = ! empty($args['_edit_link']);
 
 		// Args prefixed with an underscore are reserved for internal use.
 		$defaults = array(
@@ -404,88 +404,88 @@ 
 			'_edit_link'           => 'post.php?post=%d',
 		);
 
-		$args = array_merge( $defaults, $args );
+		$args = array_merge($defaults, $args);
 
 		$args['name'] = $this->name;
 
 		// If not set, default to the setting for public.
-		if ( null === $args['publicly_queryable'] ) {
+		if (null === $args['publicly_queryable']) {
 			$args['publicly_queryable'] = $args['public'];
 		}
 
 		// If not set, default to the setting for public.
-		if ( null === $args['show_ui'] ) {
+		if (null === $args['show_ui']) {
 			$args['show_ui'] = $args['public'];
 		}
 
 		// If not set, default to the setting for show_ui.
-		if ( null === $args['show_in_menu'] || ! $args['show_ui'] ) {
+		if (null === $args['show_in_menu'] || ! $args['show_ui']) {
 			$args['show_in_menu'] = $args['show_ui'];
 		}
 
 		// If not set, default to the whether the full UI is shown.
-		if ( null === $args['show_in_admin_bar'] ) {
+		if (null === $args['show_in_admin_bar']) {
 			$args['show_in_admin_bar'] = (bool) $args['show_in_menu'];
 		}
 
 		// If not set, default to the setting for public.
-		if ( null === $args['show_in_nav_menus'] ) {
+		if (null === $args['show_in_nav_menus']) {
 			$args['show_in_nav_menus'] = $args['public'];
 		}
 
 		// If not set, default to true if not public, false if public.
-		if ( null === $args['exclude_from_search'] ) {
+		if (null === $args['exclude_from_search']) {
 			$args['exclude_from_search'] = ! $args['public'];
 		}
 
 		// Back compat with quirky handling in version 3.0. #14122.
-		if ( empty( $args['capabilities'] ) && null === $args['map_meta_cap'] && in_array( $args['capability_type'], array( 'post', 'page' ) ) ) {
+		if (empty($args['capabilities']) && null === $args['map_meta_cap'] && in_array($args['capability_type'], array('post', 'page'))) {
 			$args['map_meta_cap'] = true;
 		}
 
 		// If not set, default to false.
-		if ( null === $args['map_meta_cap'] ) {
+		if (null === $args['map_meta_cap']) {
 			$args['map_meta_cap'] = false;
 		}
 
 		// If there's no specified edit link and no UI, remove the edit link.
-		if ( ! $args['show_ui'] && ! $has_edit_link ) {
+		if ( ! $args['show_ui'] && ! $has_edit_link) {
 			$args['_edit_link'] = '';
 		}
 
-		$this->cap = get_post_type_capabilities( (object) $args );
-		unset( $args['capabilities'] );
+		$this->cap = get_post_type_capabilities((object) $args);
+		unset($args['capabilities']);
 
-		if ( is_array( $args['capability_type'] ) ) {
+		if (is_array($args['capability_type'])) {
 			$args['capability_type'] = $args['capability_type'][0];
 		}
 
-		if ( false !== $args['query_var'] ) {
-			if ( true === $args['query_var'] ) {
+		if (false !== $args['query_var']) {
+			if (true === $args['query_var']) {
 				$args['query_var'] = $this->name;
 			} else {
-				$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
+				$args['query_var'] = sanitize_title_with_dashes($args['query_var']);
 			}
 		}
 
-		if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-			if ( ! is_array( $args['rewrite'] ) ) {
+		if (false !== $args['rewrite'] && (is_admin() || '' != get_option('permalink_structure'))) {
+			if ( ! is_array($args['rewrite'])) {
 				$args['rewrite'] = array();
 			}
-			if ( empty( $args['rewrite']['slug'] ) ) {
+			if (empty($args['rewrite']['slug'])) {
 				$args['rewrite']['slug'] = $this->name;
 			}
-			if ( ! isset( $args['rewrite']['with_front'] ) ) {
+			if ( ! isset($args['rewrite']['with_front'])) {
 				$args['rewrite']['with_front'] = true;
 			}
-			if ( ! isset( $args['rewrite']['pages'] ) ) {
+			if ( ! isset($args['rewrite']['pages'])) {
 				$args['rewrite']['pages'] = true;
 			}
-			if ( ! isset( $args['rewrite']['feeds'] ) || ! $args['has_archive'] ) {
+			if ( ! isset($args['rewrite']['feeds']) || ! $args['has_archive']) {
 				$args['rewrite']['feeds'] = (bool) $args['has_archive'];
 			}
-			if ( ! isset( $args['rewrite']['ep_mask'] ) ) {
-				if ( isset( $args['permalink_epmask'] ) ) {
+			if ( ! isset($args['rewrite']['ep_mask'])) {
+				if (isset($args['permalink_epmask'])) {
 					$args['rewrite']['ep_mask'] = $args['permalink_epmask'];
 				} else {
 					$args['rewrite']['ep_mask'] = EP_PERMALINK;
@@ -493,11 +493,11 @@ 
 			}
 		}
 
-		foreach ( $args as $property_name => $property_value ) {
+		foreach ($args as $property_name => $property_value) {
 			$this->$property_name = $property_value;
 		}
 
-		$this->labels = get_post_type_labels( $this );
+		$this->labels = get_post_type_labels($this);
 		$this->label  = $this->labels->name;
 	}
 
@@ -508,12 +508,12 @@ 
 	 * @access public
 	 */
 	public function add_supports() {
-		if ( ! empty( $this->supports ) ) {
-			add_post_type_support( $this->name, $this->supports );
-			unset( $this->supports );
-		} elseif ( false !== $this->supports ) {
+		if ( ! empty($this->supports)) {
+			add_post_type_support($this->name, $this->supports);
+			unset($this->supports);
+		} elseif (false !== $this->supports) {
 			// Add default features.
-			add_post_type_support( $this->name, array( 'title', 'editor' ) );
+			add_post_type_support($this->name, array('title', 'editor'));
 		}
 	}
 
@@ -529,39 +529,39 @@ 
 	public function add_rewrite_rules() {
 		global $wp_rewrite, $wp;
 
-		if ( false !== $this->query_var && $wp && is_post_type_viewable( $this ) ) {
-			$wp->add_query_var( $this->query_var );
+		if (false !== $this->query_var && $wp && is_post_type_viewable($this)) {
+			$wp->add_query_var($this->query_var);
 		}
 
-		if ( false !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-			if ( $this->hierarchical ) {
-				add_rewrite_tag( "%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=" );
+		if (false !== $this->rewrite && (is_admin() || '' != get_option('permalink_structure'))) {
+			if ($this->hierarchical) {
+				add_rewrite_tag("%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=");
 			} else {
-				add_rewrite_tag( "%$this->name%", '([^/]+)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&name=" );
+				add_rewrite_tag("%$this->name%", '([^/]+)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&name=");
 			}
 
-			if ( $this->has_archive ) {
+			if ($this->has_archive) {
 				$archive_slug = true === $this->has_archive ? $this->rewrite['slug'] : $this->has_archive;
-				if ( $this->rewrite['with_front'] ) {
-					$archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+				if ($this->rewrite['with_front']) {
+					$archive_slug = substr($wp_rewrite->front, 1).$archive_slug;
 				} else {
-					$archive_slug = $wp_rewrite->root . $archive_slug;
+					$archive_slug = $wp_rewrite->root.$archive_slug;
 				}
 
-				add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$this->name", 'top' );
-				if ( $this->rewrite['feeds'] && $wp_rewrite->feeds ) {
-					$feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
-					add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$this->name" . '&feed=$matches[1]', 'top' );
-					add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$this->name" . '&feed=$matches[1]', 'top' );
+				add_rewrite_rule("{$archive_slug}/?$", "index.php?post_type=$this->name", 'top');
+				if ($this->rewrite['feeds'] && $wp_rewrite->feeds) {
+					$feeds = '('.trim(implode('|', $wp_rewrite->feeds)).')';
+					add_rewrite_rule("{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$this->name".'&feed=$matches[1]', 'top');
+					add_rewrite_rule("{$archive_slug}/$feeds/?$", "index.php?post_type=$this->name".'&feed=$matches[1]', 'top');
 				}
-				if ( $this->rewrite['pages'] ) {
-					add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$this->name" . '&paged=$matches[1]', 'top' );
+				if ($this->rewrite['pages']) {
+					add_rewrite_rule("{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$this->name".'&paged=$matches[1]', 'top');
 				}
 			}
 
 			$permastruct_args         = $this->rewrite;
 			$permastruct_args['feed'] = $permastruct_args['feeds'];
-			add_permastruct( $this->name, "{$this->rewrite['slug']}/%$this->name%", $permastruct_args );
+			add_permastruct($this->name, "{$this->rewrite['slug']}/%$this->name%", $permastruct_args);
 		}
 	}
 
@@ -572,8 +572,8 @@ 
 	 * @access public
 	 */
 	public function register_meta_boxes() {
-		if ( $this->register_meta_box_cb ) {
-			add_action( 'add_meta_boxes_' . $this->name, $this->register_meta_box_cb, 10, 1 );
+		if ($this->register_meta_box_cb) {
+			add_action('add_meta_boxes_'.$this->name, $this->register_meta_box_cb, 10, 1);
 		}
 	}
 
@@ -584,7 +584,7 @@ 
 	 * @access public
 	 */
 	public function add_hooks() {
-		add_action( 'future_' . $this->name, '_future_post_hook', 5, 2 );
+		add_action('future_'.$this->name, '_future_post_hook', 5, 2);
 	}
 
 	/**
@@ -594,8 +594,8 @@ 
 	 * @access public
 	 */
 	public function register_taxonomies() {
-		foreach ( $this->taxonomies as $taxonomy ) {
-			register_taxonomy_for_object_type( $taxonomy, $this->name );
+		foreach ($this->taxonomies as $taxonomy) {
+			register_taxonomy_for_object_type($taxonomy, $this->name);
 		}
 	}
 
@@ -610,7 +610,7 @@ 
 	public function remove_supports() {
 		global $_wp_post_type_features;
 
-		unset( $_wp_post_type_features[ $this->name ] );
+		unset($_wp_post_type_features[$this->name]);
 	}
 
 	/**
@@ -627,24 +627,24 @@ 
 		global $wp, $wp_rewrite, $post_type_meta_caps;
 
 		// Remove query var.
-		if ( false !== $this->query_var ) {
-			$wp->remove_query_var( $this->query_var );
+		if (false !== $this->query_var) {
+			$wp->remove_query_var($this->query_var);
 		}
 
 		// Remove any rewrite rules, permastructs, and rules.
-		if ( false !== $this->rewrite ) {
-			remove_rewrite_tag( "%$this->name%" );
-			remove_permastruct( $this->name );
-			foreach ( $wp_rewrite->extra_rules_top as $regex => $query ) {
-				if ( false !== strpos( $query, "index.php?post_type=$this->name" ) ) {
-					unset( $wp_rewrite->extra_rules_top[ $regex ] );
+		if (false !== $this->rewrite) {
+			remove_rewrite_tag("%$this->name%");
+			remove_permastruct($this->name);
+			foreach ($wp_rewrite->extra_rules_top as $regex => $query) {
+				if (false !== strpos($query, "index.php?post_type=$this->name")) {
+					unset($wp_rewrite->extra_rules_top[$regex]);
 				}
 			}
 		}
 
 		// Remove registered custom meta capabilities.
-		foreach ( $this->cap as $cap ) {
-			unset( $post_type_meta_caps[ $cap ] );
+		foreach ($this->cap as $cap) {
+			unset($post_type_meta_caps[$cap]);
 		}
 	}
 
@@ -655,8 +655,8 @@ 
 	 * @access public
 	 */
 	public function unregister_meta_boxes() {
-		if ( $this->register_meta_box_cb ) {
-			remove_action( 'add_meta_boxes_' . $this->name, $this->register_meta_box_cb, 10 );
+		if ($this->register_meta_box_cb) {
+			remove_action('add_meta_boxes_'.$this->name, $this->register_meta_box_cb, 10);
 		}
 	}
 
@@ -667,8 +667,8 @@ 
 	 * @access public
 	 */
 	public function unregister_taxonomies() {
-		foreach ( get_object_taxonomies( $this->name ) as $taxonomy ) {
-			unregister_taxonomy_for_object_type( $taxonomy, $this->name );
+		foreach (get_object_taxonomies($this->name) as $taxonomy) {
+			unregister_taxonomy_for_object_type($taxonomy, $this->name);
 		}
 	}
 
@@ -679,6 +679,6 @@ 
 	 * @access public
 	 */
 	public function remove_hooks() {
-		remove_action( 'future_' . $this->name, '_future_post_hook', 5 );
+		remove_action('future_'.$this->name, '_future_post_hook', 5);
 	}
 }

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

@@ -122,11 +122,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];
 			}
 		}
 
@@ -134,32 +134,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'];
 			}
 		}
 	}
@@ -192,20 +192,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;
 		}
 	}
@@ -241,10 +241,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);
 	}
 
 	/**
@@ -270,18 +270,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),
@@ -290,53 +290,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 :
@@ -351,7 +351,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
@@ -363,7 +363,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;
@@ -384,7 +384,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]);
 	}
 
 	/**
@@ -399,14 +399,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 {
 			/*
@@ -432,35 +432,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'];
 	}
 
 	/**
@@ -476,7 +476,7 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) ) {
+		if ( ! $this->check_capabilities() || ! isset($value)) {
 			return false;
 		}
 
@@ -492,9 +492,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);
 	}
 
 	/**
@@ -507,8 +507,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);
 	}
 
 	/**
@@ -519,7 +519,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.
@@ -529,7 +529,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);
 	}
 
 	/**
@@ -543,12 +543,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();
@@ -566,9 +566,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;
@@ -583,12 +583,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 );
-		} else if ( 'theme_mod' ) {
-			return get_theme_mod( $id_base, $default );
+		if ('option' === $this->type) {
+			return get_option($id_base, $default);
+		} else if ('theme_mod') {
+			return get_theme_mod($id_base, $default);
 		} else {
 			/*
 			 * Any WP_Customize_Setting subclass implementing aggregate multidimensional
@@ -608,16 +608,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 );
-		} else if ( 'theme_mod' ) {
-			set_theme_mod( $id_base, $value );
+			return update_option($id_base, $value, $autoload);
+		} else if ('theme_mod') {
+			set_theme_mod($id_base, $value);
 			return true;
 		} else {
 			/*
@@ -637,16 +637,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 {
 			/**
@@ -660,9 +660,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}");
 		}
 	}
 
@@ -673,7 +673,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()');
 	}
 
 	/**
@@ -683,7 +683,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()');
 	}
 
 	/**
@@ -695,19 +695,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.
@@ -724,17 +724,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;
 	}
@@ -758,10 +758,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;
 	}
@@ -791,10 +791,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;
@@ -810,37 +810,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(
@@ -860,16 +860,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;
 	}
@@ -884,12 +884,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;
 	}
 
 	/**
@@ -901,23 +901,23 @@ 
 	 * @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/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 ) {

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";
@@ -565,8 +566,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 -->' ) ) {
@@ -850,16 +852,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;
@@ -891,18 +915,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 ) {
@@ -914,8 +941,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;
 
@@ -935,8 +963,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;
 }
@@ -1084,8 +1113,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 {
@@ -1101,8 +1131,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 ] );
@@ -1497,8 +1528,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(
@@ -1804,8 +1836,9 @@ 
 					break;
 				}
 			}
-			if ( !$allowed )
-				$filename .= '_';
+			if ( !$allowed ) {
+							$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
@@ -1836,8 +1869,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
@@ -1898,8 +1932,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.
@@ -1912,8 +1947,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;
 }
@@ -2228,8 +2264,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) ) {
@@ -2247,8 +2284,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
@@ -2268,8 +2306,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);
@@ -2303,8 +2343,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;
 }
 
@@ -2338,8 +2379,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' );
 }
 
@@ -2388,8 +2430,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);
 }
@@ -2509,8 +2552,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;
 }
@@ -2538,8 +2582,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";
 }
@@ -2577,10 +2622,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;
@@ -2757,8 +2803,9 @@ 
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
-		return '';
+	if ( count( $matches ) == 0 ) {
+			return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
 	$img = $wpsmiliestrans[ $smiley ];
@@ -2850,8 +2897,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 ) < 3 ) {
@@ -3015,13 +3063,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 );
 	}
@@ -3204,34 +3254,40 @@ 
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
-			$mins = 1;
+		if ( $mins <= 1 ) {
+					$mins = 1;
+		}
 		/* translators: min=minute */
 		$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;
+		}
 		$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;
+		}
 		$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;
+		}
 		$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;
+		}
 		$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;
+		}
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
 
@@ -3382,8 +3438,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;',
@@ -3745,8 +3802,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);
@@ -3766,8 +3824,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 ) {
@@ -3816,11 +3875,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 '';
+		}
 	}
 
 	/**
@@ -4066,17 +4127,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':
@@ -4099,10 +4163,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':
@@ -4172,13 +4237,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;
 
@@ -4188,8 +4255,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();
@@ -4199,8 +4267,9 @@ 
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -4232,8 +4301,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':
@@ -4311,8 +4381,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.
 	 *
@@ -4346,8 +4417,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];
 }
 
@@ -4383,8 +4455,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
@@ -4409,10 +4482,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
@@ -4437,12 +4511,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().
@@ -4466,17 +4542,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);
 }
@@ -4496,14 +4574,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;
 }
 
@@ -4625,8 +4705,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 );
 }
@@ -4709,8 +4790,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 ) {
@@ -4754,8 +4836,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 );

Spacing +990 added lines, -991 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,41 +469,41 @@ 
 	$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);
 	}
 
 	// Remove more than two contiguous line breaks.
@@ -516,8 +516,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.
@@ -527,7 +527,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);
@@ -537,18 +537,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);
@@ -558,19 +558,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;
@@ -584,8 +584,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);
 }
 
 /**
@@ -598,14 +598,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 <.
@@ -614,7 +614,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?
@@ -653,19 +653,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.
@@ -674,10 +674,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;
@@ -694,8 +694,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.
@@ -707,7 +707,7 @@ 
 		.     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.
 		. ')*+'             // Possessive critical.
 		. '\]'              // Find end of shortcode.
-		. '\]?';            // Shortcodes may end with ]]
+		. '\]?'; // Shortcodes may end with ]]
 
 	return $regex;
 }
@@ -721,32 +721,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;
@@ -755,8 +755,8 @@ 
 		}
 	}
 
-	if ( $changed ) {
-		$haystack = implode( $textarr );
+	if ($changed) {
+		$haystack = implode($textarr);
 	}
 
 	return $haystack;
@@ -771,8 +771,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]);
 }
 
 /**
@@ -787,20 +787,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
@@ -825,11 +825,11 @@ 
 		.         ')?'
 		.     ')'
 		. ')'
-		. '(?:' . $spaces . ')*+'            // optional trailing whitespace
+		. '(?:'.$spaces.')*+'            // optional trailing whitespace
 		. '<\\/p>'                           // closing paragraph
 		. '/';
 
-	return preg_replace( $pattern, '$1', $pee );
+	return preg_replace($pattern, '$1', $pee);
 }
 
 /**
@@ -844,20 +844,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;
 		}
@@ -888,55 +888,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;
 }
@@ -961,52 +961,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);
 }
 
 /**
@@ -1021,40 +1021,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 '';
@@ -1069,30 +1069,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;
@@ -1101,11 +1101,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;
@@ -1504,8 +1504,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)) {
@@ -1515,7 +1515,7 @@ 
 		'À' => 'A', 'Á' => 'A',
 		'Â' => 'A', 'Ã' => 'A',
 		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
+		'Æ' => 'AE', 'Ç' => 'C',
 		'È' => 'E', 'É' => 'E',
 		'Ê' => 'E', 'Ë' => 'E',
 		'Ì' => 'I', 'Í' => 'I',
@@ -1526,11 +1526,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',
@@ -1569,7 +1569,7 @@ 
 		'Ĭ' => 'I', 'ĭ' => 'i',
 		'Į' => 'I', 'į' => 'i',
 		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
+		'IJ' => 'IJ', 'ij' => 'ij',
 		'Ĵ' => 'J', 'ĵ' => 'j',
 		'Ķ' => 'K', 'ķ' => 'k',
 		'ĸ' => 'k', 'Ĺ' => 'L',
@@ -1585,13 +1585,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',
@@ -1688,26 +1688,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 ) {
-			$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) {
+			$chars['Đ'] = 'DJ';
+			$chars['đ'] = 'dj';
 		}
 
 		$string = strtr($string, $chars);
@@ -1752,7 +1752,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));
 	/**
@@ -1763,18 +1763,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'];
 		}
 	}
 
@@ -1782,7 +1782,7 @@ 
 	$parts = explode('.', $filename);
 
 	// Return if only one extension
-	if ( count( $parts ) <= 2 ) {
+	if (count($parts) <= 2) {
 		/**
 		 * Filters a sanitized filename string.
 		 *
@@ -1791,7 +1791,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
@@ -1803,23 +1803,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);
 }
@@ -1838,21 +1838,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.
@@ -1863,7 +1863,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);
 }
 
 /**
@@ -1876,10 +1876,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.
@@ -1889,7 +1889,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);
 }
 
 /**
@@ -1906,10 +1906,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);
 
 	/**
@@ -1921,9 +1921,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;
@@ -1939,8 +1939,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');
 }
 
 /**
@@ -1956,7 +1956,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);
@@ -1974,14 +1974,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
@@ -1995,10 +1995,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
@@ -2025,8 +2025,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;
@@ -2047,15 +2047,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.
@@ -2066,7 +2066,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);
 }
 
 /**
@@ -2078,13 +2078,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;
@@ -2098,12 +2098,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;',
@@ -2134,8 +2134,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;
@@ -2150,9 +2150,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;
 	}
@@ -2176,22 +2176,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]);
@@ -2200,25 +2200,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;
@@ -2232,43 +2232,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);
 	}
 
@@ -2279,12 +2279,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;
 }
@@ -2305,7 +2305,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.
 	 *
@@ -2313,9 +2313,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;
 }
 
@@ -2336,8 +2336,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);
 }
 
 /**
@@ -2348,10 +2348,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');
 }
 
 /**
@@ -2368,8 +2368,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).'/';
 }
 
 /**
@@ -2383,8 +2383,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, '/\\');
 }
 
 /**
@@ -2399,7 +2399,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);
@@ -2413,8 +2413,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');
 }
 
 /**
@@ -2425,8 +2425,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;
 }
 
 /**
@@ -2437,8 +2437,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');
 }
 
 /**
@@ -2449,8 +2449,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');
 }
 
 /**
@@ -2461,8 +2461,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');
 }
 
 /**
@@ -2474,20 +2474,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);
 }
 
 /**
@@ -2501,10 +2501,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];
@@ -2514,16 +2514,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;
 }
 
 /**
@@ -2537,22 +2537,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";
 }
 
 /**
@@ -2566,9 +2566,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>";
 }
 
 /**
@@ -2582,30 +2582,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 {
@@ -2626,18 +2626,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);
 }
 
 /**
@@ -2669,27 +2669,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;
 	}
 
@@ -2704,11 +2704,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);
 }
 
 /**
@@ -2722,30 +2722,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\">";
 }
@@ -2765,21 +2765,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;
 	}
 
@@ -2792,9 +2792,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));
 }
 
 /**
@@ -2810,33 +2810,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 = '';
 			}
 
@@ -2860,12 +2860,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 ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filters whether an email address is valid.
 		 *
@@ -2879,65 +2879,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);
 }
 
 /**
@@ -2948,13 +2948,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);
 	}
 }
 
@@ -2967,8 +2967,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])));
 }
 
 /**
@@ -2985,25 +2985,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;
 }
@@ -3022,19 +3022,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;
 }
@@ -3047,7 +3047,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;
@@ -3069,14 +3069,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');
@@ -3100,9 +3100,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 ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filters a sanitized email address.
 		 *
@@ -3116,82 +3116,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);
 }
 
 /**
@@ -3206,49 +3206,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);
 	}
 
 	/**
@@ -3261,7 +3261,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);
 }
 
 /**
@@ -3279,15 +3279,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);
 
 		/**
@@ -3297,7 +3297,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.
 		 *
@@ -3305,8 +3305,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.
@@ -3316,7 +3316,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);
 }
 
 /**
@@ -3333,35 +3333,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);
 	}
 
 	/**
@@ -3374,7 +3374,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);
 }
 
 /**
@@ -3385,7 +3385,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.
@@ -3397,8 +3397,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(
@@ -3660,7 +3660,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);
 }
 
 /**
@@ -3681,9 +3681,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'));
 	}
 
 	/**
@@ -3695,7 +3695,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);
 }
 
 /**
@@ -3713,12 +3713,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;
@@ -3738,9 +3738,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);
 }
 
 /**
@@ -3758,20 +3758,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);
 	}
@@ -3781,61 +3781,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 '';
 	}
 
@@ -3848,7 +3848,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);
 }
 
 /**
@@ -3860,8 +3860,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');
 }
 
 /**
@@ -3874,10 +3874,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));
 }
 
 /**
@@ -3892,12 +3892,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.
 	 *
@@ -3909,7 +3909,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);
 }
 
 /**
@@ -3920,9 +3920,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.
 	 *
@@ -3934,7 +3934,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);
 }
 
 /**
@@ -3945,9 +3945,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.
 	 *
@@ -3959,7 +3959,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);
 }
 
 /**
@@ -3970,8 +3970,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.
 	 *
@@ -3980,7 +3980,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);
 }
 
 /**
@@ -3991,8 +3991,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.
 	 *
@@ -4001,7 +4001,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);
 }
 
 /**
@@ -4016,8 +4016,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);
 }
 
 /**
@@ -4034,22 +4034,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;
@@ -4076,36 +4076,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;
 
@@ -4115,10 +4115,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':
@@ -4127,20 +4127,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':
@@ -4148,128 +4148,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);
 		}
 	}
 
@@ -4283,7 +4283,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);
 }
 
 /**
@@ -4297,18 +4297,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;
@@ -4325,10 +4325,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.
 	 *
@@ -4336,7 +4336,7 @@ 
 	 *
 	 * @param array $array The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$array = apply_filters('wp_parse_str', $array);
 }
 
 /**
@@ -4349,7 +4349,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);
 }
 
@@ -4361,8 +4361,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];
 }
@@ -4377,21 +4377,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;
@@ -4399,14 +4399,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 {
@@ -4424,11 +4424,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
@@ -4451,13 +4451,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 '';
 
 	/**
@@ -4471,30 +4471,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);
 }
 
 /**
@@ -4511,15 +4511,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;
 }
 
@@ -4538,11 +4538,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);
 }
 
 /**
@@ -4556,13 +4556,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];
 }
@@ -4584,11 +4583,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);
 }
 
 /**
@@ -4602,11 +4601,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).'">';
 }
 
 /**
@@ -4617,10 +4616,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;
 }
 
@@ -4638,13 +4637,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);
 }
 
 /**
@@ -4665,8 +4664,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.
@@ -4676,7 +4675,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);
 }
 
 /**
@@ -4693,8 +4692,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.
@@ -4704,7 +4703,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);
 }
 
 /**
@@ -4717,33 +4716,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;
@@ -4758,8 +4757,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));
 }
 
 /**
@@ -4774,19 +4773,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 );
 }
 
@@ -4798,8 +4797,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.
 	 *
@@ -4808,7 +4807,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);
 }
 
 /**
@@ -4819,14 +4818,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.
 	 *
@@ -4838,7 +4837,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);
 }
 
 /**
@@ -4852,17 +4851,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;
@@ -4879,8 +4878,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);
 }
 
 /**
@@ -4891,13 +4890,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;
@@ -4919,7 +4918,7 @@ 
 function wp_spaces_regexp() {
 	static $spaces = '';
 
-	if ( empty( $spaces ) ) {
+	if (empty($spaces)) {
 		/**
 		 * Filters the regexp for common whitespace characters.
 		 *
@@ -4932,7 +4931,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;
@@ -4948,7 +4947,7 @@ 
 function print_emoji_styles() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4980,7 +4979,7 @@ 
 function print_emoji_detection_script() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -5005,7 +5004,7 @@ 
 		 *
 		 * @param string The emoji base URL for png images.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.2.1/72x72/' ),
+		'baseUrl' => apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2.2.1/72x72/'),
 
 		/**
 		 * Filters the extension of the emoji png files.
@@ -5014,7 +5013,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.
@@ -5023,7 +5022,7 @@ 
 		 *
 		 * @param string The emoji base URL for svg images.
 		 */
-		'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/' ),
+		'svgUrl' => apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/'),
 
 		/**
 		 * Filters the extension of the emoji SVG files.
@@ -5032,29 +5031,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'),
 		);
 
 		/*
@@ -5069,7 +5068,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
@@ -5089,8 +5088,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
@@ -5102,18 +5101,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);
 					}
 				}
 			}
@@ -5131,14 +5130,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.2.1/72x72/' );
+	$cdn_url = apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2.2.1/72x72/');
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$ext = apply_filters( 'emoji_ext', '.png' );
+	$ext = apply_filters('emoji_ext', '.png');
 
 	$output = '';
 	/*
@@ -5147,33 +5146,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);
 					}
 				}
 			}
@@ -5182,20 +5181,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 = '';
 		}
 
@@ -5213,8 +5212,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;
 	}
 
@@ -5226,47 +5225,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;
@@ -5282,12 +5281,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;
 }
@@ -5303,13 +5302,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;
 	}
 }
@@ -5328,14 +5327,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;
 }
 
 /**
@@ -5349,9 +5348,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;

src/wp-load.php

Spacing +27 added lines, -27 removed lines

@@ -19,11 +19,11 @@ 
  */
 
 /** Define ABSPATH as this file's directory */
-if ( ! defined( 'ABSPATH' ) ) {
-	define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+if ( ! defined('ABSPATH')) {
+	define('ABSPATH', dirname(__FILE__).'/');
 }
 
-error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 
 /*
  * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php
@@ -33,63 +33,63 @@ 
  *
  * If neither set of conditions is true, initiate loading the setup process.
  */
-if ( file_exists( ABSPATH . 'wp-config.php') ) {
+if (file_exists(ABSPATH.'wp-config.php')) {
 
 	/** The config file resides in ABSPATH */
-	require_once( ABSPATH . 'wp-config.php' );
+	require_once(ABSPATH.'wp-config.php');
 
-} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
+} elseif (@file_exists(dirname(ABSPATH).'/wp-config.php') && ! @file_exists(dirname(ABSPATH).'/wp-settings.php')) {
 
 	/** The config file resides one level above ABSPATH but is not part of another install */
-	require_once( dirname( ABSPATH ) . '/wp-config.php' );
+	require_once(dirname(ABSPATH).'/wp-config.php');
 
 } else {
 
 	// A config file doesn't exist
 
-	define( 'WPINC', 'wp-includes' );
-	require_once( ABSPATH . WPINC . '/load.php' );
+	define('WPINC', 'wp-includes');
+	require_once(ABSPATH.WPINC.'/load.php');
 
 	// Standardize $_SERVER variables across setups.
 	wp_fix_server_vars();
 
-	require_once( ABSPATH . WPINC . '/functions.php' );
+	require_once(ABSPATH.WPINC.'/functions.php');
 
-	$path = wp_guess_url() . '/wp-admin/setup-config.php';
+	$path = wp_guess_url().'/wp-admin/setup-config.php';
 
 	/*
 	 * We're going to redirect to setup-config.php. While this shouldn't result
 	 * in an infinite loop, that's a silly thing to assume, don't you think? If
 	 * we're traveling in circles, our last-ditch effort is "Need more help?"
 	 */
-	if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
-		header( 'Location: ' . $path );
+	if (false === strpos($_SERVER['REQUEST_URI'], 'setup-config')) {
+		header('Location: '.$path);
 		exit;
 	}
 
-	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
-	require_once( ABSPATH . WPINC . '/version.php' );
+	define('WP_CONTENT_DIR', ABSPATH.'wp-content');
+	require_once(ABSPATH.WPINC.'/version.php');
 
 	wp_check_php_mysql_versions();
 	wp_load_translations_early();
 
 	// Die with an error message
-	$die  = sprintf(
+	$die = sprintf(
 		/* translators: %s: wp-config.php */
-		__( "There doesn't seem to be a %s file. I need this before we can get started." ),
+		__("There doesn't seem to be a %s file. I need this before we can get started."),
 		'<code>wp-config.php</code>'
-	) . '</p>';
-	$die .= '<p>' . sprintf(
+	).'</p>';
+	$die .= '<p>'.sprintf(
 		/* translators: %s: Codex URL */
-		__( "Need more help? <a href='%s'>We got it</a>." ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
-	) . '</p>';
-	$die .= '<p>' . sprintf(
+		__("Need more help? <a href='%s'>We got it</a>."),
+		__('https://codex.wordpress.org/Editing_wp-config.php')
+	).'</p>';
+	$die .= '<p>'.sprintf(
 		/* translators: %s: wp-config.php */
-		__( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ),
+		__("You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file."),
 		'<code>wp-config.php</code>'
-	) . '</p>';
-	$die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
+	).'</p>';
+	$die .= '<p><a href="'.$path.'" class="button button-large">'.__("Create a Configuration File").'</a>';
 
-	wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
+	wp_die($die, __('WordPress &rsaquo; Error'));
 }

src/wp-admin/includes/class-theme-upgrader.php

Braces +60 added lines, -37 removed lines

@@ -99,8 +99,9 @@ 
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
-		if ( ! $theme_info->parent() )
-			return $install_result;
+		if ( ! $theme_info->parent() ) {
+					return $install_result;
+		}
 
 		$this->skin->feedback( 'parent_theme_search' );
 
@@ -140,8 +141,9 @@ 
 			'clear_working' => true
 		) );
 
-		if ( is_wp_error($parent_result) )
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		if ( is_wp_error($parent_result) ) {
+					add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		}
 
 		// Start cleaning up after the parents installation
 		remove_filter('install_theme_complete_actions', '__return_false', 999);
@@ -219,8 +221,9 @@ 
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Refresh the Theme Update information
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
@@ -289,8 +292,9 @@ 
 		remove_filter('upgrader_post_install', array($this, 'current_after'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
 
@@ -348,10 +352,12 @@ 
 		// - a theme with an update available is currently in use.
 		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		$maintenance = ( is_multisite() && ! empty( $themes ) );
-		foreach ( $themes as $theme )
-			$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		foreach ( $themes as $theme ) {
+					$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
+		}
+		if ( $maintenance ) {
+					$this->maintenance_mode(true);
+		}
 
 		$results = array();
 
@@ -388,8 +394,9 @@ 
 			$results[$theme] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
-				break;
+			if ( false === $result ) {
+							break;
+			}
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
@@ -436,13 +443,16 @@ 
 	public function check_package( $source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
-			return $source;
+		if ( is_wp_error($source) ) {
+					return $source;
+		}
 
 		// Check the folder contains a valid theme
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		if ( ! is_dir($working_directory) ) {
+			// Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// A proper archive should have a style.css file in the single subdirectory
 		if ( ! file_exists( $working_directory . 'style.css' ) ) {
@@ -492,16 +502,20 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_before($return, $theme) {
-		if ( is_wp_error($return) )
-			return $return;
+		if ( is_wp_error($return) ) {
+					return $return;
+		}
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) //If not current
+		if ( $theme != get_stylesheet() ) {
+			//If not current
 			return $return;
+		}
 		//Change to maintenance mode now.
-		if ( ! $this->bulk )
-			$this->maintenance_mode(true);
+		if ( ! $this->bulk ) {
+					$this->maintenance_mode(true);
+		}
 
 		return $return;
 	}
@@ -520,13 +534,16 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_after($return, $theme) {
-		if ( is_wp_error($return) )
-			return $return;
+		if ( is_wp_error($return) ) {
+					return $return;
+		}
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) // If not current
+		if ( $theme != get_stylesheet() ) {
+			// If not current
 			return $return;
+		}
 
 		// Ensure stylesheet name hasn't changed after the upgrade:
 		if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
@@ -536,8 +553,9 @@ 
 		}
 
 		//Time to remove maintenance mode
-		if ( ! $this->bulk )
-			$this->maintenance_mode(false);
+		if ( ! $this->bulk ) {
+					$this->maintenance_mode(false);
+		}
 		return $return;
 	}
 
@@ -561,17 +579,21 @@ 
 	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) )
-			return $removed; // Pass errors through.
+		if ( is_wp_error( $removed ) ) {
+					return $removed;
+		}
+		// Pass errors through.
 
-		if ( ! isset( $theme['theme'] ) )
-			return $removed;
+		if ( ! isset( $theme['theme'] ) ) {
+					return $removed;
+		}
 
 		$theme = $theme['theme'];
 		$themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
 		if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
-			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
-				return false;
+			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -592,10 +614,11 @@ 
 	public function theme_info($theme = null) {
 
 		if ( empty($theme) ) {
-			if ( !empty($this->result['destination_name']) )
-				$theme = $this->result['destination_name'];
-			else
-				return false;
+			if ( !empty($this->result['destination_name']) ) {
+							$theme = $this->result['destination_name'];
+			} else {
+							return false;
+			}
 		}
 		return wp_get_theme( $theme );
 	}

Spacing +90 added lines, -90 removed lines

@@ -95,28 +95,28 @@ 
 	 * @param array $child_result
 	 * @return type
 	 */
-	public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) {
+	public function check_parent_theme_filter($install_result, $hook_extra, $child_result) {
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
-		if ( ! $theme_info->parent() )
+		if ( ! $theme_info->parent())
 			return $install_result;
 
-		$this->skin->feedback( 'parent_theme_search' );
+		$this->skin->feedback('parent_theme_search');
 
-		if ( ! $theme_info->parent()->errors() ) {
-			$this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') );
+		if ( ! $theme_info->parent()->errors()) {
+			$this->skin->feedback('parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version'));
 			// We already have the theme, fall through.
 			return $install_result;
 		}
 
 		// We don't have the parent theme, let's install it.
-		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false))); //Save on a bit of bandwidth.
 
-		if ( ! $api || is_wp_error($api) ) {
-			$this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
+		if ( ! $api || is_wp_error($api)) {
+			$this->skin->feedback('parent_theme_not_found', $theme_info->get('Template'));
 			// Don't show activate or preview actions after install
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions'));
 			return $install_result;
 		}
 
@@ -126,22 +126,22 @@ 
 
 		// Override them
 		$this->skin->api = $api;
-		$this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version);
+		$this->strings['process_success_specific'] = $this->strings['parent_theme_install_success']; //, $api->name, $api->version);
 
 		$this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
 
 		add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
 
 		// Install the parent theme
-		$parent_result = $this->run( array(
+		$parent_result = $this->run(array(
 			'package' => $api->download_link,
 			'destination' => get_theme_root(),
 			'clear_destination' => false, //Do not overwrite files.
 			'clear_working' => true
-		) );
+		));
 
-		if ( is_wp_error($parent_result) )
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		if (is_wp_error($parent_result))
+			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions'));
 
 		// Start cleaning up after the parents installation
 		remove_filter('install_theme_complete_actions', '__return_false', 999);
@@ -167,7 +167,7 @@ 
 	 * @param array $actions Preview actions.
 	 * @return array
 	 */
-	public function hide_activate_preview_actions( $actions ) {
+	public function hide_activate_preview_actions($actions) {
 		unset($actions['activate'], $actions['preview']);
 		return $actions;
 	}
@@ -189,24 +189,24 @@ 
 	 *
 	 * @return bool|WP_Error True if the install was successful, false or a WP_Error object otherwise.
 	 */
-	public function install( $package, $args = array() ) {
+	public function install($package, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
 		add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_themes() knows about the new theme.
-			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_themes_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $package,
 			'destination' => get_theme_root(),
 			'clear_destination' => false, //Do not overwrite files.
@@ -215,17 +215,17 @@ 
 				'type' => 'theme',
 				'action' => 'install',
 			),
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
+		remove_action('upgrader_process_complete', 'wp_clean_themes_cache', 9);
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Refresh the Theme Update information
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -246,39 +246,39 @@ 
 	 * }
 	 * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
 	 */
-	public function upgrade( $theme, $args = array() ) {
+	public function upgrade($theme, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
 		// Is an update available?
-		$current = get_site_transient( 'update_themes' );
-		if ( !isset( $current->response[ $theme ] ) ) {
+		$current = get_site_transient('update_themes');
+		if ( ! isset($current->response[$theme])) {
 			$this->skin->before();
 			$this->skin->set_result(false);
-			$this->skin->error( 'up_to_date' );
+			$this->skin->error('up_to_date');
 			$this->skin->after();
 			return false;
 		}
 
-		$r = $current->response[ $theme ];
+		$r = $current->response[$theme];
 
 		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
 		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_themes() knows about the new theme.
-			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_themes_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $r['package'],
-			'destination' => get_theme_root( $theme ),
+			'destination' => get_theme_root($theme),
 			'clear_destination' => true,
 			'clear_working' => true,
 			'hook_extra' => array(
@@ -286,17 +286,17 @@ 
 				'type' => 'theme',
 				'action' => 'update',
 			),
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
+		remove_action('upgrader_process_complete', 'wp_clean_themes_cache', 9);
 		remove_filter('upgrader_pre_install', array($this, 'current_before'));
 		remove_filter('upgrader_post_install', array($this, 'current_after'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -317,18 +317,18 @@ 
 	 * }
 	 * @return array[]|false An array of results, or false if unable to connect to the filesystem.
 	 */
-	public function bulk_upgrade( $themes, $args = array() ) {
+	public function bulk_upgrade($themes, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->bulk = true;
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_themes' );
+		$current = get_site_transient('update_themes');
 
 		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
 		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
@@ -337,8 +337,8 @@ 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR));
+		if ( ! $res) {
 			$this->skin->footer();
 			return false;
 		}
@@ -349,63 +349,63 @@ 
 		// - running Multisite and there are one or more themes specified, OR
 		// - a theme with an update available is currently in use.
 		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
-		$maintenance = ( is_multisite() && ! empty( $themes ) );
-		foreach ( $themes as $theme )
+		$maintenance = (is_multisite() && ! empty($themes));
+		foreach ($themes as $theme)
 			$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-		if ( $maintenance )
+		if ($maintenance)
 			$this->maintenance_mode(true);
 
 		$results = array();
 
 		$this->update_count = count($themes);
 		$this->update_current = 0;
-		foreach ( $themes as $theme ) {
+		foreach ($themes as $theme) {
 			$this->update_current++;
 
 			$this->skin->theme_info = $this->theme_info($theme);
 
-			if ( !isset( $current->response[ $theme ] ) ) {
+			if ( ! isset($current->response[$theme])) {
 				$this->skin->set_result(true);
 				$this->skin->before();
-				$this->skin->feedback( 'up_to_date' );
+				$this->skin->feedback('up_to_date');
 				$this->skin->after();
 				$results[$theme] = true;
 				continue;
 			}
 
 			// Get the URL to the zip file
-			$r = $current->response[ $theme ];
+			$r = $current->response[$theme];
 
-			$result = $this->run( array(
+			$result = $this->run(array(
 				'package' => $r['package'],
-				'destination' => get_theme_root( $theme ),
+				'destination' => get_theme_root($theme),
 				'clear_destination' => true,
 				'clear_working' => true,
 				'is_multi' => true,
 				'hook_extra' => array(
 					'theme' => $theme
 				),
-			) );
+			));
 
 			$results[$theme] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if (false === $result)
 				break;
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
 
 		// Refresh the Theme Update information
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
+		do_action('upgrader_process_complete', $this, array(
 			'action' => 'update',
 			'type' => 'theme',
 			'bulk' => true,
 			'themes' => $themes,
-		) );
+		));
 
 		$this->skin->bulk_footer();
 
@@ -434,43 +434,43 @@ 
 	 * @param string $source The full path to the package source.
 	 * @return string|WP_Error The source or a WP_Error.
 	 */
-	public function check_package( $source ) {
+	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if (is_wp_error($source))
 			return $source;
 
 		// Check the folder contains a valid theme
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+		if ( ! is_dir($working_directory)) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// A proper archive should have a style.css file in the single subdirectory
-		if ( ! file_exists( $working_directory . 'style.css' ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
+		if ( ! file_exists($working_directory.'style.css')) {
+			return new WP_Error('incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
-				sprintf( __( 'The theme is missing the %s stylesheet.' ),
+				sprintf(__('The theme is missing the %s stylesheet.'),
 					'<code>style.css</code>'
 				)
 			);
 		}
 
-		$info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
+		$info = get_file_data($working_directory.'style.css', array('Name' => 'Theme Name', 'Template' => 'Template'));
 
-		if ( empty( $info['Name'] ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
+		if (empty($info['Name'])) {
+			return new WP_Error('incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
-				sprintf( __( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
+				sprintf(__('The %s stylesheet doesn&#8217;t contain a valid theme header.'),
 					'<code>style.css</code>'
 				)
 			);
 		}
 
 		// If it's not a child theme, it must have at least an index.php to be legit.
-		if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
+		if (empty($info['Template']) && ! file_exists($working_directory.'index.php')) {
+			return new WP_Error('incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
 				/* translators: %s: index.php */
-				sprintf( __( 'The theme is missing the %s file.' ),
+				sprintf(__('The theme is missing the %s file.'),
 					'<code>index.php</code>'
 				)
 			);
@@ -493,15 +493,15 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_before($return, $theme) {
-		if ( is_wp_error($return) )
+		if (is_wp_error($return))
 			return $return;
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) //If not current
+		if ($theme != get_stylesheet()) //If not current
 			return $return;
 		//Change to maintenance mode now.
-		if ( ! $this->bulk )
+		if ( ! $this->bulk)
 			$this->maintenance_mode(true);
 
 		return $return;
@@ -521,23 +521,23 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_after($return, $theme) {
-		if ( is_wp_error($return) )
+		if (is_wp_error($return))
 			return $return;
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) // If not current
+		if ($theme != get_stylesheet()) // If not current
 			return $return;
 
 		// Ensure stylesheet name hasn't changed after the upgrade:
-		if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
+		if ($theme == get_stylesheet() && $theme != $this->result['destination_name']) {
 			wp_clean_themes_cache();
 			$stylesheet = $this->result['destination_name'];
-			switch_theme( $stylesheet );
+			switch_theme($stylesheet);
 		}
 
 		//Time to remove maintenance mode
-		if ( ! $this->bulk )
+		if ( ! $this->bulk)
 			$this->maintenance_mode(false);
 		return $return;
 	}
@@ -559,19 +559,19 @@ 
 	 * @param array  $theme
 	 * @return bool
 	 */
-	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
+	public function delete_old_theme($removed, $local_destination, $remote_destination, $theme) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) )
+		if (is_wp_error($removed))
 			return $removed; // Pass errors through.
 
-		if ( ! isset( $theme['theme'] ) )
+		if ( ! isset($theme['theme']))
 			return $removed;
 
 		$theme = $theme['theme'];
-		$themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
-		if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
-			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
+		$themes_dir = trailingslashit($wp_filesystem->wp_themes_dir($theme));
+		if ($wp_filesystem->exists($themes_dir.$theme)) {
+			if ( ! $wp_filesystem->delete($themes_dir.$theme, true))
 				return false;
 		}
 
@@ -592,13 +592,13 @@ 
 	 */
 	public function theme_info($theme = null) {
 
-		if ( empty($theme) ) {
-			if ( !empty($this->result['destination_name']) )
+		if (empty($theme)) {
+			if ( ! empty($this->result['destination_name']))
 				$theme = $this->result['destination_name'];
 			else
 				return false;
 		}
-		return wp_get_theme( $theme );
+		return wp_get_theme($theme);
 	}
 
 }