ntwb / wordpress

src/wp-includes/random_compat/random.php

Doc Comments +1 added lines

@@ -199,6 +199,7 @@
             /**
              * We don't have any more options, so let's throw an exception right now
              * and hope the developer won't let it fail silently.
+             * @param integer $length
              */
             function random_bytes($length)
             {

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
  * SOFTWARE.
  */
 
-if (!defined('PHP_VERSION_ID')) {
+if ( ! defined('PHP_VERSION_ID')) {
     // This constant was introduced in PHP 5.2.7
     $RandomCompatversion = explode('.', PHP_VERSION);
     define(
@@ -43,7 +43,7 @@ 
 
 if (PHP_VERSION_ID < 70000) {
 
-    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    if ( ! defined('RANDOM_COMPAT_READ_BUFFER')) {
         define('RANDOM_COMPAT_READ_BUFFER', 8);
     }
 
@@ -53,7 +53,7 @@ 
     require_once $RandomCompatDIR.'/cast_to_int.php';
     require_once $RandomCompatDIR.'/error_polyfill.php';
 
-    if (!function_exists('random_bytes')) {
+    if ( ! function_exists('random_bytes')) {
         /**
          * PHP 5.2.0 - 5.6.x way to implement random_bytes()
          *
@@ -87,7 +87,7 @@ 
             $RandomCompatUrandom = true;
             $RandomCompat_basedir = ini_get('open_basedir');
 
-            if (!empty($RandomCompat_basedir)) {
+            if ( ! empty($RandomCompat_basedir)) {
                 $RandomCompat_open_basedir = explode(
                     PATH_SEPARATOR,
                     strtolower($RandomCompat_basedir)
@@ -100,7 +100,7 @@ 
             }
 
             if (
-                !function_exists('random_bytes')
+                ! function_exists('random_bytes')
                 &&
                 $RandomCompatUrandom
                 &&
@@ -124,7 +124,7 @@ 
          * mcrypt_create_iv()
          */
         if (
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             PHP_VERSION_ID >= 50307
             &&
@@ -142,7 +142,7 @@ 
         }
 
         if (
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             extension_loaded('com_dotnet')
             &&
@@ -153,7 +153,7 @@ 
                 strtolower(ini_get('disable_classes'))
             );
 
-            if (!in_array('com', $RandomCompat_disabled_classes)) {
+            if ( ! in_array('com', $RandomCompat_disabled_classes)) {
                 try {
                     $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                     if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
@@ -184,7 +184,7 @@ 
                 PHP_VERSION_ID >= 50401
             )
             &&
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             extension_loaded('openssl')
         ) {
@@ -195,7 +195,7 @@ 
         /**
          * throw new Exception
          */
-        if (!function_exists('random_bytes')) {
+        if ( ! function_exists('random_bytes')) {
             /**
              * We don't have any more options, so let's throw an exception right now
              * and hope the developer won't let it fail silently.
@@ -209,7 +209,7 @@ 
         }
     }
 
-    if (!function_exists('random_int')) {
+    if ( ! function_exists('random_int')) {
         require_once $RandomCompatDIR.'/random_int.php';
     }
 

Indentation +180 added lines, -180 removed lines

@@ -30,188 +30,188 @@
  */
 
 if (!defined('PHP_VERSION_ID')) {
-    // This constant was introduced in PHP 5.2.7
-    $RandomCompatversion = explode('.', PHP_VERSION);
-    define(
-        'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
-        + $RandomCompatversion[2]
-    );
-    $RandomCompatversion = null;
+	// This constant was introduced in PHP 5.2.7
+	$RandomCompatversion = explode('.', PHP_VERSION);
+	define(
+		'PHP_VERSION_ID',
+		$RandomCompatversion[0] * 10000
+		+ $RandomCompatversion[1] * 100
+		+ $RandomCompatversion[2]
+	);
+	$RandomCompatversion = null;
 }
 
 if (PHP_VERSION_ID < 70000) {
 
-    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-        define('RANDOM_COMPAT_READ_BUFFER', 8);
-    }
-
-    $RandomCompatDIR = dirname(__FILE__);
-
-    require_once $RandomCompatDIR.'/byte_safe_strings.php';
-    require_once $RandomCompatDIR.'/cast_to_int.php';
-    require_once $RandomCompatDIR.'/error_polyfill.php';
-
-    if (!function_exists('random_bytes')) {
-        /**
-         * PHP 5.2.0 - 5.6.x way to implement random_bytes()
-         *
-         * We use conditional statements here to define the function in accordance
-         * to the operating environment. It's a micro-optimization.
-         *
-         * In order of preference:
-         *   1. Use libsodium if available.
-         *   2. fread() /dev/urandom if available (never on Windows)
-         *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
-         *   4. COM('CAPICOM.Utilities.1')->GetRandom()
-         *   5. openssl_random_pseudo_bytes() (absolute last resort)
-         *
-         * See ERRATA.md for our reasoning behind this particular order
-         */
-        if (extension_loaded('libsodium')) {
-            // See random_bytes_libsodium.php
-            if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
-            } elseif (method_exists('Sodium', 'randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
-            }
-        }
-
-        /**
-         * Reading directly from /dev/urandom:
-         */
-        if (DIRECTORY_SEPARATOR === '/') {
-            // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
-            // way to exclude Windows.
-            $RandomCompatUrandom = true;
-            $RandomCompat_basedir = ini_get('open_basedir');
-
-            if (!empty($RandomCompat_basedir)) {
-                $RandomCompat_open_basedir = explode(
-                    PATH_SEPARATOR,
-                    strtolower($RandomCompat_basedir)
-                );
-                $RandomCompatUrandom = in_array(
-                    '/dev',
-                    $RandomCompat_open_basedir
-                );
-                $RandomCompat_open_basedir = null;
-            }
-
-            if (
-                !function_exists('random_bytes')
-                &&
-                $RandomCompatUrandom
-                &&
-                @is_readable('/dev/urandom')
-            ) {
-                // Error suppression on is_readable() in case of an open_basedir
-                // or safe_mode failure. All we care about is whether or not we
-                // can read it at this point. If the PHP environment is going to
-                // panic over trying to see if the file can be read in the first
-                // place, that is not helpful to us here.
-
-                // See random_bytes_dev_urandom.php
-                require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
-            }
-            // Unset variables after use
-            $RandomCompat_basedir = null;
-            $RandomCompatUrandom = null;
-        }
-
-        /**
-         * mcrypt_create_iv()
-         */
-        if (
-            !function_exists('random_bytes')
-            &&
-            PHP_VERSION_ID >= 50307
-            &&
-            extension_loaded('mcrypt')
-        ) {
-            // Prevent this code from hanging indefinitely on non-Windows;
-            // see https://bugs.php.net/bug.php?id=69833
-            if (
-                DIRECTORY_SEPARATOR !== '/' ||
-                (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
-            ) {
-                // See random_bytes_mcrypt.php
-                require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
-            }
-        }
-
-        if (
-            !function_exists('random_bytes')
-            &&
-            extension_loaded('com_dotnet')
-            &&
-            class_exists('COM')
-        ) {
-            $RandomCompat_disabled_classes = preg_split(
-                '#\s*,\s*#',
-                strtolower(ini_get('disable_classes'))
-            );
-
-            if (!in_array('com', $RandomCompat_disabled_classes)) {
-                try {
-                    $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                    if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
-                        // See random_bytes_com_dotnet.php
-                        require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
-                    }
-                } catch (com_exception $e) {
-                    // Don't try to use it.
-                }
-            }
-            $RandomCompat_disabled_classes = null;
-            $RandomCompatCOMtest = null;
-        }
-
-        /**
-         * openssl_random_pseudo_bytes()
-         */
-        if (
-            (
-                // Unix-like with PHP >= 5.3.0 or
-                (
-                    DIRECTORY_SEPARATOR === '/'
-                    &&
-                    PHP_VERSION_ID >= 50300
-                )
-                ||
-                // Windows with PHP >= 5.4.1
-                PHP_VERSION_ID >= 50401
-            )
-            &&
-            !function_exists('random_bytes')
-            &&
-            extension_loaded('openssl')
-        ) {
-            // See random_bytes_openssl.php
-            require_once $RandomCompatDIR.'/random_bytes_openssl.php';
-        }
-
-        /**
-         * throw new Exception
-         */
-        if (!function_exists('random_bytes')) {
-            /**
-             * We don't have any more options, so let's throw an exception right now
-             * and hope the developer won't let it fail silently.
-             */
-            function random_bytes($length)
-            {
-                throw new Exception(
-                    'There is no suitable CSPRNG installed on your system'
-                );
-            }
-        }
-    }
-
-    if (!function_exists('random_int')) {
-        require_once $RandomCompatDIR.'/random_int.php';
-    }
-
-    $RandomCompatDIR = null;
+	if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+		define('RANDOM_COMPAT_READ_BUFFER', 8);
+	}
+
+	$RandomCompatDIR = dirname(__FILE__);
+
+	require_once $RandomCompatDIR.'/byte_safe_strings.php';
+	require_once $RandomCompatDIR.'/cast_to_int.php';
+	require_once $RandomCompatDIR.'/error_polyfill.php';
+
+	if (!function_exists('random_bytes')) {
+		/**
+		 * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+		 *
+		 * We use conditional statements here to define the function in accordance
+		 * to the operating environment. It's a micro-optimization.
+		 *
+		 * In order of preference:
+		 *   1. Use libsodium if available.
+		 *   2. fread() /dev/urandom if available (never on Windows)
+		 *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+		 *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+		 *   5. openssl_random_pseudo_bytes() (absolute last resort)
+		 *
+		 * See ERRATA.md for our reasoning behind this particular order
+		 */
+		if (extension_loaded('libsodium')) {
+			// See random_bytes_libsodium.php
+			if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
+				require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+			} elseif (method_exists('Sodium', 'randombytes_buf')) {
+				require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
+			}
+		}
+
+		/**
+		 * Reading directly from /dev/urandom:
+		 */
+		if (DIRECTORY_SEPARATOR === '/') {
+			// DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+			// way to exclude Windows.
+			$RandomCompatUrandom = true;
+			$RandomCompat_basedir = ini_get('open_basedir');
+
+			if (!empty($RandomCompat_basedir)) {
+				$RandomCompat_open_basedir = explode(
+					PATH_SEPARATOR,
+					strtolower($RandomCompat_basedir)
+				);
+				$RandomCompatUrandom = in_array(
+					'/dev',
+					$RandomCompat_open_basedir
+				);
+				$RandomCompat_open_basedir = null;
+			}
+
+			if (
+				!function_exists('random_bytes')
+				&&
+				$RandomCompatUrandom
+				&&
+				@is_readable('/dev/urandom')
+			) {
+				// Error suppression on is_readable() in case of an open_basedir
+				// or safe_mode failure. All we care about is whether or not we
+				// can read it at this point. If the PHP environment is going to
+				// panic over trying to see if the file can be read in the first
+				// place, that is not helpful to us here.
+
+				// See random_bytes_dev_urandom.php
+				require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+			}
+			// Unset variables after use
+			$RandomCompat_basedir = null;
+			$RandomCompatUrandom = null;
+		}
+
+		/**
+		 * mcrypt_create_iv()
+		 */
+		if (
+			!function_exists('random_bytes')
+			&&
+			PHP_VERSION_ID >= 50307
+			&&
+			extension_loaded('mcrypt')
+		) {
+			// Prevent this code from hanging indefinitely on non-Windows;
+			// see https://bugs.php.net/bug.php?id=69833
+			if (
+				DIRECTORY_SEPARATOR !== '/' ||
+				(PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+			) {
+				// See random_bytes_mcrypt.php
+				require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
+			}
+		}
+
+		if (
+			!function_exists('random_bytes')
+			&&
+			extension_loaded('com_dotnet')
+			&&
+			class_exists('COM')
+		) {
+			$RandomCompat_disabled_classes = preg_split(
+				'#\s*,\s*#',
+				strtolower(ini_get('disable_classes'))
+			);
+
+			if (!in_array('com', $RandomCompat_disabled_classes)) {
+				try {
+					$RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+					if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+						// See random_bytes_com_dotnet.php
+						require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+					}
+				} catch (com_exception $e) {
+					// Don't try to use it.
+				}
+			}
+			$RandomCompat_disabled_classes = null;
+			$RandomCompatCOMtest = null;
+		}
+
+		/**
+		 * openssl_random_pseudo_bytes()
+		 */
+		if (
+			(
+				// Unix-like with PHP >= 5.3.0 or
+				(
+					DIRECTORY_SEPARATOR === '/'
+					&&
+					PHP_VERSION_ID >= 50300
+				)
+				||
+				// Windows with PHP >= 5.4.1
+				PHP_VERSION_ID >= 50401
+			)
+			&&
+			!function_exists('random_bytes')
+			&&
+			extension_loaded('openssl')
+		) {
+			// See random_bytes_openssl.php
+			require_once $RandomCompatDIR.'/random_bytes_openssl.php';
+		}
+
+		/**
+		 * throw new Exception
+		 */
+		if (!function_exists('random_bytes')) {
+			/**
+			 * We don't have any more options, so let's throw an exception right now
+			 * and hope the developer won't let it fail silently.
+			 */
+			function random_bytes($length)
+			{
+				throw new Exception(
+					'There is no suitable CSPRNG installed on your system'
+				);
+			}
+		}
+	}
+
+	if (!function_exists('random_int')) {
+		require_once $RandomCompatDIR.'/random_int.php';
+	}
+
+	$RandomCompatDIR = null;
 }

src/wp-includes/rest-api/class-wp-rest-server.php

Doc Comments +1 added lines, -1 removed lines

@@ -907,7 +907,7 @@
 	 * @since 4.4.0
 	 * @access protected
 	 *
-	 * @return bool|string Boolean false or string error message.
+	 * @return false|string Boolean false or string error message.
 	 */
 	protected function get_json_last_error() {
 		// See https://core.trac.wordpress.org/ticket/27799.

Spacing +254 added lines, -254 removed lines

@@ -91,7 +91,7 @@ 
 		$this->endpoints = array(
 			// Meta endpoints.
 			'/' => array(
-				'callback' => array( $this, 'get_index' ),
+				'callback' => array($this, 'get_index'),
 				'methods' => 'GET',
 				'args' => array(
 					'context' => array(
@@ -137,7 +137,7 @@ 
 		 * @param WP_Error|null|bool WP_Error if authentication error, null if authentication
 		 *                              method wasn't used, true if authentication succeeded.
 		 */
-		return apply_filters( 'rest_authentication_errors', null );
+		return apply_filters('rest_authentication_errors', null);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	 * @param WP_Error $error WP_Error instance.
 	 * @return WP_REST_Response List of associative arrays with code and message keys.
 	 */
-	protected function error_to_response( $error ) {
+	protected function error_to_response($error) {
 		$error_data = $error->get_error_data();
 
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
@@ -164,20 +164,20 @@ 
 
 		$errors = array();
 
-		foreach ( (array) $error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
-				$errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+		foreach ((array) $error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
+				$errors[] = array('code' => $code, 'message' => $message, 'data' => $error->get_error_data($code));
 			}
 		}
 
 		$data = $errors[0];
-		if ( count( $errors ) > 1 ) {
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
 
-		$response = new WP_REST_Response( $data, $status );
+		$response = new WP_REST_Response($data, $status);
 
 		return $response;
 	}
@@ -198,14 +198,14 @@ 
 	 * @param int    $status  Optional. HTTP status code to send. Default null.
 	 * @return string JSON representation of the error
 	 */
-	protected function json_error( $code, $message, $status = null ) {
-		if ( $status ) {
-			$this->set_status( $status );
+	protected function json_error($code, $message, $status = null) {
+		if ($status) {
+			$this->set_status($status);
 		}
 
-		$error = compact( 'code', 'message' );
+		$error = compact('code', 'message');
 
-		return wp_json_encode( $error );
+		return wp_json_encode($error);
 	}
 
 	/**
@@ -223,14 +223,14 @@ 
 	 *                     Default null.
 	 * @return false|null Null if not served and a HEAD request, false otherwise.
 	 */
-	public function serve_request( $path = null ) {
-		$content_type = isset( $_GET['_jsonp'] ) ? 'application/javascript' : 'application/json';
-		$this->send_header( 'Content-Type', $content_type . '; charset=' . get_option( 'blog_charset' ) );
-		$this->send_header( 'X-Robots-Tag', 'noindex' );
+	public function serve_request($path = null) {
+		$content_type = isset($_GET['_jsonp']) ? 'application/javascript' : 'application/json';
+		$this->send_header('Content-Type', $content_type.'; charset='.get_option('blog_charset'));
+		$this->send_header('X-Robots-Tag', 'noindex');
 
 		$api_root = get_rest_url();
-		if ( ! empty( $api_root ) ) {
-			$this->send_header( 'Link', '<' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"' );
+		if ( ! empty($api_root)) {
+			$this->send_header('Link', '<'.esc_url_raw($api_root).'>; rel="https://api.w.org/"');
 		}
 
 		/*
@@ -238,9 +238,9 @@ 
 		 *
 		 * https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
 		 */
-		$this->send_header( 'X-Content-Type-Options', 'nosniff' );
-		$this->send_header( 'Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages' );
-		$this->send_header( 'Access-Control-Allow-Headers', 'Authorization, Content-Type' );
+		$this->send_header('X-Content-Type-Options', 'nosniff');
+		$this->send_header('Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages');
+		$this->send_header('Access-Control-Allow-Headers', 'Authorization, Content-Type');
 
 		/**
 		 * Send nocache headers on authenticated requests.
@@ -249,10 +249,10 @@ 
 		 *
 		 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
 		 */
-		$send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
-		if ( $send_no_cache_headers ) {
-			foreach ( wp_get_nocache_headers() as $header => $header_value ) {
-				$this->send_header( $header, $header_value );
+		$send_no_cache_headers = apply_filters('rest_send_nocache_headers', is_user_logged_in());
+		if ($send_no_cache_headers) {
+			foreach (wp_get_nocache_headers() as $header => $header_value) {
+				$this->send_header($header, $header_value);
 			}
 		}
 
@@ -264,7 +264,7 @@ 
 		 *
 		 * @param bool $rest_enabled Whether the REST API is enabled. Default true.
 		 */
-		apply_filters_deprecated( 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors', __( 'The REST API can no longer be completely disabled, the rest_authentication_errors can be used to restrict access to the API, instead.' ) );
+		apply_filters_deprecated('rest_enabled', array(true), '4.7.0', 'rest_authentication_errors', __('The REST API can no longer be completely disabled, the rest_authentication_errors can be used to restrict access to the API, instead.'));
 
 		/**
 		 * Filters whether jsonp is enabled.
@@ -273,62 +273,62 @@ 
 		 *
 		 * @param bool $jsonp_enabled Whether jsonp is enabled. Default true.
 		 */
-		$jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
+		$jsonp_enabled = apply_filters('rest_jsonp_enabled', true);
 
 		$jsonp_callback = null;
 
-		if ( isset( $_GET['_jsonp'] ) ) {
-			if ( ! $jsonp_enabled ) {
-				echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 );
+		if (isset($_GET['_jsonp'])) {
+			if ( ! $jsonp_enabled) {
+				echo $this->json_error('rest_callback_disabled', __('JSONP support is disabled on this site.'), 400);
 				return false;
 			}
 
 			$jsonp_callback = $_GET['_jsonp'];
-			if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
-				echo $this->json_error( 'rest_callback_invalid', __( 'Invalid JSONP callback function.' ), 400 );
+			if ( ! wp_check_jsonp_callback($jsonp_callback)) {
+				echo $this->json_error('rest_callback_invalid', __('Invalid JSONP callback function.'), 400);
 				return false;
 			}
 		}
 
-		if ( empty( $path ) ) {
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
+		if (empty($path)) {
+			if (isset($_SERVER['PATH_INFO'])) {
 				$path = $_SERVER['PATH_INFO'];
 			} else {
 				$path = '/';
 			}
 		}
 
-		$request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path );
+		$request = new WP_REST_Request($_SERVER['REQUEST_METHOD'], $path);
 
-		$request->set_query_params( wp_unslash( $_GET ) );
-		$request->set_body_params( wp_unslash( $_POST ) );
-		$request->set_file_params( $_FILES );
-		$request->set_headers( $this->get_headers( wp_unslash( $_SERVER ) ) );
-		$request->set_body( $this->get_raw_data() );
+		$request->set_query_params(wp_unslash($_GET));
+		$request->set_body_params(wp_unslash($_POST));
+		$request->set_file_params($_FILES);
+		$request->set_headers($this->get_headers(wp_unslash($_SERVER)));
+		$request->set_body($this->get_raw_data());
 
 		/*
 		 * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check
 		 * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
 		 * header.
 		 */
-		if ( isset( $_GET['_method'] ) ) {
-			$request->set_method( $_GET['_method'] );
-		} elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
-			$request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
+		if (isset($_GET['_method'])) {
+			$request->set_method($_GET['_method']);
+		} elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$request->set_method($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
 		}
 
 		$result = $this->check_authentication();
 
-		if ( ! is_wp_error( $result ) ) {
-			$result = $this->dispatch( $request );
+		if ( ! is_wp_error($result)) {
+			$result = $this->dispatch($request);
 		}
 
 		// Normalize to either WP_Error or WP_REST_Response...
-		$result = rest_ensure_response( $result );
+		$result = rest_ensure_response($result);
 
 		// ...then convert WP_Error across.
-		if ( is_wp_error( $result ) ) {
-			$result = $this->error_to_response( $result );
+		if (is_wp_error($result)) {
+			$result = $this->error_to_response($result);
 		}
 
 		/**
@@ -343,19 +343,19 @@ 
 		 * @param WP_REST_Server   $this    Server instance.
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
+		$result = apply_filters('rest_post_dispatch', rest_ensure_response($result), $this, $request);
 
 		// Wrap the response in an envelope if asked for.
-		if ( isset( $_GET['_envelope'] ) ) {
-			$result = $this->envelope_response( $result, isset( $_GET['_embed'] ) );
+		if (isset($_GET['_envelope'])) {
+			$result = $this->envelope_response($result, isset($_GET['_embed']));
 		}
 
 		// Send extra data from response objects.
 		$headers = $result->get_headers();
-		$this->send_headers( $headers );
+		$this->send_headers($headers);
 
 		$code = $result->get_status();
-		$this->set_status( $code );
+		$this->set_status($code);
 
 		/**
 		 * Filters whether the request has already been served.
@@ -371,29 +371,29 @@ 
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 * @param WP_REST_Server   $this    Server instance.
 		 */
-		$served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
+		$served = apply_filters('rest_pre_serve_request', false, $result, $request, $this);
 
-		if ( ! $served ) {
-			if ( 'HEAD' === $request->get_method() ) {
+		if ( ! $served) {
+			if ('HEAD' === $request->get_method()) {
 				return null;
 			}
 
 			// Embed links inside the request.
-			$result = $this->response_to_data( $result, isset( $_GET['_embed'] ) );
+			$result = $this->response_to_data($result, isset($_GET['_embed']));
 
-			$result = wp_json_encode( $result );
+			$result = wp_json_encode($result);
 
 			$json_error_message = $this->get_json_last_error();
-			if ( $json_error_message ) {
-				$json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );
-				$result = $this->error_to_response( $json_error_obj );
-				$result = wp_json_encode( $result->data[0] );
+			if ($json_error_message) {
+				$json_error_obj = new WP_Error('rest_encode_error', $json_error_message, array('status' => 500));
+				$result = $this->error_to_response($json_error_obj);
+				$result = wp_json_encode($result->data[0]);
 			}
 
-			if ( $jsonp_callback ) {
+			if ($jsonp_callback) {
 				// Prepend '/**/' to mitigate possible JSONP Flash attacks.
 				// https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
-				echo '/**/' . $jsonp_callback . '(' . $result . ')';
+				echo '/**/'.$jsonp_callback.'('.$result.')';
 			} else {
 				echo $result;
 			}
@@ -416,20 +416,20 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	public function response_to_data( $response, $embed ) {
+	public function response_to_data($response, $embed) {
 		$data  = $response->get_data();
-		$links = $this->get_compact_response_links( $response );
+		$links = $this->get_compact_response_links($response);
 
-		if ( ! empty( $links ) ) {
+		if ( ! empty($links)) {
 			// Convert links to part of the data.
 			$data['_links'] = $links;
 		}
-		if ( $embed ) {
+		if ($embed) {
 			// Determine if this is a numeric array.
-			if ( wp_is_numeric_array( $data ) ) {
-				$data = array_map( array( $this, 'embed_links' ), $data );
+			if (wp_is_numeric_array($data)) {
+				$data = array_map(array($this, 'embed_links'), $data);
 			} else {
-				$data = $this->embed_links( $data );
+				$data = $this->embed_links($data);
 			}
 		}
 
@@ -449,21 +449,21 @@ 
 	 * @param WP_REST_Response $response Response to extract links from.
 	 * @return array Map of link relation to list of link hashes.
 	 */
-	public static function get_response_links( $response ) {
+	public static function get_response_links($response) {
 		$links = $response->get_links();
-		if ( empty( $links ) ) {
+		if (empty($links)) {
 			return array();
 		}
 
 		// Convert links to part of the data.
 		$data = array();
-		foreach ( $links as $rel => $items ) {
-			$data[ $rel ] = array();
+		foreach ($links as $rel => $items) {
+			$data[$rel] = array();
 
-			foreach ( $items as $item ) {
+			foreach ($items as $item) {
 				$attributes = $item['attributes'];
 				$attributes['href'] = $item['href'];
-				$data[ $rel ][] = $attributes;
+				$data[$rel][] = $attributes;
 			}
 		}
 
@@ -483,41 +483,41 @@ 
 	 * @param WP_REST_Response $response Response to extract links from.
 	 * @return array Map of link relation to list of link hashes.
 	 */
-	public static function get_compact_response_links( $response ) {
-		$links = self::get_response_links( $response );
+	public static function get_compact_response_links($response) {
+		$links = self::get_response_links($response);
 
-		if ( empty( $links ) ) {
+		if (empty($links)) {
 			return array();
 		}
 
 		$curies = $response->get_curies();
 		$used_curies = array();
 
-		foreach ( $links as $rel => $items ) {
+		foreach ($links as $rel => $items) {
 
 			// Convert $rel URIs to their compact versions if they exist.
-			foreach ( $curies as $curie ) {
-				$href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) );
-				if ( strpos( $rel, $href_prefix ) !== 0 ) {
+			foreach ($curies as $curie) {
+				$href_prefix = substr($curie['href'], 0, strpos($curie['href'], '{rel}'));
+				if (strpos($rel, $href_prefix) !== 0) {
 					continue;
 				}
 
 				// Relation now changes from '$uri' to '$curie:$relation'.
-				$rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) );
-				preg_match( '!' . $rel_regex . '!', $rel, $matches );
-				if ( $matches ) {
-					$new_rel = $curie['name'] . ':' . $matches[1];
-					$used_curies[ $curie['name'] ] = $curie;
-					$links[ $new_rel ] = $items;
-					unset( $links[ $rel ] );
+				$rel_regex = str_replace('\{rel\}', '(.+)', preg_quote($curie['href'], '!'));
+				preg_match('!'.$rel_regex.'!', $rel, $matches);
+				if ($matches) {
+					$new_rel = $curie['name'].':'.$matches[1];
+					$used_curies[$curie['name']] = $curie;
+					$links[$new_rel] = $items;
+					unset($links[$rel]);
 					break;
 				}
 			}
 		}
 
 		// Push the curies onto the start of the links array.
-		if ( $used_curies ) {
-			$links['curies'] = array_values( $used_curies );
+		if ($used_curies) {
+			$links['curies'] = array_values($used_curies);
 		}
 
 		return $links;
@@ -537,58 +537,58 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	protected function embed_links( $data ) {
-		if ( empty( $data['_links'] ) ) {
+	protected function embed_links($data) {
+		if (empty($data['_links'])) {
 			return $data;
 		}
 
 		$embedded = array();
 
-		foreach ( $data['_links'] as $rel => $links ) {
+		foreach ($data['_links'] as $rel => $links) {
 			// Ignore links to self, for obvious reasons.
-			if ( 'self' === $rel ) {
+			if ('self' === $rel) {
 				continue;
 			}
 
 			$embeds = array();
 
-			foreach ( $links as $item ) {
+			foreach ($links as $item) {
 				// Determine if the link is embeddable.
-				if ( empty( $item['embeddable'] ) ) {
+				if (empty($item['embeddable'])) {
 					// Ensure we keep the same order.
 					$embeds[] = array();
 					continue;
 				}
 
 				// Run through our internal routing and serve.
-				$request = WP_REST_Request::from_url( $item['href'] );
-				if ( ! $request ) {
+				$request = WP_REST_Request::from_url($item['href']);
+				if ( ! $request) {
 					$embeds[] = array();
 					continue;
 				}
 
 				// Embedded resources get passed context=embed.
-				if ( empty( $request['context'] ) ) {
+				if (empty($request['context'])) {
 					$request['context'] = 'embed';
 				}
 
-				$response = $this->dispatch( $request );
+				$response = $this->dispatch($request);
 
 				/** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */
-				$response = apply_filters( 'rest_post_dispatch', rest_ensure_response( $response ), $this, $request );
+				$response = apply_filters('rest_post_dispatch', rest_ensure_response($response), $this, $request);
 
-				$embeds[] = $this->response_to_data( $response, false );
+				$embeds[] = $this->response_to_data($response, false);
 			}
 
 			// Determine if any real links were found.
-			$has_links = count( array_filter( $embeds ) );
+			$has_links = count(array_filter($embeds));
 
-			if ( $has_links ) {
-				$embedded[ $rel ] = $embeds;
+			if ($has_links) {
+				$embedded[$rel] = $embeds;
 			}
 		}
 
-		if ( ! empty( $embedded ) ) {
+		if ( ! empty($embedded)) {
 			$data['_embedded'] = $embedded;
 		}
 
@@ -609,9 +609,9 @@ 
 	 * @param bool             $embed    Whether links should be embedded.
 	 * @return WP_REST_Response New response with wrapped data
 	 */
-	public function envelope_response( $response, $embed ) {
+	public function envelope_response($response, $embed) {
 		$envelope = array(
-			'body'    => $this->response_to_data( $response, $embed ),
+			'body'    => $this->response_to_data($response, $embed),
 			'status'  => $response->get_status(),
 			'headers' => $response->get_headers(),
 		);
@@ -624,10 +624,10 @@ 
 		 * @param array            $envelope Envelope data.
 		 * @param WP_REST_Response $response Original response data.
 		 */
-		$envelope = apply_filters( 'rest_envelope_response', $envelope, $response );
+		$envelope = apply_filters('rest_envelope_response', $envelope, $response);
 
 		// Ensure it's still a response and return.
-		return rest_ensure_response( $envelope );
+		return rest_ensure_response($envelope);
 	}
 
 	/**
@@ -642,14 +642,14 @@ 
 	 * @param bool   $override   Optional. Whether the route should be overridden if it already exists.
 	 *                           Default false.
 	 */
-	public function register_route( $namespace, $route, $route_args, $override = false ) {
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			$this->namespaces[ $namespace ] = array();
+	public function register_route($namespace, $route, $route_args, $override = false) {
+		if ( ! isset($this->namespaces[$namespace])) {
+			$this->namespaces[$namespace] = array();
 
-			$this->register_route( $namespace, '/' . $namespace, array(
+			$this->register_route($namespace, '/'.$namespace, array(
 				array(
 					'methods' => self::READABLE,
-					'callback' => array( $this, 'get_namespace_index' ),
+					'callback' => array($this, 'get_namespace_index'),
 					'args' => array(
 						'namespace' => array(
 							'default' => $namespace,
@@ -659,17 +659,17 @@ 
 						),
 					),
 				),
-			) );
+			));
 		}
 
 		// Associative to avoid double-registration.
-		$this->namespaces[ $namespace ][ $route ] = true;
+		$this->namespaces[$namespace][$route] = true;
 		$route_args['namespace'] = $namespace;
 
-		if ( $override || empty( $this->endpoints[ $route ] ) ) {
-			$this->endpoints[ $route ] = $route_args;
+		if ($override || empty($this->endpoints[$route])) {
+			$this->endpoints[$route] = $route_args;
 		} else {
-			$this->endpoints[ $route ] = array_merge( $this->endpoints[ $route ], $route_args );
+			$this->endpoints[$route] = array_merge($this->endpoints[$route], $route_args);
 		}
 	}
 
@@ -706,7 +706,7 @@ 
 		 *                         `'/path/regex' => array( $callback, $bitmask )` or
 		 *                         `'/path/regex' => array( array( $callback, $bitmask ).
 		 */
-		$endpoints = apply_filters( 'rest_endpoints', $this->endpoints );
+		$endpoints = apply_filters('rest_endpoints', $this->endpoints);
 
 		// Normalise the endpoints.
 		$defaults = array(
@@ -717,32 +717,32 @@ 
 			'args'          => array(),
 		);
 
-		foreach ( $endpoints as $route => &$handlers ) {
+		foreach ($endpoints as $route => &$handlers) {
 
-			if ( isset( $handlers['callback'] ) ) {
+			if (isset($handlers['callback'])) {
 				// Single endpoint, add one deeper.
-				$handlers = array( $handlers );
+				$handlers = array($handlers);
 			}
 
-			if ( ! isset( $this->route_options[ $route ] ) ) {
-				$this->route_options[ $route ] = array();
+			if ( ! isset($this->route_options[$route])) {
+				$this->route_options[$route] = array();
 			}
 
-			foreach ( $handlers as $key => &$handler ) {
+			foreach ($handlers as $key => &$handler) {
 
-				if ( ! is_numeric( $key ) ) {
+				if ( ! is_numeric($key)) {
 					// Route option, move it to the options.
-					$this->route_options[ $route ][ $key ] = $handler;
-					unset( $handlers[ $key ] );
+					$this->route_options[$route][$key] = $handler;
+					unset($handlers[$key]);
 					continue;
 				}
 
-				$handler = wp_parse_args( $handler, $defaults );
+				$handler = wp_parse_args($handler, $defaults);
 
 				// Allow comma-separated HTTP methods.
-				if ( is_string( $handler['methods'] ) ) {
-					$methods = explode( ',', $handler['methods'] );
-				} elseif ( is_array( $handler['methods'] ) ) {
+				if (is_string($handler['methods'])) {
+					$methods = explode(',', $handler['methods']);
+				} elseif (is_array($handler['methods'])) {
 					$methods = $handler['methods'];
 				} else {
 					$methods = array();
@@ -750,9 +750,9 @@ 
 
 				$handler['methods'] = array();
 
-				foreach ( $methods as $method ) {
-					$method = strtoupper( trim( $method ) );
-					$handler['methods'][ $method ] = true;
+				foreach ($methods as $method) {
+					$method = strtoupper(trim($method));
+					$handler['methods'][$method] = true;
 				}
 			}
 		}
@@ -769,7 +769,7 @@ 
 	 * @return array List of registered namespaces.
 	 */
 	public function get_namespaces() {
-		return array_keys( $this->namespaces );
+		return array_keys($this->namespaces);
 	}
 
 	/**
@@ -781,12 +781,12 @@ 
 	 * @param string $route Route pattern to fetch options for.
 	 * @return array|null Data as an associative array if found, or null if not found.
 	 */
-	public function get_route_options( $route ) {
-		if ( ! isset( $this->route_options[ $route ] ) ) {
+	public function get_route_options($route) {
+		if ( ! isset($this->route_options[$route])) {
 			return null;
 		}
 
-		return $this->route_options[ $route ];
+		return $this->route_options[$route];
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 	 * @param WP_REST_Request $request Request to attempt dispatching.
 	 * @return WP_REST_Response Response returned by the callback.
 	 */
-	public function dispatch( $request ) {
+	public function dispatch($request) {
 		/**
 		 * Filters the pre-calculated result of a REST dispatch request.
 		 *
@@ -812,62 +812,62 @@ 
 		 * @param WP_REST_Server  $this    Server instance.
 		 * @param WP_REST_Request $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_pre_dispatch', null, $this, $request );
+		$result = apply_filters('rest_pre_dispatch', null, $this, $request);
 
-		if ( ! empty( $result ) ) {
+		if ( ! empty($result)) {
 			return $result;
 		}
 
 		$method = $request->get_method();
 		$path   = $request->get_route();
 
-		foreach ( $this->get_routes() as $route => $handlers ) {
-			$match = preg_match( '@^' . $route . '$@i', $path, $args );
+		foreach ($this->get_routes() as $route => $handlers) {
+			$match = preg_match('@^'.$route.'$@i', $path, $args);
 
-			if ( ! $match ) {
+			if ( ! $match) {
 				continue;
 			}
 
-			foreach ( $handlers as $handler ) {
-				$callback  = $handler['callback'];
+			foreach ($handlers as $handler) {
+				$callback = $handler['callback'];
 				$response = null;
 
 				// Fallback to GET method if no HEAD method is registered.
 				$checked_method = $method;
-				if ( 'HEAD' === $method && empty( $handler['methods']['HEAD'] ) ) {
+				if ('HEAD' === $method && empty($handler['methods']['HEAD'])) {
 					$checked_method = 'GET';
 				}
-				if ( empty( $handler['methods'][ $checked_method ] ) ) {
+				if (empty($handler['methods'][$checked_method])) {
 					continue;
 				}
 
-				if ( ! is_callable( $callback ) ) {
-					$response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) );
+				if ( ! is_callable($callback)) {
+					$response = new WP_Error('rest_invalid_handler', __('The handler for the route is invalid'), array('status' => 500));
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Remove the redundant preg_match argument.
-					unset( $args[0] );
+					unset($args[0]);
 
-					$request->set_url_params( $args );
-					$request->set_attributes( $handler );
+					$request->set_url_params($args);
+					$request->set_attributes($handler);
 
 					$defaults = array();
 
-					foreach ( $handler['args'] as $arg => $options ) {
-						if ( isset( $options['default'] ) ) {
-							$defaults[ $arg ] = $options['default'];
+					foreach ($handler['args'] as $arg => $options) {
+						if (isset($options['default'])) {
+							$defaults[$arg] = $options['default'];
 						}
 					}
 
-					$request->set_default_params( $defaults );
+					$request->set_default_params($defaults);
 
 					$check_required = $request->has_valid_params();
-					if ( is_wp_error( $check_required ) ) {
+					if (is_wp_error($check_required)) {
 						$response = $check_required;
 					} else {
 						$check_sanitized = $request->sanitize_params();
-						if ( is_wp_error( $check_sanitized ) ) {
+						if (is_wp_error($check_sanitized)) {
 							$response = $check_sanitized;
 						}
 					}
@@ -889,22 +889,22 @@ 
 				 * @param WP_REST_Server   $handler  ResponseHandler instance (usually WP_REST_Server).
 				 * @param WP_REST_Request  $request  Request used to generate the response.
 				 */
-				$response = apply_filters( 'rest_request_before_callbacks', $response, $handler, $request );
+				$response = apply_filters('rest_request_before_callbacks', $response, $handler, $request);
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Check permission specified on the route.
-					if ( ! empty( $handler['permission_callback'] ) ) {
-						$permission = call_user_func( $handler['permission_callback'], $request );
+					if ( ! empty($handler['permission_callback'])) {
+						$permission = call_user_func($handler['permission_callback'], $request);
 
-						if ( is_wp_error( $permission ) ) {
+						if (is_wp_error($permission)) {
 							$response = $permission;
-						} elseif ( false === $permission || null === $permission ) {
-							$response = new WP_Error( 'rest_forbidden', __( 'Sorry, you are not allowed to do that.' ), array( 'status' => 403 ) );
+						} elseif (false === $permission || null === $permission) {
+							$response = new WP_Error('rest_forbidden', __('Sorry, you are not allowed to do that.'), array('status' => 403));
 						}
 					}
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					/**
 					 * Filters the REST dispatch request result.
 					 *
@@ -918,13 +918,13 @@ 
 					 * @param string          $route           Route matched for the request.
 					 * @param array           $handler         Route handler used for the request.
 					 */
-					$dispatch_result = apply_filters( 'rest_dispatch_request', null, $request, $route, $handler );
+					$dispatch_result = apply_filters('rest_dispatch_request', null, $request, $route, $handler);
 
 					// Allow plugins to halt the request via this filter.
-					if ( null !== $dispatch_result ) {
+					if (null !== $dispatch_result) {
 						$response = $dispatch_result;
 					} else {
-						$response = call_user_func( $callback, $request );
+						$response = call_user_func($callback, $request);
 					}
 				}
 
@@ -948,22 +948,22 @@ 
 				 * @param WP_REST_Server   $handler  ResponseHandler instance (usually WP_REST_Server).
 				 * @param WP_REST_Request  $request  Request used to generate the response.
 				 */
-				$response = apply_filters( 'rest_request_after_callbacks', $response, $handler, $request );
+				$response = apply_filters('rest_request_after_callbacks', $response, $handler, $request);
 
-				if ( is_wp_error( $response ) ) {
-					$response = $this->error_to_response( $response );
+				if (is_wp_error($response)) {
+					$response = $this->error_to_response($response);
 				} else {
-					$response = rest_ensure_response( $response );
+					$response = rest_ensure_response($response);
 				}
 
-				$response->set_matched_route( $route );
-				$response->set_matched_handler( $handler );
+				$response->set_matched_route($route);
+				$response->set_matched_handler($handler);
 
 				return $response;
 			}
 		}
 
-		return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) );
+		return $this->error_to_response(new WP_Error('rest_no_route', __('No route was found matching the URL and request method'), array('status' => 404)));
 	}
 
 	/**
@@ -979,13 +979,13 @@ 
 	 */
 	protected function get_json_last_error() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
-		if ( ( defined( 'JSON_ERROR_NONE' ) && JSON_ERROR_NONE === $last_error_code ) || empty( $last_error_code ) ) {
+		if ((defined('JSON_ERROR_NONE') && JSON_ERROR_NONE === $last_error_code) || empty($last_error_code)) {
 			return false;
 		}
 
@@ -1007,21 +1007,21 @@ 
 	 * }
 	 * @return array Index entity
 	 */
-	public function get_index( $request ) {
+	public function get_index($request) {
 		// General site data.
 		$available = array(
-			'name'           => get_option( 'blogname' ),
-			'description'    => get_option( 'blogdescription' ),
-			'url'            => get_option( 'siteurl' ),
+			'name'           => get_option('blogname'),
+			'description'    => get_option('blogdescription'),
+			'url'            => get_option('siteurl'),
 			'home'           => home_url(),
-			'namespaces'     => array_keys( $this->namespaces ),
+			'namespaces'     => array_keys($this->namespaces),
 			'authentication' => array(),
-			'routes'         => $this->get_data_for_routes( $this->get_routes(), $request['context'] ),
+			'routes'         => $this->get_data_for_routes($this->get_routes(), $request['context']),
 		);
 
-		$response = new WP_REST_Response( $available );
+		$response = new WP_REST_Response($available);
 
-		$response->add_link( 'help', 'http://v2.wp-api.org/' );
+		$response->add_link('help', 'http://v2.wp-api.org/');
 
 		/**
 		 * Filters the API root index data.
@@ -1034,7 +1034,7 @@ 
 		 *
 		 * @param WP_REST_Response $response Response data.
 		 */
-		return apply_filters( 'rest_index', $response );
+		return apply_filters('rest_index', $response);
 	}
 
 	/**
@@ -1047,24 +1047,24 @@ 
 	 * @return WP_REST_Response|WP_Error WP_REST_Response instance if the index was found,
 	 *                                   WP_Error if the namespace isn't set.
 	 */
-	public function get_namespace_index( $request ) {
+	public function get_namespace_index($request) {
 		$namespace = $request['namespace'];
 
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) );
+		if ( ! isset($this->namespaces[$namespace])) {
+			return new WP_Error('rest_invalid_namespace', __('The specified namespace could not be found.'), array('status' => 404));
 		}
 
-		$routes = $this->namespaces[ $namespace ];
-		$endpoints = array_intersect_key( $this->get_routes(), $routes );
+		$routes = $this->namespaces[$namespace];
+		$endpoints = array_intersect_key($this->get_routes(), $routes);
 
 		$data = array(
 			'namespace' => $namespace,
-			'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ),
+			'routes' => $this->get_data_for_routes($endpoints, $request['context']),
 		);
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
 		// Link to the root index.
-		$response->add_link( 'up', rest_url( '/' ) );
+		$response->add_link('up', rest_url('/'));
 
 		/**
 		 * Filters the namespace index data.
@@ -1077,7 +1077,7 @@ 
 		 * @param WP_REST_Response $response Response data.
 		 * @param WP_REST_Request  $request  Request data. The namespace is passed as the 'namespace' parameter.
 		 */
-		return apply_filters( 'rest_namespace_index', $response, $request );
+		return apply_filters('rest_namespace_index', $response, $request);
 	}
 
 	/**
@@ -1090,13 +1090,13 @@ 
 	 * @param string $context Optional. Context for data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array Route data to expose in indexes.
 	 */
-	public function get_data_for_routes( $routes, $context = 'view' ) {
+	public function get_data_for_routes($routes, $context = 'view') {
 		$available = array();
 
 		// Find the available routes.
-		foreach ( $routes as $route => $callbacks ) {
-			$data = $this->get_data_for_route( $route, $callbacks, $context );
-			if ( empty( $data ) ) {
+		foreach ($routes as $route => $callbacks) {
+			$data = $this->get_data_for_route($route, $callbacks, $context);
+			if (empty($data)) {
 				continue;
 			}
 
@@ -1107,7 +1107,7 @@ 
 			 *
 			 * @param WP_REST_Request $request Request data. The namespace is passed as the 'namespace' parameter.
 			 */
-			$available[ $route ] = apply_filters( 'rest_endpoints_description', $data );
+			$available[$route] = apply_filters('rest_endpoints_description', $data);
 		}
 
 		/**
@@ -1122,7 +1122,7 @@ 
 		 * @param array $available Map of route to route data.
 		 * @param array $routes    Internal route data as an associative array.
 		 */
-		return apply_filters( 'rest_route_data', $available, $routes );
+		return apply_filters('rest_route_data', $available, $routes);
 	}
 
 	/**
@@ -1136,74 +1136,74 @@ 
 	 * @param string $context   Optional. Context for the data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array|null Data for the route, or null if no publicly-visible data.
 	 */
-	public function get_data_for_route( $route, $callbacks, $context = 'view' ) {
+	public function get_data_for_route($route, $callbacks, $context = 'view') {
 		$data = array(
 			'namespace' => '',
 			'methods' => array(),
 			'endpoints' => array(),
 		);
 
-		if ( isset( $this->route_options[ $route ] ) ) {
-			$options = $this->route_options[ $route ];
+		if (isset($this->route_options[$route])) {
+			$options = $this->route_options[$route];
 
-			if ( isset( $options['namespace'] ) ) {
+			if (isset($options['namespace'])) {
 				$data['namespace'] = $options['namespace'];
 			}
 
-			if ( isset( $options['schema'] ) && 'help' === $context ) {
-				$data['schema'] = call_user_func( $options['schema'] );
+			if (isset($options['schema']) && 'help' === $context) {
+				$data['schema'] = call_user_func($options['schema']);
 			}
 		}
 
-		$route = preg_replace( '#\(\?P<(\w+?)>.*?\)#', '{$1}', $route );
+		$route = preg_replace('#\(\?P<(\w+?)>.*?\)#', '{$1}', $route);
 
-		foreach ( $callbacks as $callback ) {
+		foreach ($callbacks as $callback) {
 			// Skip to the next route if any callback is hidden.
-			if ( empty( $callback['show_in_index'] ) ) {
+			if (empty($callback['show_in_index'])) {
 				continue;
 			}
 
-			$data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) );
+			$data['methods'] = array_merge($data['methods'], array_keys($callback['methods']));
 			$endpoint_data = array(
-				'methods' => array_keys( $callback['methods'] ),
+				'methods' => array_keys($callback['methods']),
 			);
 
-			if ( isset( $callback['args'] ) ) {
+			if (isset($callback['args'])) {
 				$endpoint_data['args'] = array();
-				foreach ( $callback['args'] as $key => $opts ) {
+				foreach ($callback['args'] as $key => $opts) {
 					$arg_data = array(
-						'required' => ! empty( $opts['required'] ),
+						'required' => ! empty($opts['required']),
 					);
-					if ( isset( $opts['default'] ) ) {
+					if (isset($opts['default'])) {
 						$arg_data['default'] = $opts['default'];
 					}
-					if ( isset( $opts['enum'] ) ) {
+					if (isset($opts['enum'])) {
 						$arg_data['enum'] = $opts['enum'];
 					}
-					if ( isset( $opts['description'] ) ) {
+					if (isset($opts['description'])) {
 						$arg_data['description'] = $opts['description'];
 					}
-					if ( isset( $opts['type'] ) ) {
+					if (isset($opts['type'])) {
 						$arg_data['type'] = $opts['type'];
 					}
-					if ( isset( $opts['items'] ) ) {
+					if (isset($opts['items'])) {
 						$arg_data['items'] = $opts['items'];
 					}
-					$endpoint_data['args'][ $key ] = $arg_data;
+					$endpoint_data['args'][$key] = $arg_data;
 				}
 			}
 
 			$data['endpoints'][] = $endpoint_data;
 
 			// For non-variable routes, generate links.
-			if ( strpos( $route, '{' ) === false ) {
+			if (strpos($route, '{') === false) {
 				$data['_links'] = array(
-					'self' => rest_url( $route ),
+					'self' => rest_url($route),
 				);
 			}
 		}
 
-		if ( empty( $data['methods'] ) ) {
+		if (empty($data['methods'])) {
 			// No methods supported, hide the route.
 			return null;
 		}
@@ -1219,8 +1219,8 @@ 
 	 *
 	 * @param int $code HTTP status.
 	 */
-	protected function set_status( $code ) {
-		status_header( $code );
+	protected function set_status($code) {
+		status_header($code);
 	}
 
 	/**
@@ -1232,7 +1232,7 @@ 
 	 * @param string $key Header key.
 	 * @param string $value Header value.
 	 */
-	public function send_header( $key, $value ) {
+	public function send_header($key, $value) {
 		/*
 		 * Sanitize as per RFC2616 (Section 4.2):
 		 *
@@ -1240,8 +1240,8 @@ 
 		 * single SP before interpreting the field value or forwarding the
 		 * message downstream.
 		 */
-		$value = preg_replace( '/\s+/', ' ', $value );
-		header( sprintf( '%s: %s', $key, $value ) );
+		$value = preg_replace('/\s+/', ' ', $value);
+		header(sprintf('%s: %s', $key, $value));
 	}
 
 	/**
@@ -1252,9 +1252,9 @@ 
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
-	public function send_headers( $headers ) {
-		foreach ( $headers as $key => $value ) {
-			$this->send_header( $key, $value );
+	public function send_headers($headers) {
+		foreach ($headers as $key => $value) {
+			$this->send_header($key, $value);
 		}
 	}
 
@@ -1275,8 +1275,8 @@ 
 		 * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 		 * but we can do it ourself.
 		 */
-		if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
-			$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+		if ( ! isset($HTTP_RAW_POST_DATA)) {
+			$HTTP_RAW_POST_DATA = file_get_contents('php://input');
 		}
 
 		return $HTTP_RAW_POST_DATA;
@@ -1291,17 +1291,17 @@ 
 	 * @param array $server Associative array similar to `$_SERVER`.
 	 * @return array Headers extracted from the input.
 	 */
-	public function get_headers( $server ) {
+	public function get_headers($server) {
 		$headers = array();
 
 		// CONTENT_* headers are not prefixed with HTTP_.
-		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
+		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
 
-		foreach ( $server as $key => $value ) {
-			if ( strpos( $key, 'HTTP_' ) === 0 ) {
-				$headers[ substr( $key, 5 ) ] = $value;
-			} elseif ( isset( $additional[ $key ] ) ) {
-				$headers[ $key ] = $value;
+		foreach ($server as $key => $value) {
+			if (strpos($key, 'HTTP_') === 0) {
+				$headers[substr($key, 5)] = $value;
+			} elseif (isset($additional[$key])) {
+				$headers[$key] = $value;
 			}
 		}
 

src/wp-includes/user.php

Doc Comments +2 added lines, -2 removed lines

@@ -734,7 +734,7 @@ 
  *
  * @param int    $user_id    User ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Metadata value.
+ * @param string  $meta_value Metadata value.
  * @param bool   $unique     Optional, default is false. Whether the same key should not be added.
  * @return int|false Meta ID on success, false on failure.
  */
@@ -1211,7 +1211,7 @@ 
  * @since 3.0.0
  *
  * @param object|WP_User $user User object to be cached
- * @return bool|null Returns false on failure.
+ * @return false|null Returns false on failure.
  */
 function update_user_caches( $user ) {
 	if ( $user instanceof WP_User ) {

Indentation +19 added lines, -19 removed lines

@@ -67,13 +67,13 @@ 
 	 *
 	 * @param bool  $secure_cookie Whether to use a secure sign-on cookie.
 	 * @param array $credentials {
- 	 *     Array of entered sign-on data.
- 	 *
- 	 *     @type string $user_login    Username.
- 	 *     @type string $user_password Password entered.
+	 *     Array of entered sign-on data.
+	 *
+	 *     @type string $user_login    Username.
+	 *     @type string $user_password Password entered.
 	 *     @type bool   $remember      Whether to 'remember' the user. Increases the time
 	 *                                 that the cookie will be kept. Default false.
- 	 * }
+	 * }
 	 */
 	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
 
@@ -1184,7 +1184,7 @@ 
 			 *
 			 * The dynamic portion of the hook name, `$field`, refers to the prefixed user
 			 * field being filtered, such as 'user_login', 'user_email', 'first_name', etc.
- 			 *
+			 *
 			 * @since 2.9.0
 			 *
 			 * @param mixed $value Value of the prefixed user field.
@@ -1625,16 +1625,16 @@ 
 	$user = new WP_User( $user_id );
 
 	/**
- 	 * Filters a user's meta values and keys before the user is created or updated.
- 	 *
- 	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
- 	 *
- 	 * @since 4.4.0
- 	 *
- 	 * @param array $meta {
- 	 *     Default meta values and keys for the user.
- 	 *
- 	 *     @type string   $nickname             The user's nickname. Default is the user's username.
+	 * Filters a user's meta values and keys before the user is created or updated.
+	 *
+	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array $meta {
+	 *     Default meta values and keys for the user.
+	 *
+	 *     @type string   $nickname             The user's nickname. Default is the user's username.
 	 *     @type string   $first_name           The user's first name.
 	 *     @type string   $last_name            The user's last name.
 	 *     @type string   $description          The user's description.
@@ -1645,10 +1645,10 @@ 
 	 *                                          not forced.
 	 *     @type bool     $show_admin_bar_front Whether to show the admin bar on the front end for the user.
 	 *                                          Default true.
- 	 * }
+	 * }
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
- 	 */
+	 */
 	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
 
 	// Update user meta.
@@ -1983,7 +1983,7 @@ 
 	 * @since 2.9.0
 	 *
 	 * @param array   $methods Array of contact methods and their labels.
- 	 * @param WP_User $user    WP_User object.
+	 * @param WP_User $user    WP_User object.
 	 */
 	return apply_filters( 'user_contactmethods', $methods, $user );
 }

Spacing +492 added lines, -492 removed lines

@@ -25,19 +25,19 @@ 
  * @param string|bool $secure_cookie Optional. Whether to use secure cookie.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_signon( $credentials = array(), $secure_cookie = '' ) {
-	if ( empty($credentials) ) {
+function wp_signon($credentials = array(), $secure_cookie = '') {
+	if (empty($credentials)) {
 		$credentials = array(); // Back-compat for plugins passing an empty string.
 
-		if ( ! empty($_POST['log']) )
+		if ( ! empty($_POST['log']))
 			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
+		if ( ! empty($_POST['pwd']))
 			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
+		if ( ! empty($_POST['rememberme']))
 			$credentials['remember'] = $_POST['rememberme'];
 	}
 
-	if ( !empty($credentials['remember']) )
+	if ( ! empty($credentials['remember']))
 		$credentials['remember'] = true;
 	else
 		$credentials['remember'] = false;
@@ -55,9 +55,9 @@ 
 	 * @param string $user_login    Username, passed by reference.
 	 * @param string $user_password User password, passed by reference.
 	 */
-	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
+	do_action_ref_array('wp_authenticate', array(&$credentials['user_login'], &$credentials['user_password']));
 
-	if ( '' === $secure_cookie )
+	if ('' === $secure_cookie)
 		$secure_cookie = is_ssl();
 
 	/**
@@ -75,7 +75,7 @@ 
 	 *                                 that the cookie will be kept. Default false.
  	 * }
 	 */
-	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
+	$secure_cookie = apply_filters('secure_signon_cookie', $secure_cookie, $credentials);
 
 	global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie
 	$auth_secure_cookie = $secure_cookie;
@@ -84,8 +84,8 @@ 
 
 	$user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
 
-	if ( is_wp_error($user) ) {
-		if ( $user->get_error_codes() == array('empty_username', 'empty_password') ) {
+	if (is_wp_error($user)) {
+		if ($user->get_error_codes() == array('empty_username', 'empty_password')) {
 			$user = new WP_Error('', '');
 		}
 
@@ -101,7 +101,7 @@ 
 	 * @param string  $user_login Username.
 	 * @param WP_User $user       WP_User object of the logged-in user.
 	 */
-	do_action( 'wp_login', $user->user_login, $user );
+	do_action('wp_login', $user->user_login, $user);
 	return $user;
 }
 
@@ -116,20 +116,20 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_username_password($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
+	if (empty($username) || empty($password)) {
+		if (is_wp_error($user))
 			return $user;
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
+		if (empty($username))
 			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
 
-		if ( empty($password) )
+		if (empty($password))
 			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
 
 		return $error;
@@ -137,11 +137,11 @@ 
 
 	$user = get_user_by('login', $username);
 
-	if ( !$user ) {
-		return new WP_Error( 'invalid_username',
-			__( '<strong>ERROR</strong>: Invalid username.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_username',
+			__('<strong>ERROR</strong>: Invalid username.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -155,19 +155,19 @@ 
 	 *                                   callback failed authentication.
 	 * @param string           $password Password to check against the user.
 	 */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
+	$user = apply_filters('wp_authenticate_user', $user, $password);
+	if (is_wp_error($user))
 		return $user;
 
-	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: user name */
-				__( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
-				'<strong>' . $username . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the username %s is incorrect.'),
+				'<strong>'.$username.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -186,60 +186,60 @@ 
  * @param string                $password Password for authentication.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_authenticate_email_password( $user, $email, $password ) {
-	if ( $user instanceof WP_User ) {
+function wp_authenticate_email_password($user, $email, $password) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty( $email ) || empty( $password ) ) {
-		if ( is_wp_error( $user ) ) {
+	if (empty($email) || empty($password)) {
+		if (is_wp_error($user)) {
 			return $user;
 		}
 
 		$error = new WP_Error();
 
-		if ( empty( $email ) ) {
-			$error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) ); // Uses 'empty_username' for back-compat with wp_signon()
+		if (empty($email)) {
+			$error->add('empty_username', __('<strong>ERROR</strong>: The email field is empty.')); // Uses 'empty_username' for back-compat with wp_signon()
 		}
 
-		if ( empty( $password ) ) {
-			$error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) );
+		if (empty($password)) {
+			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
 		}
 
 		return $error;
 	}
 
-	if ( ! is_email( $email ) ) {
+	if ( ! is_email($email)) {
 		return $user;
 	}
 
-	$user = get_user_by( 'email', $email );
+	$user = get_user_by('email', $email);
 
-	if ( ! $user ) {
-		return new WP_Error( 'invalid_email',
-			__( '<strong>ERROR</strong>: Invalid email address.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_email',
+			__('<strong>ERROR</strong>: Invalid email address.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
+	$user = apply_filters('wp_authenticate_user', $user, $password);
 
-	if ( is_wp_error( $user ) ) {
+	if (is_wp_error($user)) {
 		return $user;
 	}
 
-	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: email address */
-				__( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
-				'<strong>' . $email . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.'),
+				'<strong>'.$email.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -260,23 +260,23 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_cookie($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) && empty($password) ) {
+	if (empty($username) && empty($password)) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
+		if ($user_id)
 			return new WP_User($user_id);
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
+		if ($auth_secure_cookie)
 			$auth_cookie = SECURE_AUTH_COOKIE;
 		else
 			$auth_cookie = AUTH_COOKIE;
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
+		if ( ! empty($_COOKIE[$auth_cookie]))
 			return new WP_Error('expired_session', __('Please log in again.'));
 
 		// If the cookie is not set, be silent.
@@ -294,8 +294,8 @@ 
  * @param WP_User|WP_Error|null $user WP_User or WP_Error object from a previous callback. Default null.
  * @return WP_User|WP_Error WP_User on success, WP_Error if the user is considered a spammer.
  */
-function wp_authenticate_spam_check( $user ) {
-	if ( $user instanceof WP_User && is_multisite() ) {
+function wp_authenticate_spam_check($user) {
+	if ($user instanceof WP_User && is_multisite()) {
 		/**
 		 * Filters whether the user has been marked as a spammer.
 		 *
@@ -304,10 +304,10 @@ 
 		 * @param bool    $spammed Whether the user is considered a spammer.
 		 * @param WP_User $user    User to check against.
 		 */
-		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
+		$spammed = apply_filters('check_is_user_spammed', is_user_spammy($user), $user);
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ($spammed)
+			return new WP_Error('spammer_account', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
 	}
 	return $user;
 }
@@ -327,16 +327,16 @@ 
  * @return int|false User ID if validated, false otherwise. If a user ID from
  *                   an earlier filter callback is received, that value is returned.
  */
-function wp_validate_logged_in_cookie( $user_id ) {
-	if ( $user_id ) {
+function wp_validate_logged_in_cookie($user_id) {
+	if ($user_id) {
 		return $user_id;
 	}
 
-	if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) ) {
+	if (is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE])) {
 		return false;
 	}
 
-	return wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' );
+	return wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in');
 }
 
 /**
@@ -354,12 +354,12 @@ 
  * @param bool         $public_only Optional. Whether to only return counts for public posts. Default false.
  * @return string Number of posts the user has written in this post type.
  */
-function count_user_posts( $userid, $post_type = 'post', $public_only = false ) {
+function count_user_posts($userid, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
-	$where = get_posts_by_author_sql( $post_type, true, $userid, $public_only );
+	$where = get_posts_by_author_sql($post_type, true, $userid, $public_only);
 
-	$count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
+	$count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts $where");
 
 	/**
 	 * Filters the number of posts a user has written.
@@ -373,7 +373,7 @@ 
 	 * @param string|array $post_type   Single post type or array of post types to count the number of posts for.
 	 * @param bool         $public_only Whether to limit counted posts to public posts.
 	 */
-	return apply_filters( 'get_usernumposts', $count, $userid, $post_type, $public_only );
+	return apply_filters('get_usernumposts', $count, $userid, $post_type, $public_only);
 }
 
 /**
@@ -388,24 +388,24 @@ 
  * @param bool         $public_only Optional. Only return counts for public posts.  Defaults to false.
  * @return array Amount of posts each user has written.
  */
-function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
+function count_many_users_posts($users, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
+	if (empty($users) || ! is_array($users))
 		return $count;
 
-	$userlist = implode( ',', array_map( 'absint', $users ) );
-	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
+	$userlist = implode(',', array_map('absint', $users));
+	$where = get_posts_by_author_sql($post_type, true, null, $public_only);
 
-	$result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
-	foreach ( $result as $row ) {
-		$count[ $row[0] ] = $row[1];
+	$result = $wpdb->get_results("SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N);
+	foreach ($result as $row) {
+		$count[$row[0]] = $row[1];
 	}
 
-	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+	foreach ($users as $id) {
+		if ( ! isset($count[$id]))
+			$count[$id] = 0;
 	}
 
 	return $count;
@@ -423,10 +423,10 @@ 
  * @return int The current user's ID, or 0 if no user is logged in.
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
+	if ( ! function_exists('wp_get_current_user'))
 		return 0;
 	$user = wp_get_current_user();
-	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
+	return (isset($user->ID) ? (int) $user->ID : 0);
 }
 
 /**
@@ -448,23 +448,23 @@ 
  * @param string $deprecated Use get_option() to check for an option in the options table.
  * @return mixed User option value on success, false on failure.
  */
-function get_user_option( $option, $user = 0, $deprecated = '' ) {
+function get_user_option($option, $user = 0, $deprecated = '') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
-	if ( empty( $user ) )
+	if (empty($user))
 		$user = get_current_user_id();
 
-	if ( ! $user = get_userdata( $user ) )
+	if ( ! $user = get_userdata($user))
 		return false;
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
-		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
-		$result = $user->get( $option );
+	if ($user->has_prop($prefix.$option)) // Blog specific
+		$result = $user->get($prefix.$option);
+	elseif ($user->has_prop($option)) // User specific and cross-blog
+		$result = $user->get($option);
 	else
 		$result = false;
 
@@ -479,7 +479,7 @@ 
 	 * @param string  $option Name of the option being retrieved.
 	 * @param WP_User $user   WP_User object of the user whose option is being retrieved.
 	 */
-	return apply_filters( "get_user_option_{$option}", $result, $option, $user );
+	return apply_filters("get_user_option_{$option}", $result, $option, $user);
 }
 
 /**
@@ -503,13 +503,13 @@ 
  * @return int|bool User meta ID if the option didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
+function update_user_option($user_id, $option_name, $newvalue, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
 
-	return update_user_meta( $user_id, $option_name, $newvalue );
+	return update_user_meta($user_id, $option_name, $newvalue);
 }
 
 /**
@@ -529,12 +529,12 @@ 
  *                            Default false (blog specific).
  * @return bool True on success, false on failure.
  */
-function delete_user_option( $user_id, $option_name, $global = false ) {
+function delete_user_option($user_id, $option_name, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
-	return delete_user_meta( $user_id, $option_name );
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
+	return delete_user_meta($user_id, $option_name);
 }
 
 /**
@@ -548,9 +548,9 @@ 
  *                    for more information on accepted arguments.
  * @return array List of users.
  */
-function get_users( $args = array() ) {
+function get_users($args = array()) {
 
-	$args = wp_parse_args( $args );
+	$args = wp_parse_args($args);
 	$args['count_total'] = false;
 
 	$user_search = new WP_User_Query($args);
@@ -572,13 +572,13 @@ 
  * @return array A list of the user's sites. An empty array if the user doesn't exist
  *               or belongs to no sites.
  */
-function get_blogs_of_user( $user_id, $all = false ) {
+function get_blogs_of_user($user_id, $all = false) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have sites
-	if ( empty( $user_id ) )
+	if (empty($user_id))
 		return array();
 
 	/**
@@ -594,47 +594,47 @@ 
 	 * @param bool       $all     Whether the returned array should contain all sites, including
 	 *                            those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	$sites = apply_filters( 'pre_get_blogs_of_user', null, $user_id, $all );
+	$sites = apply_filters('pre_get_blogs_of_user', null, $user_id, $all);
 
-	if ( null !== $sites ) {
+	if (null !== $sites) {
 		return $sites;
 	}
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
+	$keys = get_user_meta($user_id);
+	if (empty($keys))
 		return array();
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$site_id = get_current_blog_id();
-		$sites = array( $site_id => new stdClass );
-		$sites[ $site_id ]->userblog_id = $site_id;
-		$sites[ $site_id ]->blogname = get_option('blogname');
-		$sites[ $site_id ]->domain = '';
-		$sites[ $site_id ]->path = '';
-		$sites[ $site_id ]->site_id = 1;
-		$sites[ $site_id ]->siteurl = get_option('siteurl');
-		$sites[ $site_id ]->archived = 0;
-		$sites[ $site_id ]->spam = 0;
-		$sites[ $site_id ]->deleted = 0;
+		$sites = array($site_id => new stdClass);
+		$sites[$site_id]->userblog_id = $site_id;
+		$sites[$site_id]->blogname = get_option('blogname');
+		$sites[$site_id]->domain = '';
+		$sites[$site_id]->path = '';
+		$sites[$site_id]->site_id = 1;
+		$sites[$site_id]->siteurl = get_option('siteurl');
+		$sites[$site_id]->archived = 0;
+		$sites[$site_id]->spam = 0;
+		$sites[$site_id]->deleted = 0;
 		return $sites;
 	}
 
 	$site_ids = array();
 
-	if ( isset( $keys[ $wpdb->base_prefix . 'capabilities' ] ) && defined( 'MULTISITE' ) ) {
+	if (isset($keys[$wpdb->base_prefix.'capabilities']) && defined('MULTISITE')) {
 		$site_ids[] = 1;
-		unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
+		unset($keys[$wpdb->base_prefix.'capabilities']);
 	}
 
-	$keys = array_keys( $keys );
+	$keys = array_keys($keys);
 
-	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
+	foreach ($keys as $key) {
+		if ('capabilities' !== substr($key, -12))
 			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
+		if ($wpdb->base_prefix && 0 !== strpos($key, $wpdb->base_prefix))
 			continue;
-		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $site_id ) )
+		$site_id = str_replace(array($wpdb->base_prefix, '_capabilities'), '', $key);
+		if ( ! is_numeric($site_id))
 			continue;
 
 		$site_ids[] = (int) $site_id;
@@ -642,21 +642,21 @@ 
 
 	$sites = array();
 
-	if ( ! empty( $site_ids ) ) {
+	if ( ! empty($site_ids)) {
 		$args = array(
 			'number'   => '',
 			'site__in' => $site_ids,
 		);
-		if ( ! $all ) {
+		if ( ! $all) {
 			$args['archived'] = 0;
 			$args['spam']     = 0;
 			$args['deleted']  = 0;
 		}
 
-		$_sites = get_sites( $args );
+		$_sites = get_sites($args);
 
-		foreach ( $_sites as $site ) {
-			$sites[ $site->id ] = (object) array(
+		foreach ($_sites as $site) {
+			$sites[$site->id] = (object) array(
 				'userblog_id' => $site->id,
 				'blogname'    => $site->blogname,
 				'domain'      => $site->domain,
@@ -681,7 +681,7 @@ 
 	 * @param bool  $all     Whether the returned sites array should contain all sites, including
 	 *                       those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	return apply_filters( 'get_blogs_of_user', $sites, $user_id, $all );
+	return apply_filters('get_blogs_of_user', $sites, $user_id, $all);
 }
 
 /**
@@ -693,55 +693,55 @@ 
  * @param int $blog_id Optional. ID of the blog to check. Defaults to the current site.
  * @return bool
  */
-function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
+function is_user_member_of_blog($user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 	$blog_id = (int) $blog_id;
 
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
 	// Technically not needed, but does save calls to get_site and get_user_meta
 	// in the event that the function is called when a user isn't logged in
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		return false;
 	} else {
-		$user = get_userdata( $user_id );
-		if ( ! $user instanceof WP_User ) {
+		$user = get_userdata($user_id);
+		if ( ! $user instanceof WP_User) {
 			return false;
 		}
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
-	if ( empty( $blog_id ) ) {
+	if (empty($blog_id)) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$blog = get_site( $blog_id );
+	$blog = get_site($blog_id);
 
-	if ( ! $blog || ! isset( $blog->domain ) || $blog->archived || $blog->spam || $blog->deleted ) {
+	if ( ! $blog || ! isset($blog->domain) || $blog->archived || $blog->spam || $blog->deleted) {
 		return false;
 	}
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) ) {
+	$keys = get_user_meta($user_id);
+	if (empty($keys)) {
 		return false;
 	}
 
 	// no underscore before capabilities in $base_capabilities_key
-	$base_capabilities_key = $wpdb->base_prefix . 'capabilities';
-	$site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
+	$base_capabilities_key = $wpdb->base_prefix.'capabilities';
+	$site_capabilities_key = $wpdb->base_prefix.$blog_id.'_capabilities';
 
-	if ( isset( $keys[ $base_capabilities_key ] ) && $blog_id == 1 ) {
+	if (isset($keys[$base_capabilities_key]) && $blog_id == 1) {
 		return true;
 	}
 
-	if ( isset( $keys[ $site_capabilities_key ] ) ) {
+	if (isset($keys[$site_capabilities_key])) {
 		return true;
 	}
 
@@ -845,24 +845,24 @@ 
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$result = array();
 
-	if ( 'time' == $strategy ) {
+	if ('time' == $strategy) {
 		$avail_roles = wp_roles()->get_names();
 
 		// Build a CPU-intensive query that will return concise information.
 		$select_count = array();
-		foreach ( $avail_roles as $this_role => $name ) {
-			$select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%');
+		foreach ($avail_roles as $this_role => $name) {
+			$select_count[] = $wpdb->prepare("COUNT(NULLIF(`meta_value` LIKE %s, false))", '%'.$wpdb->esc_like('"'.$this_role.'"').'%');
 		}
 		$select_count[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))";
 		$select_count = implode(', ', $select_count);
 
 		// Add the meta_value index to the selection list, then run the query.
-		$row = $wpdb->get_row( "SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N );
+		$row = $wpdb->get_row("SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N);
 
 		// Run the previous loop again to associate results with role names.
 		$col = 0;
 		$role_counts = array();
-		foreach ( $avail_roles as $this_role => $name ) {
+		foreach ($avail_roles as $this_role => $name) {
 			$count = (int) $row[$col++];
 			if ($count > 0) {
 				$role_counts[$this_role] = $count;
@@ -875,23 +875,23 @@ 
 		$total_users = (int) $row[$col];
 
 		$result['total_users'] = $total_users;
-		$result['avail_roles'] =& $role_counts;
+		$result['avail_roles'] = & $role_counts;
 	} else {
 		$avail_roles = array(
 			'none' => 0,
 		);
 
-		$users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
+		$users_of_blog = $wpdb->get_col("SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'");
 
-		foreach ( $users_of_blog as $caps_meta ) {
+		foreach ($users_of_blog as $caps_meta) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
+			if ( ! is_array($b_roles))
 				continue;
-			if ( empty( $b_roles ) ) {
+			if (empty($b_roles)) {
 				$avail_roles['none']++;
 			}
-			foreach ( $b_roles as $b_role => $val ) {
-				if ( isset($avail_roles[$b_role]) ) {
+			foreach ($b_roles as $b_role => $val) {
+				if (isset($avail_roles[$b_role])) {
 					$avail_roles[$b_role]++;
 				} else {
 					$avail_roles[$b_role] = 1;
@@ -899,11 +899,11 @@ 
 			}
 		}
 
-		$result['total_users'] = count( $users_of_blog );
-		$result['avail_roles'] =& $avail_roles;
+		$result['total_users'] = count($users_of_blog);
+		$result['avail_roles'] = & $avail_roles;
 	}
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$result['avail_roles']['none'] = 0;
 	}
 
@@ -934,11 +934,11 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
+	if ('' == $for_user_id)
 		$for_user_id = get_current_user_id();
-	$user = get_userdata( $for_user_id );
+	$user = get_userdata($for_user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		$user_ID = 0;
 		$user_level = 0;
 		$userdata = null;
@@ -1018,7 +1018,7 @@ 
  * }
  * @return string String of HTML content.
  */
-function wp_dropdown_users( $args = '' ) {
+function wp_dropdown_users($args = '') {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
 		'orderby' => 'display_name', 'order' => 'ASC',
@@ -1032,16 +1032,16 @@ 
 		'role__not_in' => array(),
 	);
 
-	$defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
+	$defaults['selected'] = is_author() ? get_query_var('author') : 0;
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in' ) );
+	$query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in'));
 
-	$fields = array( 'ID', 'user_login' );
+	$fields = array('ID', 'user_login');
 
-	$show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
-	if ( 'display_name_with_login' === $show ) {
+	$show = ! empty($r['show']) ? $r['show'] : 'display_name';
+	if ('display_name_with_login' === $show) {
 		$fields[] = 'display_name';
 	} else {
 		$fields[] = $show;
@@ -1061,56 +1061,56 @@ 
 	 * @param array $query_args The query arguments for get_users().
 	 * @param array $r          The arguments passed to wp_dropdown_users() combined with the defaults.
 	 */
-	$query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $r );
+	$query_args = apply_filters('wp_dropdown_users_args', $query_args, $r);
 
-	$users = get_users( $query_args );
+	$users = get_users($query_args);
 
 	$output = '';
-	if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-		$name = esc_attr( $r['name'] );
-		if ( $r['multi'] && ! $r['id'] ) {
+	if ( ! empty($users) && (empty($r['hide_if_only_one_author']) || count($users) > 1)) {
+		$name = esc_attr($r['name']);
+		if ($r['multi'] && ! $r['id']) {
 			$id = '';
 		} else {
-			$id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
+			$id = $r['id'] ? " id='".esc_attr($r['id'])."'" : " id='$name'";
 		}
-		$output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
+		$output = "<select name='{$name}'{$id} class='".$r['class']."'>\n";
 
-		if ( $show_option_all ) {
+		if ($show_option_all) {
 			$output .= "\t<option value='0'>$show_option_all</option>\n";
 		}
 
-		if ( $show_option_none ) {
-			$_selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+		if ($show_option_none) {
+			$_selected = selected($option_none_value, $r['selected'], false);
+			$output .= "\t<option value='".esc_attr($option_none_value)."'$_selected>$show_option_none</option>\n";
 		}
 
-		if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
+		if ($r['include_selected'] && ($r['selected'] > 0)) {
 			$found_selected = false;
 			$r['selected'] = (int) $r['selected'];
-			foreach ( (array) $users as $user ) {
+			foreach ((array) $users as $user) {
 				$user->ID = (int) $user->ID;
-				if ( $user->ID === $r['selected'] ) {
+				if ($user->ID === $r['selected']) {
 					$found_selected = true;
 				}
 			}
 
-			if ( ! $found_selected ) {
-				$users[] = get_userdata( $r['selected'] );
+			if ( ! $found_selected) {
+				$users[] = get_userdata($r['selected']);
 			}
 		}
 
-		foreach ( (array) $users as $user ) {
-			if ( 'display_name_with_login' === $show ) {
+		foreach ((array) $users as $user) {
+			if ('display_name_with_login' === $show) {
 				/* translators: 1: display name, 2: user_login */
-				$display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login );
-			} elseif ( ! empty( $user->$show ) ) {
+				$display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_login);
+			} elseif ( ! empty($user->$show)) {
 				$display = $user->$show;
 			} else {
-				$display = '(' . $user->user_login . ')';
+				$display = '('.$user->user_login.')';
 			}
 
-			$_selected = selected( $user->ID, $r['selected'], false );
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+			$_selected = selected($user->ID, $r['selected'], false);
+			$output .= "\t<option value='$user->ID'$_selected>".esc_html($display)."</option>\n";
 		}
 
 		$output .= "</select>";
@@ -1123,9 +1123,9 @@ 
 	 *
 	 * @param string $output HTML output generated by wp_dropdown_users().
 	 */
-	$html = apply_filters( 'wp_dropdown_users', $output );
+	$html = apply_filters('wp_dropdown_users', $output);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1149,22 +1149,22 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( !is_string($value) && !is_numeric($value) )
+	if ( ! is_string($value) && ! is_numeric($value))
 		return $value;
 
-	$prefixed = false !== strpos( $field, 'user_' );
+	$prefixed = false !== strpos($field, 'user_');
 
-	if ( 'edit' == $context ) {
-		if ( $prefixed ) {
+	if ('edit' == $context) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "edit_{$field}", $value, $user_id );
+			$value = apply_filters("edit_{$field}", $value, $user_id);
 		} else {
 
 			/**
@@ -1178,17 +1178,17 @@ 
 			 * @param mixed $value   Value of the prefixed user field.
 			 * @param int   $user_id User ID.
 			 */
-			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
+			$value = apply_filters("edit_user_{$field}", $value, $user_id);
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
+		if ('description' == $field)
+			$value = esc_html($value); // textarea_escaped?
 		else
 			$value = esc_attr($value);
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 		} else {
 
 			/**
@@ -1201,14 +1201,14 @@ 
 			 *
 			 * @param mixed $value Value of the prefixed user field.
 			 */
-			$value = apply_filters( "pre_user_{$field}", $value );
+			$value = apply_filters("pre_user_{$field}", $value);
 		}
 	} else {
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "{$field}", $value, $user_id, $context );
+			$value = apply_filters("{$field}", $value, $user_id, $context);
 		} else {
 
 			/**
@@ -1223,17 +1223,17 @@ 
 			 * @param int    $user_id User ID.
 			 * @param string $context The context to filter within.
 			 */
-			$value = apply_filters( "user_{$field}", $value, $user_id, $context );
+			$value = apply_filters("user_{$field}", $value, $user_id, $context);
 		}
 	}
 
-	if ( 'user_url' == $field )
+	if ('user_url' == $field)
 		$value = esc_url($value);
 
-	if ( 'attribute' == $context ) {
-		$value = esc_attr( $value );
-	} elseif ( 'js' == $context ) {
-		$value = esc_js( $value );
+	if ('attribute' == $context) {
+		$value = esc_attr($value);
+	} elseif ('js' == $context) {
+		$value = esc_js($value);
 	}
 	return $value;
 }
@@ -1246,9 +1246,9 @@ 
  * @param object|WP_User $user User object to be cached
  * @return bool|null Returns false on failure.
  */
-function update_user_caches( $user ) {
-	if ( $user instanceof WP_User ) {
-		if ( ! $user->exists() ) {
+function update_user_caches($user) {
+	if ($user instanceof WP_User) {
+		if ( ! $user->exists()) {
 			return false;
 		}
 
@@ -1269,17 +1269,17 @@ 
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
-function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+function clean_user_cache($user) {
+	if (is_numeric($user))
+		$user = new WP_User($user);
 
-	if ( ! $user->exists() )
+	if ( ! $user->exists())
 		return;
 
-	wp_cache_delete( $user->ID, 'users' );
-	wp_cache_delete( $user->user_login, 'userlogins' );
-	wp_cache_delete( $user->user_email, 'useremail' );
-	wp_cache_delete( $user->user_nicename, 'userslugs' );
+	wp_cache_delete($user->ID, 'users');
+	wp_cache_delete($user->user_login, 'userlogins');
+	wp_cache_delete($user->user_email, 'useremail');
+	wp_cache_delete($user->user_nicename, 'userslugs');
 
 	/**
 	 * Fires immediately after the given user's cache is cleaned.
@@ -1289,7 +1289,7 @@ 
 	 * @param int     $user_id User ID.
 	 * @param WP_User $user    User object.
 	 */
-	do_action( 'clean_user_cache', $user->ID, $user );
+	do_action('clean_user_cache', $user->ID, $user);
 }
 
 /**
@@ -1300,8 +1300,8 @@ 
  * @param string $username Username.
  * @return int|false The user's ID on success, and false on failure.
  */
-function username_exists( $username ) {
-	if ( $user = get_user_by( 'login', $username ) ) {
+function username_exists($username) {
+	if ($user = get_user_by('login', $username)) {
 		return $user->ID;
 	}
 	return false;
@@ -1315,8 +1315,8 @@ 
  * @param string $email Email.
  * @return int|false The user's ID on success, and false on failure.
  */
-function email_exists( $email ) {
-	if ( $user = get_user_by( 'email', $email) ) {
+function email_exists($email) {
+	if ($user = get_user_by('email', $email)) {
 		return $user->ID;
 	}
 	return false;
@@ -1331,9 +1331,9 @@ 
  * @param string $username Username.
  * @return bool Whether username given is valid
  */
-function validate_username( $username ) {
-	$sanitized = sanitize_user( $username, true );
-	$valid = ( $sanitized == $username && ! empty( $sanitized ) );
+function validate_username($username) {
+	$sanitized = sanitize_user($username, true);
+	$valid = ($sanitized == $username && ! empty($sanitized));
 
 	/**
 	 * Filters whether the provided username is valid or not.
@@ -1343,7 +1343,7 @@ 
 	 * @param bool   $valid    Whether given username is valid.
 	 * @param string $username Username to check.
 	 */
-	return apply_filters( 'validate_username', $valid, $username );
+	return apply_filters('validate_username', $valid, $username);
 }
 
 /**
@@ -1398,34 +1398,34 @@ 
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_insert_user( $userdata ) {
+function wp_insert_user($userdata) {
 	global $wpdb;
 
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 
 	// Are we updating or creating?
-	if ( ! empty( $userdata['ID'] ) ) {
+	if ( ! empty($userdata['ID'])) {
 		$ID = (int) $userdata['ID'];
 		$update = true;
-		$old_user_data = get_userdata( $ID );
+		$old_user_data = get_userdata($ID);
 
-		if ( ! $old_user_data ) {
-			return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+		if ( ! $old_user_data) {
+			return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 		}
 
 		// hashed in wp_update_user(), plaintext if called directly
-		$user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass;
+		$user_pass = ! empty($userdata['user_pass']) ? $userdata['user_pass'] : $old_user_data->user_pass;
 	} else {
 		$update = false;
 		// Hash the password
-		$user_pass = wp_hash_password( $userdata['user_pass'] );
+		$user_pass = wp_hash_password($userdata['user_pass']);
 	}
 
-	$sanitized_user_login = sanitize_user( $userdata['user_login'], true );
+	$sanitized_user_login = sanitize_user($userdata['user_login'], true);
 
 	/**
 	 * Filters a username after it has been sanitized.
@@ -1436,20 +1436,20 @@ 
 	 *
 	 * @param string $sanitized_user_login Username after it has been sanitized.
 	 */
-	$pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login );
+	$pre_user_login = apply_filters('pre_user_login', $sanitized_user_login);
 
 	//Remove any non-printable chars from the login string to see if we have ended up with an empty username
-	$user_login = trim( $pre_user_login );
+	$user_login = trim($pre_user_login);
 
 	// user_login must be between 0 and 60 characters.
-	if ( empty( $user_login ) ) {
-		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
-	} elseif ( mb_strlen( $user_login ) > 60 ) {
-		return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) );
+	if (empty($user_login)) {
+		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.'));
+	} elseif (mb_strlen($user_login) > 60) {
+		return new WP_Error('user_login_too_long', __('Username may not be longer than 60 characters.'));
 	}
 
-	if ( ! $update && username_exists( $user_login ) ) {
-		return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
+	if ( ! $update && username_exists($user_login)) {
+		return new WP_Error('existing_user_login', __('Sorry, that username already exists!'));
 	}
 
 	/**
@@ -1459,26 +1459,26 @@ 
 	 *
 	 * @param array $usernames Array of blacklisted usernames.
 	 */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		return new WP_Error( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_login), array_map('strtolower', $illegal_logins))) {
+		return new WP_Error('invalid_username', __('Sorry, that username is not allowed.'));
 	}
 
 	/*
 	 * If a nicename is provided, remove unsafe user characters before using it.
 	 * Otherwise build a nicename from the user_login.
 	 */
-	if ( ! empty( $userdata['user_nicename'] ) ) {
-		$user_nicename = sanitize_user( $userdata['user_nicename'], true );
-		if ( mb_strlen( $user_nicename ) > 50 ) {
-			return new WP_Error( 'user_nicename_too_long', __( 'Nicename may not be longer than 50 characters.' ) );
+	if ( ! empty($userdata['user_nicename'])) {
+		$user_nicename = sanitize_user($userdata['user_nicename'], true);
+		if (mb_strlen($user_nicename) > 50) {
+			return new WP_Error('user_nicename_too_long', __('Nicename may not be longer than 50 characters.'));
 		}
 	} else {
-		$user_nicename = mb_substr( $user_login, 0, 50 );
+		$user_nicename = mb_substr($user_login, 0, 50);
 	}
 
-	$user_nicename = sanitize_title( $user_nicename );
+	$user_nicename = sanitize_title($user_nicename);
 
 	// Store values to save in user meta.
 	$meta = array();
@@ -1490,9 +1490,9 @@ 
 	 *
 	 * @param string $user_nicename The user's nicename.
 	 */
-	$user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );
+	$user_nicename = apply_filters('pre_user_nicename', $user_nicename);
 
-	$raw_user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url'];
+	$raw_user_url = empty($userdata['user_url']) ? '' : $userdata['user_url'];
 
 	/**
 	 * Filters a user's URL before the user is created or updated.
@@ -1501,9 +1501,9 @@ 
 	 *
 	 * @param string $raw_user_url The user's URL.
 	 */
-	$user_url = apply_filters( 'pre_user_url', $raw_user_url );
+	$user_url = apply_filters('pre_user_url', $raw_user_url);
 
-	$raw_user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email'];
+	$raw_user_email = empty($userdata['user_email']) ? '' : $userdata['user_email'];
 
 	/**
 	 * Filters a user's email before the user is created or updated.
@@ -1512,20 +1512,20 @@ 
 	 *
 	 * @param string $raw_user_email The user's email.
 	 */
-	$user_email = apply_filters( 'pre_user_email', $raw_user_email );
+	$user_email = apply_filters('pre_user_email', $raw_user_email);
 
 	/*
 	 * If there is no update, just check for `email_exists`. If there is an update,
 	 * check if current email and new email are the same, or not, and check `email_exists`
 	 * accordingly.
 	 */
-	if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )
-		&& ! defined( 'WP_IMPORTING' )
-		&& email_exists( $user_email )
+	if (( ! $update || ( ! empty($old_user_data) && 0 !== strcasecmp($user_email, $old_user_data->user_email)))
+		&& ! defined('WP_IMPORTING')
+		&& email_exists($user_email)
 	) {
-		return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
+		return new WP_Error('existing_user_email', __('Sorry, that email address is already used!'));
 	}
-	$nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
+	$nickname = empty($userdata['nickname']) ? $user_login : $userdata['nickname'];
 
 	/**
 	 * Filters a user's nickname before the user is created or updated.
@@ -1534,9 +1534,9 @@ 
 	 *
 	 * @param string $nickname The user's nickname.
 	 */
-	$meta['nickname'] = apply_filters( 'pre_user_nickname', $nickname );
+	$meta['nickname'] = apply_filters('pre_user_nickname', $nickname);
 
-	$first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name'];
+	$first_name = empty($userdata['first_name']) ? '' : $userdata['first_name'];
 
 	/**
 	 * Filters a user's first name before the user is created or updated.
@@ -1545,9 +1545,9 @@ 
 	 *
 	 * @param string $first_name The user's first name.
 	 */
-	$meta['first_name'] = apply_filters( 'pre_user_first_name', $first_name );
+	$meta['first_name'] = apply_filters('pre_user_first_name', $first_name);
 
-	$last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name'];
+	$last_name = empty($userdata['last_name']) ? '' : $userdata['last_name'];
 
 	/**
 	 * Filters a user's last name before the user is created or updated.
@@ -1556,17 +1556,17 @@ 
 	 *
 	 * @param string $last_name The user's last name.
 	 */
-	$meta['last_name'] = apply_filters( 'pre_user_last_name', $last_name );
+	$meta['last_name'] = apply_filters('pre_user_last_name', $last_name);
 
-	if ( empty( $userdata['display_name'] ) ) {
-		if ( $update ) {
+	if (empty($userdata['display_name'])) {
+		if ($update) {
 			$display_name = $user_login;
-		} elseif ( $meta['first_name'] && $meta['last_name'] ) {
+		} elseif ($meta['first_name'] && $meta['last_name']) {
 			/* translators: 1: first name, 2: last name */
-			$display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] );
-		} elseif ( $meta['first_name'] ) {
+			$display_name = sprintf(_x('%1$s %2$s', 'Display name based on first name and last name'), $meta['first_name'], $meta['last_name']);
+		} elseif ($meta['first_name']) {
 			$display_name = $meta['first_name'];
-		} elseif ( $meta['last_name'] ) {
+		} elseif ($meta['last_name']) {
 			$display_name = $meta['last_name'];
 		} else {
 			$display_name = $user_login;
@@ -1582,9 +1582,9 @@ 
 	 *
 	 * @param string $display_name The user's display name.
 	 */
-	$display_name = apply_filters( 'pre_user_display_name', $display_name );
+	$display_name = apply_filters('pre_user_display_name', $display_name);
 
-	$description = empty( $userdata['description'] ) ? '' : $userdata['description'];
+	$description = empty($userdata['description']) ? '' : $userdata['description'];
 
 	/**
 	 * Filters a user's description before the user is created or updated.
@@ -1593,52 +1593,52 @@ 
 	 *
 	 * @param string $description The user's description.
 	 */
-	$meta['description'] = apply_filters( 'pre_user_description', $description );
+	$meta['description'] = apply_filters('pre_user_description', $description);
 
-	$meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
+	$meta['rich_editing'] = empty($userdata['rich_editing']) ? 'true' : $userdata['rich_editing'];
 
-	$meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
+	$meta['comment_shortcuts'] = empty($userdata['comment_shortcuts']) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
-	$admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
-	$meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
+	$admin_color = empty($userdata['admin_color']) ? 'fresh' : $userdata['admin_color'];
+	$meta['admin_color'] = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
 
-	$meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
+	$meta['use_ssl'] = empty($userdata['use_ssl']) ? 0 : $userdata['use_ssl'];
 
-	$user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
+	$user_registered = empty($userdata['user_registered']) ? gmdate('Y-m-d H:i:s') : $userdata['user_registered'];
 
-	$meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
+	$meta['show_admin_bar_front'] = empty($userdata['show_admin_bar_front']) ? 'true' : $userdata['show_admin_bar_front'];
 
-	$meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
+	$meta['locale'] = isset($userdata['locale']) ? $userdata['locale'] : '';
 
-	$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
+	$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $user_nicename, $user_login));
 
-	if ( $user_nicename_check ) {
+	if ($user_nicename_check) {
 		$suffix = 2;
 		while ($user_nicename_check) {
 			// user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.
-			$base_length = 49 - mb_strlen( $suffix );
-			$alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
-			$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+			$base_length = 49 - mb_strlen($suffix);
+			$alt_user_nicename = mb_substr($user_nicename, 0, $base_length)."-$suffix";
+			$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $alt_user_nicename, $user_login));
 			$suffix++;
 		}
 		$user_nicename = $alt_user_nicename;
 	}
 
-	$compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
-	$data = wp_unslash( $compacted );
+	$compacted = compact('user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered');
+	$data = wp_unslash($compacted);
 
-	if ( $update ) {
-		if ( $user_email !== $old_user_data->user_email ) {
+	if ($update) {
+		if ($user_email !== $old_user_data->user_email) {
 			$data['user_activation_key'] = '';
 		}
-		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
+		$wpdb->update($wpdb->users, $data, compact('ID'));
 		$user_id = (int) $ID;
 	} else {
-		$wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
+		$wpdb->insert($wpdb->users, $data + compact('user_login'));
 		$user_id = (int) $wpdb->insert_id;
 	}
 
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 
 	/**
  	 * Filters a user's meta values and keys before the user is created or updated.
@@ -1665,28 +1665,28 @@ 
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
  	 */
-	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
+	$meta = apply_filters('insert_user_meta', $meta, $user, $update);
 
 	// Update user meta.
-	foreach ( $meta as $key => $value ) {
-		update_user_meta( $user_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		update_user_meta($user_id, $key, $value);
 	}
 
-	foreach ( wp_get_user_contact_methods( $user ) as $key => $value ) {
-		if ( isset( $userdata[ $key ] ) ) {
-			update_user_meta( $user_id, $key, $userdata[ $key ] );
+	foreach (wp_get_user_contact_methods($user) as $key => $value) {
+		if (isset($userdata[$key])) {
+			update_user_meta($user_id, $key, $userdata[$key]);
 		}
 	}
 
-	if ( isset( $userdata['role'] ) ) {
-		$user->set_role( $userdata['role'] );
-	} elseif ( ! $update ) {
+	if (isset($userdata['role'])) {
+		$user->set_role($userdata['role']);
+	} elseif ( ! $update) {
 		$user->set_role(get_option('default_role'));
 	}
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $user_login, 'userlogins' );
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($user_login, 'userlogins');
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately after an existing user is updated.
 		 *
@@ -1695,7 +1695,7 @@ 
 		 * @param int    $user_id       User ID.
 		 * @param object $old_user_data Object containing user's data prior to update.
 		 */
-		do_action( 'profile_update', $user_id, $old_user_data );
+		do_action('profile_update', $user_id, $old_user_data);
 	} else {
 		/**
 		 * Fires immediately after a new user is registered.
@@ -1704,7 +1704,7 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'user_register', $user_id );
+		do_action('user_register', $user_id);
 	}
 
 	return $user_id;
@@ -1727,37 +1727,37 @@ 
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
 function wp_update_user($userdata) {
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 
-	$ID = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
-	if ( ! $ID ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$ID = isset($userdata['ID']) ? (int) $userdata['ID'] : 0;
+	if ( ! $ID) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	// First, get all of the original fields
-	$user_obj = get_userdata( $ID );
-	if ( ! $user_obj ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$user_obj = get_userdata($ID);
+	if ( ! $user_obj) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	$user = $user_obj->to_array();
 
 	// Add additional custom fields
-	foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
-		$user[ $key ] = get_user_meta( $ID, $key, true );
+	foreach (_get_additional_user_keys($user_obj) as $key) {
+		$user[$key] = get_user_meta($ID, $key, true);
 	}
 
 	// Escape data pulled from DB.
-	$user = add_magic_quotes( $user );
+	$user = add_magic_quotes($user);
 
-	if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
+	if ( ! empty($userdata['user_pass']) && $userdata['user_pass'] !== $user_obj->user_pass) {
 		// If password is changing, hash it now
 		$plaintext_pass = $userdata['user_pass'];
-		$userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );
+		$userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
 
 		/**
 		 * Filters whether to send the password change email.
@@ -1771,10 +1771,10 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+		$send_password_change_email = apply_filters('send_password_change_email', true, $user, $userdata);
 	}
 
-	if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
+	if (isset($userdata['user_email']) && $user['user_email'] !== $userdata['user_email']) {
 		/**
 		 * Filters whether to send the email change email.
 		 *
@@ -1787,28 +1787,28 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+		$send_email_change_email = apply_filters('send_email_change_email', true, $user, $userdata);
 	}
 
-	wp_cache_delete( $user['user_email'], 'useremail' );
-	wp_cache_delete( $user['user_nicename'], 'userslugs' );
+	wp_cache_delete($user['user_email'], 'useremail');
+	wp_cache_delete($user['user_nicename'], 'userslugs');
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$userdata = array_merge( $user, $userdata );
-	$user_id = wp_insert_user( $userdata );
+	$userdata = array_merge($user, $userdata);
+	$user_id = wp_insert_user($userdata);
 
-	if ( ! is_wp_error( $user_id ) ) {
+	if ( ! is_wp_error($user_id)) {
 
-		$blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		$blog_name = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
 		$switched_locale = false;
-		if ( ! empty( $send_password_change_email ) || ! empty( $send_email_change_email ) ) {
-			$switched_locale = switch_to_locale( get_user_locale( $user_id ) );
+		if ( ! empty($send_password_change_email) || ! empty($send_email_change_email)) {
+			$switched_locale = switch_to_locale(get_user_locale($user_id));
 		}
 
-		if ( ! empty( $send_password_change_email ) ) {
+		if ( ! empty($send_password_change_email)) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$pass_change_text = __( 'Hi ###USERNAME###,
+			$pass_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your password was changed on ###SITENAME###.
 
@@ -1824,7 +1824,7 @@ 
 			$pass_change_email = array(
 				'to'      => $user['user_email'],
 				/* translators: User password change notification email subject. 1: Site name */
-				'subject' => __( '[%s] Notice of Password Change' ),
+				'subject' => __('[%s] Notice of Password Change'),
 				'message' => $pass_change_text,
 				'headers' => '',
 			);
@@ -1851,20 +1851,20 @@ 
 			 * @param array $userdata The updated user array.
 			 *
 			 */
-			$pass_change_email = apply_filters( 'password_change_email', $pass_change_email, $user, $userdata );
+			$pass_change_email = apply_filters('password_change_email', $pass_change_email, $user, $userdata);
 
-			$pass_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $pass_change_email['message'] );
+			$pass_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITENAME###', $blog_name, $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITEURL###', home_url(), $pass_change_email['message']);
 
-			wp_mail( $pass_change_email['to'], sprintf( $pass_change_email['subject'], $blog_name ), $pass_change_email['message'], $pass_change_email['headers'] );
+			wp_mail($pass_change_email['to'], sprintf($pass_change_email['subject'], $blog_name), $pass_change_email['message'], $pass_change_email['headers']);
 		}
 
-		if ( ! empty( $send_email_change_email ) ) {
+		if ( ! empty($send_email_change_email)) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$email_change_text = __( 'Hi ###USERNAME###,
+			$email_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your email was changed on ###SITENAME###.
 
@@ -1880,7 +1880,7 @@ 
 			$email_change_email = array(
 				'to'      => $user['user_email'],
 				/* translators: User email change notification email subject. 1: Site name */
-				'subject' => __( '[%s] Notice of Email Change' ),
+				'subject' => __('[%s] Notice of Email Change'),
 				'message' => $email_change_text,
 				'headers' => '',
 			);
@@ -1906,36 +1906,36 @@ 
 			 * @param array $user The original user array.
 			 * @param array $userdata The updated user array.
 			 */
-			$email_change_email = apply_filters( 'email_change_email', $email_change_email, $user, $userdata );
+			$email_change_email = apply_filters('email_change_email', $email_change_email, $user, $userdata);
 
-			$email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
+			$email_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITENAME###', $blog_name, $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITEURL###', home_url(), $email_change_email['message']);
 
-			wp_mail( $email_change_email['to'], sprintf( $email_change_email['subject'], $blog_name ), $email_change_email['message'], $email_change_email['headers'] );
+			wp_mail($email_change_email['to'], sprintf($email_change_email['subject'], $blog_name), $email_change_email['message'], $email_change_email['headers']);
 		}
 
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 	}
 
 	// Update the cookies if the password changed.
 	$current_user = wp_get_current_user();
-	if ( $current_user->ID == $ID ) {
-		if ( isset($plaintext_pass) ) {
+	if ($current_user->ID == $ID) {
+		if (isset($plaintext_pass)) {
 			wp_clear_auth_cookie();
 
 			// Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
 			// If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
-			$logged_in_cookie    = wp_parse_auth_cookie( '', 'logged_in' );
+			$logged_in_cookie    = wp_parse_auth_cookie('', 'logged_in');
 			/** This filter is documented in wp-includes/pluggable.php */
-			$default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false );
-			$remember            = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life );
+			$default_cookie_life = apply_filters('auth_cookie_expiration', (2 * DAY_IN_SECONDS), $ID, false);
+			$remember            = (($logged_in_cookie['expiration'] - time()) > $default_cookie_life);
 
-			wp_set_auth_cookie( $ID, $remember );
+			wp_set_auth_cookie($ID, $remember);
 		}
 	}
 
@@ -1958,8 +1958,8 @@ 
  *                      be created.
  */
 function wp_create_user($username, $password, $email = '') {
-	$user_login = wp_slash( $username );
-	$user_email = wp_slash( $email    );
+	$user_login = wp_slash($username);
+	$user_email = wp_slash($email);
 	$user_pass = $password;
 
 	$userdata = compact('user_login', 'user_email', 'user_pass');
@@ -1978,9 +1978,9 @@ 
  * @param WP_User $user WP_User instance.
  * @return array List of user keys to be populated in wp_update_user().
  */
-function _get_additional_user_keys( $user ) {
-	$keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front', 'locale' );
-	return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
+function _get_additional_user_keys($user) {
+	$keys = array('first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front', 'locale');
+	return array_merge($keys, array_keys(wp_get_user_contact_methods($user)));
 }
 
 /**
@@ -1993,13 +1993,13 @@ 
  * @param WP_User $user Optional. WP_User object.
  * @return array Array of contact methods and their labels.
  */
-function wp_get_user_contact_methods( $user = null ) {
+function wp_get_user_contact_methods($user = null) {
 	$methods = array();
-	if ( get_site_option( 'initial_db_version' ) < 23588 ) {
+	if (get_site_option('initial_db_version') < 23588) {
 		$methods = array(
-			'aim'    => __( 'AIM' ),
-			'yim'    => __( 'Yahoo IM' ),
-			'jabber' => __( 'Jabber / Google Talk' )
+			'aim'    => __('AIM'),
+			'yim'    => __('Yahoo IM'),
+			'jabber' => __('Jabber / Google Talk')
 		);
 	}
 
@@ -2011,7 +2011,7 @@ 
 	 * @param array   $methods Array of contact methods and their labels.
  	 * @param WP_User $user    WP_User object.
 	 */
-	return apply_filters( 'user_contactmethods', $methods, $user );
+	return apply_filters('user_contactmethods', $methods, $user);
 }
 
 /**
@@ -2025,8 +2025,8 @@ 
  * @param WP_User $user Optional. WP_User object. Default null.
  * @return array Array of contact methods and their labels.
  */
-function _wp_get_user_contactmethods( $user = null ) {
-	return wp_get_user_contact_methods( $user );
+function _wp_get_user_contactmethods($user = null) {
+	return wp_get_user_contact_methods($user);
 }
 
 /**
@@ -2037,7 +2037,7 @@ 
  * @return string The password hint text.
  */
 function wp_get_password_hint() {
-	$hint = __( 'Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' );
+	$hint = __('Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).');
 
 	/**
 	 * Filters the text describing the site's password complexity policy.
@@ -2046,7 +2046,7 @@ 
 	 *
 	 * @param string $hint The password hint text.
 	 */
-	return apply_filters( 'password_hint', $hint );
+	return apply_filters('password_hint', $hint);
 }
 
 /**
@@ -2061,7 +2061,7 @@ 
  *
  * @return string|WP_Error Password reset key on success. WP_Error on error.
  */
-function get_password_reset_key( $user ) {
+function get_password_reset_key($user) {
 	global $wpdb, $wp_hasher;
 
 	/**
@@ -2074,7 +2074,7 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retreive_password', $user->user_login );
+	do_action('retreive_password', $user->user_login);
 
 	/**
 	 * Fires before a new password is retrieved.
@@ -2083,10 +2083,10 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retrieve_password', $user->user_login );
+	do_action('retrieve_password', $user->user_login);
 
 	$allow = true;
-	if ( is_multisite() && is_user_spammy( $user ) ) {
+	if (is_multisite() && is_user_spammy($user)) {
 		$allow = false;
 	}
 
@@ -2098,16 +2098,16 @@ 
 	 * @param bool $allow         Whether to allow the password to be reset. Default true.
 	 * @param int  $user_data->ID The ID of the user attempting to reset a password.
 	 */
-	$allow = apply_filters( 'allow_password_reset', $allow, $user->ID );
+	$allow = apply_filters('allow_password_reset', $allow, $user->ID);
 
-	if ( ! $allow ) {
-		return new WP_Error( 'no_password_reset', __( 'Password reset is not allowed for this user' ) );
-	} elseif ( is_wp_error( $allow ) ) {
+	if ( ! $allow) {
+		return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
+	} elseif (is_wp_error($allow)) {
 		return $allow;
 	}
 
 	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
+	$key = wp_generate_password(20, false);
 
 	/**
 	 * Fires when a password reset key is generated.
@@ -2117,16 +2117,16 @@ 
 	 * @param string $user_login The username for the user.
 	 * @param string $key        The generated password reset key.
 	 */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
+	do_action('retrieve_password_key', $user->user_login, $key);
 
 	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		$wp_hasher = new PasswordHash(8, true);
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
-	if ( false === $key_saved ) {
-		return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
+	$hashed = time().':'.$wp_hasher->HashPassword($key);
+	$key_saved = $wpdb->update($wpdb->users, array('user_activation_key' => $hashed), array('user_login' => $user->user_login));
+	if (false === $key_saved) {
+		return new WP_Error('no_password_key_update', __('Could not save password reset key to database.'));
 	}
 
 	return $key;
@@ -2154,18 +2154,18 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
+	if (empty($key) || ! is_string($key))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty($login) || !is_string($login) )
+	if (empty($login) || ! is_string($login))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login));
+	if ( ! $row)
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty( $wp_hasher ) ) {
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		$wp_hasher = new PasswordHash(8, true);
 	}
 
 	/**
@@ -2175,31 +2175,31 @@ 
 	 *
 	 * @param int $expiration The expiration time in seconds.
 	 */
-	$expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
+	$expiration_duration = apply_filters('password_reset_expiration', DAY_IN_SECONDS);
 
-	if ( false !== strpos( $row->user_activation_key, ':' ) ) {
-		list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 );
+	if (false !== strpos($row->user_activation_key, ':')) {
+		list($pass_request_time, $pass_key) = explode(':', $row->user_activation_key, 2);
 		$expiration_time = $pass_request_time + $expiration_duration;
 	} else {
 		$pass_key = $row->user_activation_key;
 		$expiration_time = false;
 	}
 
-	if ( ! $pass_key ) {
-		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	if ( ! $pass_key) {
+		return new WP_Error('invalid_key', __('Invalid key'));
 	}
 
-	$hash_is_correct = $wp_hasher->CheckPassword( $key, $pass_key );
+	$hash_is_correct = $wp_hasher->CheckPassword($key, $pass_key);
 
-	if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) {
-		return get_userdata( $row->ID );
-	} elseif ( $hash_is_correct && $expiration_time ) {
+	if ($hash_is_correct && $expiration_time && time() < $expiration_time) {
+		return get_userdata($row->ID);
+	} elseif ($hash_is_correct && $expiration_time) {
 		// Key has an expiration time that's passed
-		return new WP_Error( 'expired_key', __( 'Invalid key' ) );
+		return new WP_Error('expired_key', __('Invalid key'));
 	}
 
-	if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
-		$return = new WP_Error( 'expired_key', __( 'Invalid key' ) );
+	if (hash_equals($row->user_activation_key, $key) || ($hash_is_correct && ! $expiration_time)) {
+		$return = new WP_Error('expired_key', __('Invalid key'));
 		$user_id = $row->ID;
 
 		/**
@@ -2213,10 +2213,10 @@ 
 		 *                          Return a WP_User object to validate the key.
 		 * @param int      $user_id The matched user ID.
 		 */
-		return apply_filters( 'password_reset_key_expired', $return, $user_id );
+		return apply_filters('password_reset_key_expired', $return, $user_id);
 	}
 
-	return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	return new WP_Error('invalid_key', __('Invalid key'));
 }
 
 /**
@@ -2227,7 +2227,7 @@ 
  * @param object $user     The user
  * @param string $new_pass New password for the user in plaintext
  */
-function reset_password( $user, $new_pass ) {
+function reset_password($user, $new_pass) {
 	/**
 	 * Fires before the user's password is reset.
 	 *
@@ -2236,10 +2236,10 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'password_reset', $user, $new_pass );
+	do_action('password_reset', $user, $new_pass);
 
-	wp_set_password( $new_pass, $user->ID );
-	update_user_option( $user->ID, 'default_password_nag', false, true );
+	wp_set_password($new_pass, $user->ID);
+	update_user_option($user->ID, 'default_password_nag', false, true);
 
 	/**
 	 * Fires after the user's password is reset.
@@ -2249,7 +2249,7 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'after_password_reset', $user, $new_pass );
+	do_action('after_password_reset', $user, $new_pass);
 }
 
 /**
@@ -2261,10 +2261,10 @@ 
  * @param string $user_email User's email address to send password and add
  * @return int|WP_Error Either user's ID or error on failure.
  */
-function register_new_user( $user_login, $user_email ) {
+function register_new_user($user_login, $user_email) {
 	$errors = new WP_Error();
 
-	$sanitized_user_login = sanitize_user( $user_login );
+	$sanitized_user_login = sanitize_user($user_login);
 	/**
 	 * Filters the email address of a user being registered.
 	 *
@@ -2272,33 +2272,33 @@ 
 	 *
 	 * @param string $user_email The email address of the new user.
 	 */
-	$user_email = apply_filters( 'user_registration_email', $user_email );
+	$user_email = apply_filters('user_registration_email', $user_email);
 
 	// Check the username
-	if ( $sanitized_user_login == '' ) {
-		$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
-	} elseif ( ! validate_username( $user_login ) ) {
-		$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+	if ($sanitized_user_login == '') {
+		$errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.'));
+	} elseif ( ! validate_username($user_login)) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 		$sanitized_user_login = '';
-	} elseif ( username_exists( $sanitized_user_login ) ) {
-		$errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+	} elseif (username_exists($sanitized_user_login)) {
+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'));
 
 	} else {
 		/** This filter is documented in wp-includes/user.php */
-		$illegal_user_logins = array_map( 'strtolower', (array) apply_filters( 'illegal_user_logins', array() ) );
-		if ( in_array( strtolower( $sanitized_user_login ), $illegal_user_logins ) ) {
-			$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+		$illegal_user_logins = array_map('strtolower', (array) apply_filters('illegal_user_logins', array()));
+		if (in_array(strtolower($sanitized_user_login), $illegal_user_logins)) {
+			$errors->add('invalid_username', __('<strong>ERROR</strong>: Sorry, that username is not allowed.'));
 		}
 	}
 
 	// Check the email address
-	if ( $user_email == '' ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
-	} elseif ( ! is_email( $user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
+	if ($user_email == '') {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your email address.'));
+	} elseif ( ! is_email($user_email)) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'));
 		$user_email = '';
-	} elseif ( email_exists( $user_email ) ) {
-		$errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
+	} elseif (email_exists($user_email)) {
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
 	}
 
 	/**
@@ -2312,7 +2312,7 @@ 
 	 *                                       e.g., an empty field, an invalid username or email,
 	 *                                       or an existing username or email.
 	 */
-	do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
+	do_action('register_post', $sanitized_user_login, $user_email, $errors);
 
 	/**
 	 * Filters the errors encountered when a new user is being registered.
@@ -2330,19 +2330,19 @@ 
 	 * @param string   $sanitized_user_login User's username after it has been sanitized.
 	 * @param string   $user_email           User's email.
 	 */
-	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
+	$errors = apply_filters('registration_errors', $errors, $sanitized_user_login, $user_email);
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
-	$user_pass = wp_generate_password( 12, false );
-	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
-	if ( ! $user_id || is_wp_error( $user_id ) ) {
-		$errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
+	$user_pass = wp_generate_password(12, false);
+	$user_id = wp_create_user($sanitized_user_login, $user_pass, $user_email);
+	if ( ! $user_id || is_wp_error($user_id)) {
+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
 		return $errors;
 	}
 
-	update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+	update_user_option($user_id, 'default_password_nag', true, true); //Set up the Password change nag.
 
 	/**
 	 * Fires after a new user registration has been recorded.
@@ -2351,7 +2351,7 @@ 
 	 *
 	 * @param int $user_id ID of the newly registered user.
 	 */
-	do_action( 'register_new_user', $user_id );
+	do_action('register_new_user', $user_id);
 
 	return $user_id;
 }
@@ -2370,8 +2370,8 @@ 
  *                        or an empty string (admin only), 'user', or 'both' (admin and user).
  *                        Default 'both'.
  */
-function wp_send_new_user_notifications( $user_id, $notify = 'both' ) {
-	wp_new_user_notification( $user_id, null, $notify );
+function wp_send_new_user_notifications($user_id, $notify = 'both') {
+	wp_new_user_notification($user_id, null, $notify);
 }
 
 /**
@@ -2382,8 +2382,8 @@ 
  * @return string Token.
  */
 function wp_get_session_token() {
-	$cookie = wp_parse_auth_cookie( '', 'logged_in' );
-	return ! empty( $cookie['token'] ) ? $cookie['token'] : '';
+	$cookie = wp_parse_auth_cookie('', 'logged_in');
+	return ! empty($cookie['token']) ? $cookie['token'] : '';
 }
 
 /**
@@ -2393,7 +2393,7 @@ 
  * @return array Array of sessions.
  */
 function wp_get_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	return $manager->get_all();
 }
 
@@ -2404,9 +2404,9 @@ 
  */
 function wp_destroy_current_session() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy($token);
 	}
 }
 
@@ -2417,9 +2417,9 @@ 
  */
 function wp_destroy_other_sessions() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy_others( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy_others($token);
 	}
 }
 
@@ -2429,7 +2429,7 @@ 
  * @since 4.0.0
  */
 function wp_destroy_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	$manager->destroy_all();
 }
 
@@ -2445,19 +2445,19 @@ 
 function wp_get_users_with_no_role() {
 	global $wpdb;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		return array();
 	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	$regex  = implode( '|', array_keys( wp_roles()->get_names() ) );
-	$regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
-	$users  = $wpdb->get_col( $wpdb->prepare( "
+	$regex  = implode('|', array_keys(wp_roles()->get_names()));
+	$regex  = preg_replace('/[^a-zA-Z_\|-]/', '', $regex);
+	$users  = $wpdb->get_col($wpdb->prepare("
 		SELECT user_id
 		FROM $wpdb->usermeta
 		WHERE meta_key = '{$prefix}capabilities'
 		AND meta_value NOT REGEXP %s
-	", $regex ) );
+	", $regex));
 
 	return $users;
 }
@@ -2484,27 +2484,27 @@ 
 function _wp_get_current_user() {
 	global $current_user;
 
-	if ( ! empty( $current_user ) ) {
-		if ( $current_user instanceof WP_User ) {
+	if ( ! empty($current_user)) {
+		if ($current_user instanceof WP_User) {
 			return $current_user;
 		}
 
 		// Upgrade stdClass to WP_User
-		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+		if (is_object($current_user) && isset($current_user->ID)) {
 			$cur_id = $current_user->ID;
 			$current_user = null;
-			wp_set_current_user( $cur_id );
+			wp_set_current_user($cur_id);
 			return $current_user;
 		}
 
 		// $current_user has a junk value. Force to WP_User with ID 0.
 		$current_user = null;
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-		wp_set_current_user( 0 );
+	if (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
@@ -2521,13 +2521,13 @@ 
 	 *
 	 * @param int|bool $user_id User ID if one has been determined, false otherwise.
 	 */
-	$user_id = apply_filters( 'determine_current_user', false );
-	if ( ! $user_id ) {
-		wp_set_current_user( 0 );
+	$user_id = apply_filters('determine_current_user', false);
+	if ( ! $user_id) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	wp_set_current_user( $user_id );
+	wp_set_current_user($user_id);
 
 	return $current_user;
 }

Braces +132 added lines, -88 removed lines

@@ -29,18 +29,22 @@ 
 	if ( empty($credentials) ) {
 		$credentials = array(); // Back-compat for plugins passing an empty string.
 
-		if ( ! empty($_POST['log']) )
-			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
-			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
-			$credentials['remember'] = $_POST['rememberme'];
+		if ( ! empty($_POST['log']) ) {
+					$credentials['user_login'] = $_POST['log'];
+		}
+		if ( ! empty($_POST['pwd']) ) {
+					$credentials['user_password'] = $_POST['pwd'];
+		}
+		if ( ! empty($_POST['rememberme']) ) {
+					$credentials['remember'] = $_POST['rememberme'];
+		}
 	}
 
-	if ( !empty($credentials['remember']) )
-		$credentials['remember'] = true;
-	else
-		$credentials['remember'] = false;
+	if ( !empty($credentials['remember']) ) {
+			$credentials['remember'] = true;
+	} else {
+			$credentials['remember'] = false;
+	}
 
 	/**
 	 * Fires before the user is authenticated.
@@ -57,8 +61,9 @@ 
 	 */
 	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
 
-	if ( '' === $secure_cookie )
-		$secure_cookie = is_ssl();
+	if ( '' === $secure_cookie ) {
+			$secure_cookie = is_ssl();
+	}
 
 	/**
 	 * Filters whether to use a secure sign-on cookie.
@@ -121,16 +126,19 @@ 
 	}
 
 	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
-			return $user;
+		if ( is_wp_error( $user ) ) {
+					return $user;
+		}
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
-			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		if ( empty($username) ) {
+					$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		}
 
-		if ( empty($password) )
-			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		if ( empty($password) ) {
+					$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		}
 
 		return $error;
 	}
@@ -156,8 +164,9 @@ 
 	 * @param string           $password Password to check against the user.
 	 */
 	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
-		return $user;
+	if ( is_wp_error($user) ) {
+			return $user;
+	}
 
 	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
 		return new WP_Error( 'incorrect_password',
@@ -266,18 +275,21 @@ 
 
 	if ( empty($username) && empty($password) ) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
-			return new WP_User($user_id);
+		if ( $user_id ) {
+					return new WP_User($user_id);
+		}
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
-			$auth_cookie = SECURE_AUTH_COOKIE;
-		else
-			$auth_cookie = AUTH_COOKIE;
+		if ( $auth_secure_cookie ) {
+					$auth_cookie = SECURE_AUTH_COOKIE;
+		} else {
+					$auth_cookie = AUTH_COOKIE;
+		}
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
-			return new WP_Error('expired_session', __('Please log in again.'));
+		if ( !empty($_COOKIE[$auth_cookie]) ) {
+					return new WP_Error('expired_session', __('Please log in again.'));
+		}
 
 		// If the cookie is not set, be silent.
 	}
@@ -306,8 +318,9 @@ 
 		 */
 		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ( $spammed ) {
+					return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		}
 	}
 	return $user;
 }
@@ -392,8 +405,9 @@ 
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
-		return $count;
+	if ( empty( $users ) || ! is_array( $users ) ) {
+			return $count;
+	}
 
 	$userlist = implode( ',', array_map( 'absint', $users ) );
 	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
@@ -404,8 +418,9 @@ 
 	}
 
 	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+		if ( ! isset( $count[ $id ] ) ) {
+					$count[ $id ] = 0;
+		}
 	}
 
 	return $count;
@@ -423,8 +438,9 @@ 
  * @return int The current user's ID, or 0 if no user is logged in.
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
-		return 0;
+	if ( ! function_exists( 'wp_get_current_user' ) ) {
+			return 0;
+	}
 	$user = wp_get_current_user();
 	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
 }
@@ -451,22 +467,28 @@ 
 function get_user_option( $option, $user = 0, $deprecated = '' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( empty( $user ) )
-		$user = get_current_user_id();
+	if ( empty( $user ) ) {
+			$user = get_current_user_id();
+	}
 
-	if ( ! $user = get_userdata( $user ) )
-		return false;
+	if ( ! $user = get_userdata( $user ) ) {
+			return false;
+	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+	if ( $user->has_prop( $prefix . $option ) ) {
+		// Blog specific
 		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
+	} elseif ( $user->has_prop( $option ) ) {
+		// User specific and cross-blog
 		$result = $user->get( $option );
-	else
-		$result = false;
+	} else {
+			$result = false;
+	}
 
 	/**
 	 * Filters a specific user option value.
@@ -506,8 +528,9 @@ 
 function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 
 	return update_user_meta( $user_id, $option_name, $newvalue );
 }
@@ -532,8 +555,9 @@ 
 function delete_user_option( $user_id, $option_name, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 	return delete_user_meta( $user_id, $option_name );
 }
 
@@ -578,8 +602,9 @@ 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have sites
-	if ( empty( $user_id ) )
-		return array();
+	if ( empty( $user_id ) ) {
+			return array();
+	}
 
 	/**
 	 * Filters the list of a user's sites before it is populated.
@@ -601,8 +626,9 @@ 
 	}
 
 	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
-		return array();
+	if ( empty( $keys ) ) {
+			return array();
+	}
 
 	if ( ! is_multisite() ) {
 		$site_id = get_current_blog_id();
@@ -629,13 +655,16 @@ 
 	$keys = array_keys( $keys );
 
 	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
-			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
-			continue;
+		if ( 'capabilities' !== substr( $key, -12 ) ) {
+					continue;
+		}
+		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) ) {
+					continue;
+		}
 		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $site_id ) )
-			continue;
+		if ( ! is_numeric( $site_id ) ) {
+					continue;
+		}
 
 		$site_ids[] = (int) $site_id;
 	}
@@ -885,8 +914,9 @@ 
 
 		foreach ( $users_of_blog as $caps_meta ) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
-				continue;
+			if ( ! is_array( $b_roles ) ) {
+							continue;
+			}
 			if ( empty( $b_roles ) ) {
 				$avail_roles['none']++;
 			}
@@ -934,8 +964,9 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
-		$for_user_id = get_current_user_id();
+	if ( '' == $for_user_id ) {
+			$for_user_id = get_current_user_id();
+	}
 	$user = get_userdata( $for_user_id );
 
 	if ( ! $user ) {
@@ -1149,14 +1180,17 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
-		$value = (int) $value;
+	if ( in_array($field, $int_fields) ) {
+			$value = (int) $value;
+	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
-	if ( !is_string($value) && !is_numeric($value) )
-		return $value;
+	if ( !is_string($value) && !is_numeric($value) ) {
+			return $value;
+	}
 
 	$prefixed = false !== strpos( $field, 'user_' );
 
@@ -1181,10 +1215,13 @@ 
 			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+					$value = esc_html( $value );
+		}
+		// textarea_escaped?
+		else {
+					$value = esc_attr($value);
+		}
 	} elseif ( 'db' == $context ) {
 		if ( $prefixed ) {
 			/** This filter is documented in wp-includes/post.php */
@@ -1227,8 +1264,9 @@ 
 		}
 	}
 
-	if ( 'user_url' == $field )
-		$value = esc_url($value);
+	if ( 'user_url' == $field ) {
+			$value = esc_url($value);
+	}
 
 	if ( 'attribute' == $context ) {
 		$value = esc_attr( $value );
@@ -1270,11 +1308,13 @@ 
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+	if ( is_numeric( $user ) ) {
+			$user = new WP_User( $user );
+	}
 
-	if ( ! $user->exists() )
-		return;
+	if ( ! $user->exists() ) {
+			return;
+	}
 
 	wp_cache_delete( $user->ID, 'users' );
 	wp_cache_delete( $user->user_login, 'userlogins' );
@@ -2154,15 +2194,18 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty( $key ) || !is_string( $key ) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
-	if ( empty($login) || !is_string($login) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty($login) || !is_string($login) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( ! $row ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	if ( empty( $wp_hasher ) ) {
 		$wp_hasher = new PasswordHash( 8, true );
@@ -2332,8 +2375,9 @@ 
 	 */
 	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	$user_pass = wp_generate_password( 12, false );
 	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );

src/wp-includes/widgets.php

Doc Comments +3 added lines, -3 removed lines

@@ -549,7 +549,7 @@ 
  *
  * @global array $wp_registered_widget_controls
  *
- * @param int|string $id            Widget ID.
+ * @param boolean|string $id            Widget ID.
  * @param string     $name          Name attribute for the widget.
  * @param callable   $form_callback Form callback.
  * @param array      $options       Optional. Widget control options. See {@see wp_register_widget_control()}.
@@ -607,7 +607,7 @@ 
  * @global array $wp_registered_sidebars
  * @global array $wp_registered_widgets
  *
- * @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar.
+ * @param integer $index Optional, default is 1. Index, name or ID of dynamic sidebar.
  * @return bool True, if widget sidebar was found and called. False if not found or not called.
  */
 function dynamic_sidebar( $index = 1 ) {
@@ -844,7 +844,7 @@ 
  *
  * @since 2.8.0
  *
- * @param string|int $index Sidebar name, id or number to check.
+ * @param string $index Sidebar name, id or number to check.
  * @return bool true if the sidebar is in use, false otherwise.
  */
 function is_active_sidebar( $index ) {

Spacing +241 added lines, -241 removed lines

@@ -159,34 +159,34 @@ 
  *                        Default 'Sidebar' for the first sidebar, otherwise 'Sidebar %d'.
  * }
  */
-function register_sidebars( $number = 1, $args = array() ) {
+function register_sidebars($number = 1, $args = array()) {
 	global $wp_registered_sidebars;
 	$number = (int) $number;
 
-	if ( is_string($args) )
+	if (is_string($args))
 		parse_str($args, $args);
 
-	for ( $i = 1; $i <= $number; $i++ ) {
+	for ($i = 1; $i <= $number; $i++) {
 		$_args = $args;
 
-		if ( $number > 1 )
+		if ($number > 1)
 			$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
 		else
 			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
 
 		// Custom specified ID's are suffixed if they exist already.
 		// Automatically generated sidebar names need to be suffixed regardless starting at -0
-		if ( isset($args['id']) ) {
+		if (isset($args['id'])) {
 			$_args['id'] = $args['id'];
 			$n = 2; // Start at -2 for conflicting custom ID's
-			while ( is_registered_sidebar( $_args['id'] ) ) {
-				$_args['id'] = $args['id'] . '-' . $n++;
+			while (is_registered_sidebar($_args['id'])) {
+				$_args['id'] = $args['id'].'-'.$n++;
 			}
 		} else {
-			$n = count( $wp_registered_sidebars );
+			$n = count($wp_registered_sidebars);
 			do {
-				$_args['id'] = 'sidebar-' . ++$n;
-			} while ( is_registered_sidebar( $_args['id'] ) );
+				$_args['id'] = 'sidebar-'.++$n;
+			} while (is_registered_sidebar($_args['id']));
 		}
 		register_sidebar($_args);
 	}
@@ -238,10 +238,10 @@ 
 
 	$i = count($wp_registered_sidebars) + 1;
 
-	$id_is_empty = empty( $args['id'] );
+	$id_is_empty = empty($args['id']);
 
 	$defaults = array(
-		'name' => sprintf(__('Sidebar %d'), $i ),
+		'name' => sprintf(__('Sidebar %d'), $i),
 		'id' => "sidebar-$i",
 		'description' => '',
 		'class' => '',
@@ -251,11 +251,11 @@ 
 		'after_title' => "</h2>\n",
 	);
 
-	$sidebar = wp_parse_args( $args, $defaults );
+	$sidebar = wp_parse_args($args, $defaults);
 
-	if ( $id_is_empty ) {
+	if ($id_is_empty) {
 		/* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
-		_doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
+		_doing_it_wrong(__FUNCTION__, sprintf(__('No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.'), '<code>id</code>', $sidebar['name'], $sidebar['id']), '4.2.0');
 	}
 
 	$wp_registered_sidebars[$sidebar['id']] = $sidebar;
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param array $sidebar Parsed arguments for the registered sidebar.
 	 */
-	do_action( 'register_sidebar', $sidebar );
+	do_action('register_sidebar', $sidebar);
 
 	return $sidebar['id'];
 }
@@ -283,10 +283,10 @@ 
  *
  * @param string $name The ID of the sidebar when it was added.
  */
-function unregister_sidebar( $name ) {
+function unregister_sidebar($name) {
 	global $wp_registered_sidebars;
 
-	unset( $wp_registered_sidebars[ $name ] );
+	unset($wp_registered_sidebars[$name]);
 }
 
 /**
@@ -299,10 +299,10 @@ 
  * @param string|int $sidebar_id The ID of the sidebar when it was registered.
  * @return bool True if the sidebar is registered, false otherwise.
  */
-function is_registered_sidebar( $sidebar_id ) {
+function is_registered_sidebar($sidebar_id) {
 	global $wp_registered_sidebars;
 
-	return isset( $wp_registered_sidebars[ $sidebar_id ] );
+	return isset($wp_registered_sidebars[$sidebar_id]);
 }
 
 /**
@@ -332,20 +332,20 @@ 
  *                               panel and/or theme.
  * }
  */
-function wp_register_sidebar_widget( $id, $name, $output_callback, $options = array() ) {
+function wp_register_sidebar_widget($id, $name, $output_callback, $options = array()) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates, $_wp_deprecated_widgets_callbacks;
 
 	$id = strtolower($id);
 
-	if ( empty($output_callback) ) {
+	if (empty($output_callback)) {
 		unset($wp_registered_widgets[$id]);
 		return;
 	}
 
 	$id_base = _get_widget_id_base($id);
-	if ( in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($output_callback) ) {
-		unset( $wp_registered_widget_controls[ $id ] );
-		unset( $wp_registered_widget_updates[ $id_base ] );
+	if (in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && ! is_callable($output_callback)) {
+		unset($wp_registered_widget_controls[$id]);
+		unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
 
@@ -359,7 +359,7 @@ 
 	);
 	$widget = array_merge($widget, $options);
 
-	if ( is_callable($output_callback) && ( !isset($wp_registered_widgets[$id]) || did_action( 'widgets_init' ) ) ) {
+	if (is_callable($output_callback) && ( ! isset($wp_registered_widgets[$id]) || did_action('widgets_init'))) {
 
 		/**
 		 * Fires once for each registered widget.
@@ -368,7 +368,7 @@ 
 		 *
 		 * @param array $widget An array of default widget arguments.
 		 */
-		do_action( 'wp_register_sidebar_widget', $widget );
+		do_action('wp_register_sidebar_widget', $widget);
 		$wp_registered_widgets[$id] = $widget;
 	}
 }
@@ -387,14 +387,14 @@ 
  * @param int|string $id Widget ID.
  * @return string|void Widget description, if available.
  */
-function wp_widget_description( $id ) {
-	if ( !is_scalar($id) )
+function wp_widget_description($id) {
+	if ( ! is_scalar($id))
 		return;
 
 	global $wp_registered_widgets;
 
-	if ( isset($wp_registered_widgets[$id]['description']) )
-		return esc_html( $wp_registered_widgets[$id]['description'] );
+	if (isset($wp_registered_widgets[$id]['description']))
+		return esc_html($wp_registered_widgets[$id]['description']);
 }
 
 /**
@@ -410,14 +410,14 @@ 
  * @param string $id sidebar ID.
  * @return string|void Sidebar description, if available.
  */
-function wp_sidebar_description( $id ) {
-	if ( !is_scalar($id) )
+function wp_sidebar_description($id) {
+	if ( ! is_scalar($id))
 		return;
 
 	global $wp_registered_sidebars;
 
-	if ( isset($wp_registered_sidebars[$id]['description']) )
-		return esc_html( $wp_registered_sidebars[$id]['description'] );
+	if (isset($wp_registered_sidebars[$id]['description']))
+		return esc_html($wp_registered_sidebars[$id]['description']);
 }
 
 /**
@@ -436,7 +436,7 @@ 
 	 *
 	 * @param int $id The widget ID.
 	 */
-	do_action( 'wp_unregister_sidebar_widget', $id );
+	do_action('wp_unregister_sidebar_widget', $id);
 
 	wp_register_sidebar_widget($id, '', '');
 	wp_unregister_widget_control($id);
@@ -467,27 +467,27 @@ 
  *                               text widget. The widget id will end up looking like `{$id_base}-{$unique_number}`.
  * }
  */
-function wp_register_widget_control( $id, $name, $control_callback, $options = array() ) {
+function wp_register_widget_control($id, $name, $control_callback, $options = array()) {
 	global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks;
 
 	$id = strtolower($id);
 	$id_base = _get_widget_id_base($id);
 
-	if ( empty($control_callback) ) {
+	if (empty($control_callback)) {
 		unset($wp_registered_widget_controls[$id]);
 		unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
 
-	if ( in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($control_callback) ) {
-		unset( $wp_registered_widgets[ $id ] );
+	if (in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && ! is_callable($control_callback)) {
+		unset($wp_registered_widgets[$id]);
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if (isset($wp_registered_widget_controls[$id]) && ! did_action('widgets_init'))
 		return;
 
-	$defaults = array('width' => 250, 'height' => 200 ); // height is never used
+	$defaults = array('width' => 250, 'height' => 200); // height is never used
 	$options = wp_parse_args($options, $defaults);
 	$options['width'] = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
@@ -502,10 +502,10 @@ 
 
 	$wp_registered_widget_controls[$id] = $widget;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) )
+	if (isset($wp_registered_widget_updates[$id_base]))
 		return;
 
-	if ( isset($widget['params'][0]['number']) )
+	if (isset($widget['params'][0]['number']))
 		$widget['params'][0]['number'] = -1;
 
 	unset($widget['width'], $widget['height'], $widget['name'], $widget['id']);
@@ -524,11 +524,11 @@ 
  * @param array    $options         Optional. Widget control options. See wp_register_widget_control().
  *                                  Default empty array.
  */
-function _register_widget_update_callback( $id_base, $update_callback, $options = array() ) {
+function _register_widget_update_callback($id_base, $update_callback, $options = array()) {
 	global $wp_registered_widget_updates;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) ) {
-		if ( empty($update_callback) )
+	if (isset($wp_registered_widget_updates[$id_base])) {
+		if (empty($update_callback))
 			unset($wp_registered_widget_updates[$id_base]);
 		return;
 	}
@@ -560,15 +560,15 @@ 
 
 	$id = strtolower($id);
 
-	if ( empty($form_callback) ) {
+	if (empty($form_callback)) {
 		unset($wp_registered_widget_controls[$id]);
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if (isset($wp_registered_widget_controls[$id]) && ! did_action('widgets_init'))
 		return;
 
-	$defaults = array('width' => 250, 'height' => 200 );
+	$defaults = array('width' => 250, 'height' => 200);
 	$options = wp_parse_args($options, $defaults);
 	$options['width'] = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
@@ -592,7 +592,7 @@ 
  * @param int|string $id Widget ID.
  */
 function wp_unregister_widget_control($id) {
-	wp_register_widget_control( $id, '', '' );
+	wp_register_widget_control($id, '', '');
 }
 
 /**
@@ -610,15 +610,15 @@ 
  * @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar.
  * @return bool True, if widget sidebar was found and called. False if not found or not called.
  */
-function dynamic_sidebar( $index = 1 ) {
+function dynamic_sidebar($index = 1) {
 	global $wp_registered_sidebars, $wp_registered_widgets;
 
-	if ( is_int( $index ) ) {
+	if (is_int($index)) {
 		$index = "sidebar-$index";
 	} else {
-		$index = sanitize_title( $index );
-		foreach ( (array) $wp_registered_sidebars as $key => $value ) {
-			if ( sanitize_title( $value['name'] ) == $index ) {
+		$index = sanitize_title($index);
+		foreach ((array) $wp_registered_sidebars as $key => $value) {
+			if (sanitize_title($value['name']) == $index) {
 				$index = $key;
 				break;
 			}
@@ -626,13 +626,13 @@ 
 	}
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
-	if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
+	if (empty($wp_registered_sidebars[$index]) || empty($sidebars_widgets[$index]) || ! is_array($sidebars_widgets[$index])) {
 		/** This action is documented in wp-includes/widget.php */
-		do_action( 'dynamic_sidebar_before', $index, false );
+		do_action('dynamic_sidebar_before', $index, false);
 		/** This action is documented in wp-includes/widget.php */
-		do_action( 'dynamic_sidebar_after',  $index, false );
+		do_action('dynamic_sidebar_after', $index, false);
 		/** This filter is documented in wp-includes/widget.php */
-		return apply_filters( 'dynamic_sidebar_has_widgets', false, $index );
+		return apply_filters('dynamic_sidebar_has_widgets', false, $index);
 	}
 
 	/**
@@ -647,26 +647,26 @@ 
 	 * @param bool       $has_widgets Whether the sidebar is populated with widgets.
 	 *                                Default true.
 	 */
-	do_action( 'dynamic_sidebar_before', $index, true );
+	do_action('dynamic_sidebar_before', $index, true);
 	$sidebar = $wp_registered_sidebars[$index];
 
 	$did_one = false;
-	foreach ( (array) $sidebars_widgets[$index] as $id ) {
+	foreach ((array) $sidebars_widgets[$index] as $id) {
 
-		if ( !isset($wp_registered_widgets[$id]) ) continue;
+		if ( ! isset($wp_registered_widgets[$id])) continue;
 
 		$params = array_merge(
-			array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
+			array(array_merge($sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']))),
 			(array) $wp_registered_widgets[$id]['params']
 		);
 
 		// Substitute HTML id and class attributes into before_widget
 		$classname_ = '';
-		foreach ( (array) $wp_registered_widgets[$id]['classname'] as $cn ) {
-			if ( is_string($cn) )
-				$classname_ .= '_' . $cn;
-			elseif ( is_object($cn) )
-				$classname_ .= '_' . get_class($cn);
+		foreach ((array) $wp_registered_widgets[$id]['classname'] as $cn) {
+			if (is_string($cn))
+				$classname_ .= '_'.$cn;
+			elseif (is_object($cn))
+				$classname_ .= '_'.get_class($cn);
 		}
 		$classname_ = ltrim($classname_, '_');
 		$params[0]['before_widget'] = sprintf($params[0]['before_widget'], $id, $classname_);
@@ -703,7 +703,7 @@ 
 		 *     }
 		 * }
 		 */
-		$params = apply_filters( 'dynamic_sidebar_params', $params );
+		$params = apply_filters('dynamic_sidebar_params', $params);
 
 		$callback = $wp_registered_widgets[$id]['callback'];
 
@@ -732,9 +732,9 @@ 
 		 *                                       with an array containing the widget object, see $callback.
 		 * }
 		 */
-		do_action( 'dynamic_sidebar', $wp_registered_widgets[ $id ] );
+		do_action('dynamic_sidebar', $wp_registered_widgets[$id]);
 
-		if ( is_callable($callback) ) {
+		if (is_callable($callback)) {
 			call_user_func_array($callback, $params);
 			$did_one = true;
 		}
@@ -752,7 +752,7 @@ 
 	 * @param bool       $has_widgets Whether the sidebar is populated with widgets.
 	 *                                Default true.
 	 */
-	do_action( 'dynamic_sidebar_after', $index, true );
+	do_action('dynamic_sidebar_after', $index, true);
 
 	/**
 	 * Filters whether a sidebar has widgets.
@@ -766,7 +766,7 @@ 
 	 *                            Default false.
 	 * @param int|string $index   Index, name, or ID of the dynamic sidebar.
 	 */
-	return apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index );
+	return apply_filters('dynamic_sidebar_has_widgets', $did_one, $index);
 }
 
 /**
@@ -792,21 +792,21 @@ 
  * @param bool         $skip_inactive Optional. Whether to check in 'wp_inactive_widgets'. Default true.
  * @return string|false False if widget is not active or id of sidebar in which the widget is active.
  */
-function is_active_widget( $callback = false, $widget_id = false, $id_base = false, $skip_inactive = true ) {
+function is_active_widget($callback = false, $widget_id = false, $id_base = false, $skip_inactive = true) {
 	global $wp_registered_widgets;
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
 
-	if ( is_array($sidebars_widgets) ) {
-		foreach ( $sidebars_widgets as $sidebar => $widgets ) {
-			if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) ) {
+	if (is_array($sidebars_widgets)) {
+		foreach ($sidebars_widgets as $sidebar => $widgets) {
+			if ($skip_inactive && ('wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr($sidebar, 0, 16))) {
 				continue;
 			}
 
-			if ( is_array($widgets) ) {
-				foreach ( $widgets as $widget ) {
-					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && _get_widget_id_base($widget) == $id_base ) ) {
-						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
+			if (is_array($widgets)) {
+				foreach ($widgets as $widget) {
+					if (($callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback) || ($id_base && _get_widget_id_base($widget) == $id_base)) {
+						if ( ! $widget_id || $widget_id == $wp_registered_widgets[$widget]['id'])
 							return $sidebar;
 					}
 				}
@@ -829,10 +829,10 @@ 
 function is_dynamic_sidebar() {
 	global $wp_registered_widgets, $wp_registered_sidebars;
 	$sidebars_widgets = get_option('sidebars_widgets');
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
-		if ( ! empty( $sidebars_widgets[ $index ] ) ) {
-			foreach ( (array) $sidebars_widgets[$index] as $widget )
-				if ( array_key_exists($widget, $wp_registered_widgets) )
+	foreach ((array) $wp_registered_sidebars as $index => $sidebar) {
+		if ( ! empty($sidebars_widgets[$index])) {
+			foreach ((array) $sidebars_widgets[$index] as $widget)
+				if (array_key_exists($widget, $wp_registered_widgets))
 					return true;
 		}
 	}
@@ -847,10 +847,10 @@ 
  * @param string|int $index Sidebar name, id or number to check.
  * @return bool true if the sidebar is in use, false otherwise.
  */
-function is_active_sidebar( $index ) {
-	$index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
+function is_active_sidebar($index) {
+	$index = (is_int($index)) ? "sidebar-$index" : sanitize_title($index);
 	$sidebars_widgets = wp_get_sidebars_widgets();
-	$is_active_sidebar = ! empty( $sidebars_widgets[$index] );
+	$is_active_sidebar = ! empty($sidebars_widgets[$index]);
 
 	/**
 	 * Filters whether a dynamic sidebar is considered "active".
@@ -861,7 +861,7 @@ 
 	 *                                      In other words, whether the sidebar contains any widgets.
 	 * @param int|string $index             Index, name, or ID of the dynamic sidebar.
 	 */
-	return apply_filters( 'is_active_sidebar', $is_active_sidebar, $index );
+	return apply_filters('is_active_sidebar', $is_active_sidebar, $index);
 }
 
 //
@@ -883,16 +883,16 @@ 
  * @param bool $deprecated Not used (argument deprecated).
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
-function wp_get_sidebars_widgets( $deprecated = true ) {
-	if ( $deprecated !== true )
-		_deprecated_argument( __FUNCTION__, '2.8.1' );
+function wp_get_sidebars_widgets($deprecated = true) {
+	if ($deprecated !== true)
+		_deprecated_argument(__FUNCTION__, '2.8.1');
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
-	if ( !is_admin() ) {
-		if ( empty($_wp_sidebars_widgets) )
+	if ( ! is_admin()) {
+		if (empty($_wp_sidebars_widgets))
 			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
 
 		$sidebars_widgets = $_wp_sidebars_widgets;
@@ -900,7 +900,7 @@ 
 		$sidebars_widgets = get_option('sidebars_widgets', array());
 	}
 
-	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) )
+	if (is_array($sidebars_widgets) && isset($sidebars_widgets['array_version']))
 		unset($sidebars_widgets['array_version']);
 
 	/**
@@ -910,7 +910,7 @@ 
 	 *
 	 * @param array $sidebars_widgets An associative array of sidebars and their widgets.
 	 */
-	return apply_filters( 'sidebars_widgets', $sidebars_widgets );
+	return apply_filters('sidebars_widgets', $sidebars_widgets);
 }
 
 /**
@@ -921,10 +921,10 @@ 
  *
  * @param array $sidebars_widgets Sidebar widgets and their settings.
  */
-function wp_set_sidebars_widgets( $sidebars_widgets ) {
-	if ( !isset( $sidebars_widgets['array_version'] ) )
+function wp_set_sidebars_widgets($sidebars_widgets) {
+	if ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 3;
-	update_option( 'sidebars_widgets', $sidebars_widgets );
+	update_option('sidebars_widgets', $sidebars_widgets);
 }
 
 /**
@@ -942,7 +942,7 @@ 
 
 	$defaults = array();
 
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
+	foreach ((array) $wp_registered_sidebars as $index => $sidebar)
 		$defaults[$index] = array();
 
 	return $defaults;
@@ -963,35 +963,35 @@ 
 function wp_convert_widget_settings($base_name, $option_name, $settings) {
 	// This test may need expanding.
 	$single = $changed = false;
-	if ( empty($settings) ) {
+	if (empty($settings)) {
 		$single = true;
 	} else {
-		foreach ( array_keys($settings) as $number ) {
-			if ( 'number' == $number )
+		foreach (array_keys($settings) as $number) {
+			if ('number' == $number)
 				continue;
-			if ( !is_numeric($number) ) {
+			if ( ! is_numeric($number)) {
 				$single = true;
 				break;
 			}
 		}
 	}
 
-	if ( $single ) {
-		$settings = array( 2 => $settings );
+	if ($single) {
+		$settings = array(2 => $settings);
 
 		// If loading from the front page, update sidebar in memory but don't save to options
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$sidebars_widgets = get_option('sidebars_widgets');
 		} else {
-			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
+			if (empty($GLOBALS['_wp_sidebars_widgets']))
 				$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
 			$sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
 		}
 
-		foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
-			if ( is_array($sidebar) ) {
-				foreach ( $sidebar as $i => $name ) {
-					if ( $base_name == $name ) {
+		foreach ((array) $sidebars_widgets as $index => $sidebar) {
+			if (is_array($sidebar)) {
+				foreach ($sidebar as $i => $name) {
+					if ($base_name == $name) {
 						$sidebars_widgets[$index][$i] = "$name-2";
 						$changed = true;
 						break 2;
@@ -1000,13 +1000,13 @@ 
 			}
 		}
 
-		if ( is_admin() && $changed )
+		if (is_admin() && $changed)
 			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
-		update_option( $option_name, $settings );
+	if (is_admin())
+		update_option($option_name, $settings);
 
 	return $settings;
 }
@@ -1033,11 +1033,11 @@ 
  *                                 Default `</h2>`.
  * }
  */
-function the_widget( $widget, $instance = array(), $args = array() ) {
+function the_widget($widget, $instance = array(), $args = array()) {
 	global $wp_widget_factory;
 
 	$widget_obj = $wp_widget_factory->widgets[$widget];
-	if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+	if ( ! ($widget_obj instanceof WP_Widget)) {
 		return;
 	}
 
@@ -1047,8 +1047,8 @@ 
 		'before_title'  => '<h2 class="widgettitle">',
 		'after_title'   => '</h2>',
 	);
-	$args = wp_parse_args( $args, $default_args );
-	$args['before_widget'] = sprintf( $args['before_widget'], $widget_obj->widget_options['classname'] );
+	$args = wp_parse_args($args, $default_args);
+	$args['before_widget'] = sprintf($args['before_widget'], $widget_obj->widget_options['classname']);
 
 	$instance = wp_parse_args($instance);
 
@@ -1061,7 +1061,7 @@ 
 	 * @param array  $instance The current widget instance's settings.
 	 * @param array  $args     An array of the widget's sidebar arguments.
 	 */
-	do_action( 'the_widget', $widget, $instance, $args );
+	do_action('the_widget', $widget, $instance, $args);
 
 	$widget_obj->_set(-1);
 	$widget_obj->widget($args, $instance);
@@ -1075,8 +1075,8 @@ 
  * @param string $id Widget ID.
  * @return string Widget ID base.
  */
-function _get_widget_id_base( $id ) {
-	return preg_replace( '/-[0-9]+$/', '', $id );
+function _get_widget_id_base($id) {
+	return preg_replace('/-[0-9]+$/', '', $id);
 }
 
 /**
@@ -1090,7 +1090,7 @@ 
 function _wp_sidebars_changed() {
 	global $sidebars_widgets;
 
-	if ( ! is_array( $sidebars_widgets ) )
+	if ( ! is_array($sidebars_widgets))
 		$sidebars_widgets = wp_get_sidebars_widgets();
 
 	retrieve_widgets(true);
@@ -1109,78 +1109,78 @@ 
  *                                   of 'customize' defers updates for the Customizer.
  * @return array|void
  */
-function retrieve_widgets( $theme_changed = false ) {
+function retrieve_widgets($theme_changed = false) {
 	global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
-	$registered_sidebar_keys = array_keys( $wp_registered_sidebars );
+	$registered_sidebar_keys = array_keys($wp_registered_sidebars);
 	$orphaned = 0;
 
-	$old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
-	if ( is_array( $old_sidebars_widgets ) ) {
+	$old_sidebars_widgets = get_theme_mod('sidebars_widgets');
+	if (is_array($old_sidebars_widgets)) {
 		// time() that sidebars were stored is in $old_sidebars_widgets['time']
 		$_sidebars_widgets = $old_sidebars_widgets['data'];
 
-		if ( 'customize' !== $theme_changed ) {
-			remove_theme_mod( 'sidebars_widgets' );
+		if ('customize' !== $theme_changed) {
+			remove_theme_mod('sidebars_widgets');
 		}
 
-		foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-			if ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+		foreach ($_sidebars_widgets as $sidebar => $widgets) {
+			if ('wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr($sidebar, 0, 16)) {
 				continue;
 			}
 
-			if ( !in_array( $sidebar, $registered_sidebar_keys ) ) {
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $widgets;
-				unset( $_sidebars_widgets[$sidebar] );
+			if ( ! in_array($sidebar, $registered_sidebar_keys)) {
+				$_sidebars_widgets['orphaned_widgets_'.++$orphaned] = $widgets;
+				unset($_sidebars_widgets[$sidebar]);
 			}
 		}
 	} else {
-		if ( empty( $sidebars_widgets ) )
+		if (empty($sidebars_widgets))
 			return;
 
-		unset( $sidebars_widgets['array_version'] );
+		unset($sidebars_widgets['array_version']);
 
 		$old = array_keys($sidebars_widgets);
 		sort($old);
 		sort($registered_sidebar_keys);
 
-		if ( $old == $registered_sidebar_keys )
+		if ($old == $registered_sidebar_keys)
 			return;
 
 		$_sidebars_widgets = array(
-			'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
+			'wp_inactive_widgets' => ! empty($sidebars_widgets['wp_inactive_widgets']) ? $sidebars_widgets['wp_inactive_widgets'] : array()
 		);
 
-		unset( $sidebars_widgets['wp_inactive_widgets'] );
+		unset($sidebars_widgets['wp_inactive_widgets']);
 
-		foreach ( $wp_registered_sidebars as $id => $settings ) {
-			if ( $theme_changed ) {
-				$_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+		foreach ($wp_registered_sidebars as $id => $settings) {
+			if ($theme_changed) {
+				$_sidebars_widgets[$id] = array_shift($sidebars_widgets);
 			} else {
 				// no theme change, grab only sidebars that are currently registered
-				if ( isset( $sidebars_widgets[$id] ) ) {
+				if (isset($sidebars_widgets[$id])) {
 					$_sidebars_widgets[$id] = $sidebars_widgets[$id];
-					unset( $sidebars_widgets[$id] );
+					unset($sidebars_widgets[$id]);
 				}
 			}
 		}
 
-		foreach ( $sidebars_widgets as $val ) {
-			if ( is_array($val) && ! empty( $val ) )
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+		foreach ($sidebars_widgets as $val) {
+			if (is_array($val) && ! empty($val))
+				$_sidebars_widgets['orphaned_widgets_'.++$orphaned] = $val;
 		}
 	}
 
 	// discard invalid, theme-specific widgets from sidebars
 	$shown_widgets = array();
 
-	foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-		if ( !is_array($widgets) )
+	foreach ($_sidebars_widgets as $sidebar => $widgets) {
+		if ( ! is_array($widgets))
 			continue;
 
 		$_widgets = array();
-		foreach ( $widgets as $widget ) {
-			if ( isset($wp_registered_widgets[$widget]) )
+		foreach ($widgets as $widget) {
+			if (isset($wp_registered_widgets[$widget]))
 				$_widgets[] = $widget;
 		}
 
@@ -1193,21 +1193,21 @@ 
 
 	// find hidden/lost multi-widget instances
 	$lost_widgets = array();
-	foreach ( $wp_registered_widgets as $key => $val ) {
-		if ( in_array($key, $shown_widgets, true) )
+	foreach ($wp_registered_widgets as $key => $val) {
+		if (in_array($key, $shown_widgets, true))
 			continue;
 
 		$number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
 
-		if ( 2 > (int) $number )
+		if (2 > (int) $number)
 			continue;
 
 		$lost_widgets[] = $key;
 	}
 
 	$sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
-	if ( 'customize' !== $theme_changed ) {
-		wp_set_sidebars_widgets( $sidebars_widgets );
+	if ('customize' !== $theme_changed) {
+		wp_set_sidebars_widgets($sidebars_widgets);
 	}
 
 	return $sidebars_widgets;
@@ -1221,88 +1221,88 @@ 
  * @param string|array|object $rss RSS url.
  * @param array $args Widget arguments.
  */
-function wp_widget_rss_output( $rss, $args = array() ) {
-	if ( is_string( $rss ) ) {
+function wp_widget_rss_output($rss, $args = array()) {
+	if (is_string($rss)) {
 		$rss = fetch_feed($rss);
-	} elseif ( is_array($rss) && isset($rss['url']) ) {
+	} elseif (is_array($rss) && isset($rss['url'])) {
 		$args = $rss;
 		$rss = fetch_feed($rss['url']);
-	} elseif ( !is_object($rss) ) {
+	} elseif ( ! is_object($rss)) {
 		return;
 	}
 
-	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') )
-			echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
+	if (is_wp_error($rss)) {
+		if (is_admin() || current_user_can('manage_options'))
+			echo '<p><strong>'.__('RSS Error:').'</strong> '.$rss->get_error_message().'</p>';
 		return;
 	}
 
-	$default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 );
-	$args = wp_parse_args( $args, $default_args );
+	$default_args = array('show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0);
+	$args = wp_parse_args($args, $default_args);
 
 	$items = (int) $args['items'];
-	if ( $items < 1 || 20 < $items )
+	if ($items < 1 || 20 < $items)
 		$items = 10;
 	$show_summary  = (int) $args['show_summary'];
 	$show_author   = (int) $args['show_author'];
 	$show_date     = (int) $args['show_date'];
 
-	if ( !$rss->get_item_quantity() ) {
-		echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>';
+	if ( ! $rss->get_item_quantity()) {
+		echo '<ul><li>'.__('An error has occurred, which probably means the feed is down. Try again later.').'</li></ul>';
 		$rss->__destruct();
 		unset($rss);
 		return;
 	}
 
 	echo '<ul>';
-	foreach ( $rss->get_items( 0, $items ) as $item ) {
+	foreach ($rss->get_items(0, $items) as $item) {
 		$link = $item->get_link();
-		while ( stristr( $link, 'http' ) != $link ) {
-			$link = substr( $link, 1 );
+		while (stristr($link, 'http') != $link) {
+			$link = substr($link, 1);
 		}
-		$link = esc_url( strip_tags( $link ) );
+		$link = esc_url(strip_tags($link));
 
-		$title = esc_html( trim( strip_tags( $item->get_title() ) ) );
-		if ( empty( $title ) ) {
-			$title = __( 'Untitled' );
+		$title = esc_html(trim(strip_tags($item->get_title())));
+		if (empty($title)) {
+			$title = __('Untitled');
 		}
 
-		$desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
-		$desc = esc_attr( wp_trim_words( $desc, 55, ' [&hellip;]' ) );
+		$desc = @html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'));
+		$desc = esc_attr(wp_trim_words($desc, 55, ' [&hellip;]'));
 
 		$summary = '';
-		if ( $show_summary ) {
+		if ($show_summary) {
 			$summary = $desc;
 
 			// Change existing [...] to [&hellip;].
-			if ( '[...]' == substr( $summary, -5 ) ) {
-				$summary = substr( $summary, 0, -5 ) . '[&hellip;]';
+			if ('[...]' == substr($summary, -5)) {
+				$summary = substr($summary, 0, -5).'[&hellip;]';
 			}
 
-			$summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
+			$summary = '<div class="rssSummary">'.esc_html($summary).'</div>';
 		}
 
 		$date = '';
-		if ( $show_date ) {
-			$date = $item->get_date( 'U' );
+		if ($show_date) {
+			$date = $item->get_date('U');
 
-			if ( $date ) {
-				$date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date ) . '</span>';
+			if ($date) {
+				$date = ' <span class="rss-date">'.date_i18n(get_option('date_format'), $date).'</span>';
 			}
 		}
 
 		$author = '';
-		if ( $show_author ) {
+		if ($show_author) {
 			$author = $item->get_author();
-			if ( is_object($author) ) {
+			if (is_object($author)) {
 				$author = $author->get_name();
-				$author = ' <cite>' . esc_html( strip_tags( $author ) ) . '</cite>';
+				$author = ' <cite>'.esc_html(strip_tags($author)).'</cite>';
 			}
 		}
 
-		if ( $link == '' ) {
+		if ($link == '') {
 			echo "<li>$title{$date}{$summary}{$author}</li>";
-		} elseif ( $show_summary ) {
+		} elseif ($show_summary) {
 			echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>";
 		} else {
 			echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$author}</li>";
@@ -1325,59 +1325,59 @@ 
  * @param array|string $args Values for input fields.
  * @param array $inputs Override default display options.
  */
-function wp_widget_rss_form( $args, $inputs = null ) {
-	$default_inputs = array( 'url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true );
-	$inputs = wp_parse_args( $inputs, $default_inputs );
+function wp_widget_rss_form($args, $inputs = null) {
+	$default_inputs = array('url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true);
+	$inputs = wp_parse_args($inputs, $default_inputs);
 
-	$args['title'] = isset( $args['title'] ) ? $args['title'] : '';
-	$args['url'] = isset( $args['url'] ) ? $args['url'] : '';
-	$args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
+	$args['title'] = isset($args['title']) ? $args['title'] : '';
+	$args['url'] = isset($args['url']) ? $args['url'] : '';
+	$args['items'] = isset($args['items']) ? (int) $args['items'] : 0;
 
-	if ( $args['items'] < 1 || 20 < $args['items'] ) {
+	if ($args['items'] < 1 || 20 < $args['items']) {
 		$args['items'] = 10;
 	}
 
-	$args['show_summary']   = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
-	$args['show_author']    = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
-	$args['show_date']      = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
+	$args['show_summary']   = isset($args['show_summary']) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
+	$args['show_author']    = isset($args['show_author']) ? (int) $args['show_author'] : (int) $inputs['show_author'];
+	$args['show_date']      = isset($args['show_date']) ? (int) $args['show_date'] : (int) $inputs['show_date'];
 
-	if ( ! empty( $args['error'] ) ) {
-		echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
+	if ( ! empty($args['error'])) {
+		echo '<p class="widget-error"><strong>'.__('RSS Error:').'</strong> '.$args['error'].'</p>';
 	}
 
-	$esc_number = esc_attr( $args['number'] );
-	if ( $inputs['url'] ) :
+	$esc_number = esc_attr($args['number']);
+	if ($inputs['url']) :
 ?>
-	<p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
-	<input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p>
-<?php endif; if ( $inputs['title'] ) : ?>
-	<p><label for="rss-title-<?php echo $esc_number; ?>"><?php _e( 'Give the feed a title (optional):' ); ?></label>
-	<input class="widefat" id="rss-title-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][title]" type="text" value="<?php echo esc_attr( $args['title'] ); ?>" /></p>
-<?php endif; if ( $inputs['items'] ) : ?>
-	<p><label for="rss-items-<?php echo $esc_number; ?>"><?php _e( 'How many items would you like to display?' ); ?></label>
+	<p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e('Enter the RSS feed URL here:'); ?></label>
+	<input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url($args['url']); ?>" /></p>
+<?php endif; if ($inputs['title']) : ?>
+	<p><label for="rss-title-<?php echo $esc_number; ?>"><?php _e('Give the feed a title (optional):'); ?></label>
+	<input class="widefat" id="rss-title-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][title]" type="text" value="<?php echo esc_attr($args['title']); ?>" /></p>
+<?php endif; if ($inputs['items']) : ?>
+	<p><label for="rss-items-<?php echo $esc_number; ?>"><?php _e('How many items would you like to display?'); ?></label>
 	<select id="rss-items-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][items]">
 	<?php
-	for ( $i = 1; $i <= 20; ++$i ) {
-		echo "<option value='$i' " . selected( $args['items'], $i, false ) . ">$i</option>";
+	for ($i = 1; $i <= 20; ++$i) {
+		echo "<option value='$i' ".selected($args['items'], $i, false).">$i</option>";
 	}
 	?>
 	</select></p>
-<?php endif; if ( $inputs['show_summary'] ) : ?>
-	<p><input id="rss-show-summary-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_summary]" type="checkbox" value="1" <?php checked( $args['show_summary'] ); ?> />
-	<label for="rss-show-summary-<?php echo $esc_number; ?>"><?php _e( 'Display item content?' ); ?></label></p>
-<?php endif; if ( $inputs['show_author'] ) : ?>
-	<p><input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> />
-	<label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e( 'Display item author if available?' ); ?></label></p>
-<?php endif; if ( $inputs['show_date'] ) : ?>
-	<p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
-	<label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label></p>
+<?php endif; if ($inputs['show_summary']) : ?>
+	<p><input id="rss-show-summary-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_summary]" type="checkbox" value="1" <?php checked($args['show_summary']); ?> />
+	<label for="rss-show-summary-<?php echo $esc_number; ?>"><?php _e('Display item content?'); ?></label></p>
+<?php endif; if ($inputs['show_author']) : ?>
+	<p><input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked($args['show_author']); ?> />
+	<label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e('Display item author if available?'); ?></label></p>
+<?php endif; if ($inputs['show_date']) : ?>
+	<p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked($args['show_date']); ?>/>
+	<label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e('Display item date?'); ?></label></p>
 <?php
 	endif;
-	foreach ( array_keys($default_inputs) as $input ) :
-		if ( 'hidden' === $inputs[$input] ) :
-			$id = str_replace( '_', '-', $input );
+	foreach (array_keys($default_inputs) as $input) :
+		if ('hidden' === $inputs[$input]) :
+			$id = str_replace('_', '-', $input);
 ?>
-	<input type="hidden" id="rss-<?php echo esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" />
+	<input type="hidden" id="rss-<?php echo esc_attr($id); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr($input); ?>]" value="<?php echo esc_attr($args[$input]); ?>" />
 <?php
 		endif;
 	endforeach;
@@ -1399,25 +1399,25 @@ 
  * @param bool $check_feed Optional, default is true. Whether to check feed for errors.
  * @return array
  */
-function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
+function wp_widget_rss_process($widget_rss, $check_feed = true) {
 	$items = (int) $widget_rss['items'];
-	if ( $items < 1 || 20 < $items )
+	if ($items < 1 || 20 < $items)
 		$items = 10;
-	$url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
-	$title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
-	$show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
-	$show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
-	$show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
+	$url           = esc_url_raw(strip_tags($widget_rss['url']));
+	$title         = isset($widget_rss['title']) ? trim(strip_tags($widget_rss['title'])) : '';
+	$show_summary  = isset($widget_rss['show_summary']) ? (int) $widget_rss['show_summary'] : 0;
+	$show_author   = isset($widget_rss['show_author']) ? (int) $widget_rss['show_author'] : 0;
+	$show_date     = isset($widget_rss['show_date']) ? (int) $widget_rss['show_date'] : 0;
 
-	if ( $check_feed ) {
+	if ($check_feed) {
 		$rss = fetch_feed($url);
 		$error = false;
 		$link = '';
-		if ( is_wp_error($rss) ) {
+		if (is_wp_error($rss)) {
 			$error = $rss->get_error_message();
 		} else {
 			$link = esc_url(strip_tags($rss->get_permalink()));
-			while ( stristr($link, 'http') != $link )
+			while (stristr($link, 'http') != $link)
 				$link = substr($link, 1);
 
 			$rss->__destruct();
@@ -1425,7 +1425,7 @@ 
 		}
 	}
 
-	return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' );
+	return compact('title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date');
 }
 
 /**
@@ -1436,7 +1436,7 @@ 
  * @since 2.2.0
  */
 function wp_widgets_init() {
-	if ( !is_blog_installed() )
+	if ( ! is_blog_installed())
 		return;
 
 	register_widget('WP_Widget_Pages');
@@ -1445,7 +1445,7 @@ 
 
 	register_widget('WP_Widget_Archives');
 
-	if ( get_option( 'link_manager_enabled' ) )
+	if (get_option('link_manager_enabled'))
 		register_widget('WP_Widget_Links');
 
 	register_widget('WP_Widget_Meta');
@@ -1471,5 +1471,5 @@ 
 	 *
 	 * @since 2.2.0
 	 */
-	do_action( 'widgets_init' );
+	do_action('widgets_init');
 }

Braces +120 added lines, -81 removed lines

@@ -163,16 +163,18 @@ 
 	global $wp_registered_sidebars;
 	$number = (int) $number;
 
-	if ( is_string($args) )
-		parse_str($args, $args);
+	if ( is_string($args) ) {
+			parse_str($args, $args);
+	}
 
 	for ( $i = 1; $i <= $number; $i++ ) {
 		$_args = $args;
 
-		if ( $number > 1 )
-			$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
-		else
-			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
+		if ( $number > 1 ) {
+					$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
+		} else {
+					$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
+		}
 
 		// Custom specified ID's are suffixed if they exist already.
 		// Automatically generated sidebar names need to be suffixed regardless starting at -0
@@ -388,14 +390,16 @@ 
  * @return string|void Widget description, if available.
  */
 function wp_widget_description( $id ) {
-	if ( !is_scalar($id) )
-		return;
+	if ( !is_scalar($id) ) {
+			return;
+	}
 
 	global $wp_registered_widgets;
 
-	if ( isset($wp_registered_widgets[$id]['description']) )
-		return esc_html( $wp_registered_widgets[$id]['description'] );
-}
+	if ( isset($wp_registered_widgets[$id]['description']) ) {
+			return esc_html( $wp_registered_widgets[$id]['description'] );
+	}
+	}
 
 /**
  * Retrieve description for a sidebar.
@@ -411,14 +415,16 @@ 
  * @return string|void Sidebar description, if available.
  */
 function wp_sidebar_description( $id ) {
-	if ( !is_scalar($id) )
-		return;
+	if ( !is_scalar($id) ) {
+			return;
+	}
 
 	global $wp_registered_sidebars;
 
-	if ( isset($wp_registered_sidebars[$id]['description']) )
-		return esc_html( $wp_registered_sidebars[$id]['description'] );
-}
+	if ( isset($wp_registered_sidebars[$id]['description']) ) {
+			return esc_html( $wp_registered_sidebars[$id]['description'] );
+	}
+	}
 
 /**
  * Remove widget from sidebar.
@@ -484,8 +490,9 @@ 
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
-		return;
+	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) ) {
+			return;
+	}
 
 	$defaults = array('width' => 250, 'height' => 200 ); // height is never used
 	$options = wp_parse_args($options, $defaults);
@@ -502,11 +509,13 @@ 
 
 	$wp_registered_widget_controls[$id] = $widget;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) )
-		return;
+	if ( isset($wp_registered_widget_updates[$id_base]) ) {
+			return;
+	}
 
-	if ( isset($widget['params'][0]['number']) )
-		$widget['params'][0]['number'] = -1;
+	if ( isset($widget['params'][0]['number']) ) {
+			$widget['params'][0]['number'] = -1;
+	}
 
 	unset($widget['width'], $widget['height'], $widget['name'], $widget['id']);
 	$wp_registered_widget_updates[$id_base] = $widget;
@@ -528,8 +537,9 @@ 
 	global $wp_registered_widget_updates;
 
 	if ( isset($wp_registered_widget_updates[$id_base]) ) {
-		if ( empty($update_callback) )
-			unset($wp_registered_widget_updates[$id_base]);
+		if ( empty($update_callback) ) {
+					unset($wp_registered_widget_updates[$id_base]);
+		}
 		return;
 	}
 
@@ -565,8 +575,9 @@ 
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
-		return;
+	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) ) {
+			return;
+	}
 
 	$defaults = array('width' => 250, 'height' => 200 );
 	$options = wp_parse_args($options, $defaults);
@@ -653,7 +664,9 @@ 
 	$did_one = false;
 	foreach ( (array) $sidebars_widgets[$index] as $id ) {
 
-		if ( !isset($wp_registered_widgets[$id]) ) continue;
+		if ( !isset($wp_registered_widgets[$id]) ) {
+			continue;
+		}
 
 		$params = array_merge(
 			array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
@@ -663,10 +676,11 @@ 
 		// Substitute HTML id and class attributes into before_widget
 		$classname_ = '';
 		foreach ( (array) $wp_registered_widgets[$id]['classname'] as $cn ) {
-			if ( is_string($cn) )
-				$classname_ .= '_' . $cn;
-			elseif ( is_object($cn) )
-				$classname_ .= '_' . get_class($cn);
+			if ( is_string($cn) ) {
+							$classname_ .= '_' . $cn;
+			} elseif ( is_object($cn) ) {
+							$classname_ .= '_' . get_class($cn);
+			}
 		}
 		$classname_ = ltrim($classname_, '_');
 		$params[0]['before_widget'] = sprintf($params[0]['before_widget'], $id, $classname_);
@@ -806,8 +820,9 @@ 
 			if ( is_array($widgets) ) {
 				foreach ( $widgets as $widget ) {
 					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && _get_widget_id_base($widget) == $id_base ) ) {
-						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
-							return $sidebar;
+						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] ) {
+													return $sidebar;
+						}
 					}
 				}
 			}
@@ -831,9 +846,10 @@ 
 	$sidebars_widgets = get_option('sidebars_widgets');
 	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
 		if ( ! empty( $sidebars_widgets[ $index ] ) ) {
-			foreach ( (array) $sidebars_widgets[$index] as $widget )
-				if ( array_key_exists($widget, $wp_registered_widgets) )
+			foreach ( (array) $sidebars_widgets[$index] as $widget ) {
+							if ( array_key_exists($widget, $wp_registered_widgets) )
 					return true;
+			}
 		}
 	}
 	return false;
@@ -884,24 +900,27 @@ 
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
 function wp_get_sidebars_widgets( $deprecated = true ) {
-	if ( $deprecated !== true )
-		_deprecated_argument( __FUNCTION__, '2.8.1' );
+	if ( $deprecated !== true ) {
+			_deprecated_argument( __FUNCTION__, '2.8.1' );
+	}
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
 	if ( !is_admin() ) {
-		if ( empty($_wp_sidebars_widgets) )
-			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
+		if ( empty($_wp_sidebars_widgets) ) {
+					$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
+		}
 
 		$sidebars_widgets = $_wp_sidebars_widgets;
 	} else {
 		$sidebars_widgets = get_option('sidebars_widgets', array());
 	}
 
-	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) )
-		unset($sidebars_widgets['array_version']);
+	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) ) {
+			unset($sidebars_widgets['array_version']);
+	}
 
 	/**
 	 * Filters the list of sidebars and their widgets.
@@ -922,8 +941,9 @@ 
  * @param array $sidebars_widgets Sidebar widgets and their settings.
  */
 function wp_set_sidebars_widgets( $sidebars_widgets ) {
-	if ( !isset( $sidebars_widgets['array_version'] ) )
-		$sidebars_widgets['array_version'] = 3;
+	if ( !isset( $sidebars_widgets['array_version'] ) ) {
+			$sidebars_widgets['array_version'] = 3;
+	}
 	update_option( 'sidebars_widgets', $sidebars_widgets );
 }
 
@@ -942,8 +962,9 @@ 
 
 	$defaults = array();
 
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
-		$defaults[$index] = array();
+	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
+			$defaults[$index] = array();
+	}
 
 	return $defaults;
 }
@@ -967,8 +988,9 @@ 
 		$single = true;
 	} else {
 		foreach ( array_keys($settings) as $number ) {
-			if ( 'number' == $number )
-				continue;
+			if ( 'number' == $number ) {
+							continue;
+			}
 			if ( !is_numeric($number) ) {
 				$single = true;
 				break;
@@ -983,8 +1005,9 @@ 
 		if ( is_admin() ) {
 			$sidebars_widgets = get_option('sidebars_widgets');
 		} else {
-			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
-				$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+			if ( empty($GLOBALS['_wp_sidebars_widgets']) ) {
+							$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+			}
 			$sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
 		}
 
@@ -1000,13 +1023,15 @@ 
 			}
 		}
 
-		if ( is_admin() && $changed )
-			update_option('sidebars_widgets', $sidebars_widgets);
+		if ( is_admin() && $changed ) {
+					update_option('sidebars_widgets', $sidebars_widgets);
+		}
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
-		update_option( $option_name, $settings );
+	if ( is_admin() ) {
+			update_option( $option_name, $settings );
+	}
 
 	return $settings;
 }
@@ -1090,8 +1115,9 @@ 
 function _wp_sidebars_changed() {
 	global $sidebars_widgets;
 
-	if ( ! is_array( $sidebars_widgets ) )
-		$sidebars_widgets = wp_get_sidebars_widgets();
+	if ( ! is_array( $sidebars_widgets ) ) {
+			$sidebars_widgets = wp_get_sidebars_widgets();
+	}
 
 	retrieve_widgets(true);
 }
@@ -1135,8 +1161,9 @@ 
 			}
 		}
 	} else {
-		if ( empty( $sidebars_widgets ) )
-			return;
+		if ( empty( $sidebars_widgets ) ) {
+					return;
+		}
 
 		unset( $sidebars_widgets['array_version'] );
 
@@ -1144,8 +1171,9 @@ 
 		sort($old);
 		sort($registered_sidebar_keys);
 
-		if ( $old == $registered_sidebar_keys )
-			return;
+		if ( $old == $registered_sidebar_keys ) {
+					return;
+		}
 
 		$_sidebars_widgets = array(
 			'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
@@ -1166,8 +1194,9 @@ 
 		}
 
 		foreach ( $sidebars_widgets as $val ) {
-			if ( is_array($val) && ! empty( $val ) )
-				$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+			if ( is_array($val) && ! empty( $val ) ) {
+							$_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
+			}
 		}
 	}
 
@@ -1175,13 +1204,15 @@ 
 	$shown_widgets = array();
 
 	foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
-		if ( !is_array($widgets) )
-			continue;
+		if ( !is_array($widgets) ) {
+					continue;
+		}
 
 		$_widgets = array();
 		foreach ( $widgets as $widget ) {
-			if ( isset($wp_registered_widgets[$widget]) )
-				$_widgets[] = $widget;
+			if ( isset($wp_registered_widgets[$widget]) ) {
+							$_widgets[] = $widget;
+			}
 		}
 
 		$_sidebars_widgets[$sidebar] = $_widgets;
@@ -1194,13 +1225,15 @@ 
 	// find hidden/lost multi-widget instances
 	$lost_widgets = array();
 	foreach ( $wp_registered_widgets as $key => $val ) {
-		if ( in_array($key, $shown_widgets, true) )
-			continue;
+		if ( in_array($key, $shown_widgets, true) ) {
+					continue;
+		}
 
 		$number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
 
-		if ( 2 > (int) $number )
-			continue;
+		if ( 2 > (int) $number ) {
+					continue;
+		}
 
 		$lost_widgets[] = $key;
 	}
@@ -1232,8 +1265,9 @@ 
 	}
 
 	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') )
-			echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
+		if ( is_admin() || current_user_can('manage_options') ) {
+					echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
+		}
 		return;
 	}
 
@@ -1241,8 +1275,9 @@ 
 	$args = wp_parse_args( $args, $default_args );
 
 	$items = (int) $args['items'];
-	if ( $items < 1 || 20 < $items )
-		$items = 10;
+	if ( $items < 1 || 20 < $items ) {
+			$items = 10;
+	}
 	$show_summary  = (int) $args['show_summary'];
 	$show_author   = (int) $args['show_author'];
 	$show_date     = (int) $args['show_date'];
@@ -1401,8 +1436,9 @@ 
  */
 function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
 	$items = (int) $widget_rss['items'];
-	if ( $items < 1 || 20 < $items )
-		$items = 10;
+	if ( $items < 1 || 20 < $items ) {
+			$items = 10;
+	}
 	$url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
 	$title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
 	$show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
@@ -1417,8 +1453,9 @@ 
 			$error = $rss->get_error_message();
 		} else {
 			$link = esc_url(strip_tags($rss->get_permalink()));
-			while ( stristr($link, 'http') != $link )
-				$link = substr($link, 1);
+			while ( stristr($link, 'http') != $link ) {
+							$link = substr($link, 1);
+			}
 
 			$rss->__destruct();
 			unset($rss);
@@ -1436,8 +1473,9 @@ 
  * @since 2.2.0
  */
 function wp_widgets_init() {
-	if ( !is_blog_installed() )
-		return;
+	if ( !is_blog_installed() ) {
+			return;
+	}
 
 	register_widget('WP_Widget_Pages');
 
@@ -1445,8 +1483,9 @@ 
 
 	register_widget('WP_Widget_Archives');
 
-	if ( get_option( 'link_manager_enabled' ) )
-		register_widget('WP_Widget_Links');
+	if ( get_option( 'link_manager_enabled' ) ) {
+			register_widget('WP_Widget_Links');
+	}
 
 	register_widget('WP_Widget_Meta');
 

tools/i18n/makepot.php

Doc Comments +10 added lines

@@ -156,6 +156,9 @@ 
 			unlink( $temp_file );
 	}
 
+	/**
+	 * @param string $file
+	 */
 	private function tempnam( $file ) {
 		$tempnam = tempnam( sys_get_temp_dir(), $file );
 		$this->temp_files[] = $tempnam;
@@ -235,6 +238,9 @@ 
 		return $res;
 	}
 
+	/**
+	 * @param string $output
+	 */
 	public function wp_frontend( $dir, $output ) {
 		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
 			return false;
@@ -255,6 +261,9 @@ 
 		) );
 	}
 
+	/**
+	 * @param string $output
+	 */
 	public function wp_admin($dir, $output) {
 		$frontend_pot = $this->tempnam( 'frontend.pot' );
 		if ( false === $frontend_pot ) {
@@ -416,6 +425,7 @@ 
 
 	/**
 	 * Removes any trailing closing comment / PHP tags from the header value
+	 * @param string $str
 	 */
 	private function _cleanup_header_comment( $str ) {
 		return trim( preg_replace( '/\s*(?:\*\/|\?>).*/', '', $str ) );

Spacing +176 added lines, -176 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-require_once dirname( __FILE__ ) . '/not-gettexted.php';
-require_once dirname( __FILE__ ) . '/pot-ext-meta.php';
-require_once dirname( __FILE__ ) . '/extract.php';
+require_once dirname(__FILE__).'/not-gettexted.php';
+require_once dirname(__FILE__).'/pot-ext-meta.php';
+require_once dirname(__FILE__).'/extract.php';
 
-if ( !defined( 'STDERR' ) ) {
-	define( 'STDERR', fopen( 'php://stderr', 'w' ) );
+if ( ! defined('STDERR')) {
+	define('STDERR', fopen('php://stderr', 'w'));
 }
 
 /**
@@ -148,16 +148,16 @@ 
 	);
 
 	public function __construct($deprecated = true) {
-		$this->extractor = new StringExtractor( $this->rules );
+		$this->extractor = new StringExtractor($this->rules);
 	}
 
 	public function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ($this->temp_files as $temp_file)
+			unlink($temp_file);
 	}
 
-	private function tempnam( $file ) {
-		$tempnam = tempnam( sys_get_temp_dir(), $file );
+	private function tempnam($file) {
+		$tempnam = tempnam(sys_get_temp_dir(), $file);
 		$this->temp_files[] = $tempnam;
 		return $tempnam;
 	}
@@ -167,31 +167,31 @@ 
 	}
 
 	private function xgettext($project, $dir, $output_file, $placeholders = array(), $excludes = array(), $includes = array()) {
-		$meta = array_merge( $this->meta['default'], $this->meta[$project] );
-		$placeholders = array_merge( $meta, $placeholders );
-		$meta['output'] = $this->realpath_missing( $output_file );
-		$placeholders['year'] = date( 'Y' );
-		$placeholder_keys = array_map( create_function( '$x', 'return "{".$x."}";' ), array_keys( $placeholders ) );
-		$placeholder_values = array_values( $placeholders );
-		foreach($meta as $key => $value) {
+		$meta = array_merge($this->meta['default'], $this->meta[$project]);
+		$placeholders = array_merge($meta, $placeholders);
+		$meta['output'] = $this->realpath_missing($output_file);
+		$placeholders['year'] = date('Y');
+		$placeholder_keys = array_map(create_function('$x', 'return "{".$x."}";'), array_keys($placeholders));
+		$placeholder_values = array_values($placeholders);
+		foreach ($meta as $key => $value) {
 			$meta[$key] = str_replace($placeholder_keys, $placeholder_values, $value);
 		}
 
-		$originals = $this->extractor->extract_from_directory( $dir, $excludes, $includes );
+		$originals = $this->extractor->extract_from_directory($dir, $excludes, $includes);
 		$pot = new PO;
 		$pot->entries = $originals->entries;
 
-		$pot->set_header( 'Project-Id-Version', $meta['package-name'].' '.$meta['package-version'] );
-		$pot->set_header( 'Report-Msgid-Bugs-To', $meta['msgid-bugs-address'] );
-		$pot->set_header( 'POT-Creation-Date', gmdate( 'Y-m-d H:i:s+00:00' ) );
-		$pot->set_header( 'MIME-Version', '1.0' );
-		$pot->set_header( 'Content-Type', 'text/plain; charset=UTF-8' );
-		$pot->set_header( 'Content-Transfer-Encoding', '8bit' );
-		$pot->set_header( 'PO-Revision-Date', date( 'Y') . '-MO-DA HO:MI+ZONE' );
-		$pot->set_header( 'Last-Translator', 'FULL NAME <EMAIL@ADDRESS>' );
-		$pot->set_header( 'Language-Team', 'LANGUAGE <LL@li.org>' );
-		$pot->set_comment_before_headers( $meta['comments'] );
-		$pot->export_to_file( $output_file );
+		$pot->set_header('Project-Id-Version', $meta['package-name'].' '.$meta['package-version']);
+		$pot->set_header('Report-Msgid-Bugs-To', $meta['msgid-bugs-address']);
+		$pot->set_header('POT-Creation-Date', gmdate('Y-m-d H:i:s+00:00'));
+		$pot->set_header('MIME-Version', '1.0');
+		$pot->set_header('Content-Type', 'text/plain; charset=UTF-8');
+		$pot->set_header('Content-Transfer-Encoding', '8bit');
+		$pot->set_header('PO-Revision-Date', date('Y').'-MO-DA HO:MI+ZONE');
+		$pot->set_header('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>');
+		$pot->set_header('Language-Team', 'LANGUAGE <LL@li.org>');
+		$pot->set_comment_before_headers($meta['comments']);
+		$pot->export_to_file($output_file);
 		return true;
 	}
 
@@ -202,185 +202,185 @@ 
 			'default_output' => 'wordpress.pot',
 			'includes' => array(),
 			'excludes' => array_merge(
-				array( 'wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*', ),
+				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*',),
 				$this->ms_files
 			),
 			'extract_not_gettexted' => false,
 			'not_gettexted_files_filter' => false,
 		);
-		$args = array_merge( $defaults, $args );
-		extract( $args );
+		$args = array_merge($defaults, $args);
+		extract($args);
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
+		if ($wp_version = $this->wp_version($dir))
 			$placeholders['version'] = $wp_version;
 		else
 			return false;
-		$output = is_null( $output )? $default_output : $output;
-		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		$output = is_null($output) ? $default_output : $output;
+		$res = $this->xgettext($project, $dir, $output, $placeholders, $excludes, $includes);
+		if ( ! $res) return false;
 
-		if ( $extract_not_gettexted ) {
+		if ($extract_not_gettexted) {
 			$old_dir = getcwd();
-			$output = realpath( $output );
-			chdir( $dir );
+			$output = realpath($output);
+			chdir($dir);
 			$php_files = NotGettexted::list_php_files('.');
-			$php_files = array_filter( $php_files, $not_gettexted_files_filter );
+			$php_files = array_filter($php_files, $not_gettexted_files_filter);
 			$not_gettexted = new NotGettexted;
-			$res = $not_gettexted->command_extract( $output, $php_files );
-			chdir( $old_dir );
+			$res = $not_gettexted->command_extract($output, $php_files);
+			chdir($old_dir);
 			/* Adding non-gettexted strings can repeat some phrases */
-			$output_shell = escapeshellarg( $output );
-			system( "msguniq --use-first $output_shell -o $output_shell" );
+			$output_shell = escapeshellarg($output);
+			system("msguniq --use-first $output_shell -o $output_shell");
 		}
 		return $res;
 	}
 
-	public function wp_frontend( $dir, $output ) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+	public function wp_frontend($dir, $output) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$excludes = array( 'wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php' );
+		$excludes = array('wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php');
 
 		// Exclude Akismet all together for 3.9+.
-		if ( file_exists( "$dir/wp-admin/css/about.css" ) ) {
+		if (file_exists("$dir/wp-admin/css/about.css")) {
 			$excludes[] = 'wp-content/plugins/akismet/.*';
 		}
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-frontend', 'output' => $output,
 			'includes' => array(),
 			'excludes' => $excludes,
 			'default_output' => 'wordpress.pot',
-		) );
+		));
 	}
 
 	public function wp_admin($dir, $output) {
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) {
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) {
 			return false;
 		}
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result ) {
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result) {
 			return false;
 		}
 
-		$network_admin_files = $this->get_wp_network_admin_files( $dir );
+		$network_admin_files = $this->get_wp_network_admin_files($dir);
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/.*' ),
-			'excludes' => array_merge( array( 'wp-admin/includes/continents-cities\.php' ), $network_admin_files ),
+			'includes' => array('wp-admin/.*'),
+			'excludes' => array_merge(array('wp-admin/includes/continents-cities\.php'), $network_admin_files),
 			'default_output' => 'wordpress-admin.pot',
-		) );
-		if ( ! $result ) {
+		));
+		if ( ! $result) {
 			return false;
 		}
 
 		$potextmeta = new PotExtMeta;
 
-		if ( ! file_exists( "$dir/wp-admin/css/about.css" ) ) { // < 3.9
-			$result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
-			if ( ! $result ) {
+		if ( ! file_exists("$dir/wp-admin/css/about.css")) { // < 3.9
+			$result = $potextmeta->append("$dir/wp-content/plugins/akismet/akismet.php", $output);
+			if ( ! $result) {
 				return false;
 			}
 		}
 
-		$result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
-		if ( ! $result ) {
+		$result = $potextmeta->append("$dir/wp-content/plugins/hello.php", $output);
+		if ( ! $result) {
 			return false;
 		}
 
 		/* Adding non-gettexted strings can repeat some phrases */
-		$output_shell = escapeshellarg( $output );
-		system( "msguniq $output_shell -o $output_shell" );
+		$output_shell = escapeshellarg($output);
+		system("msguniq $output_shell -o $output_shell");
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot ) {
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot) {
 			return false;
 		}
-		$admin_pot = realpath( is_null( $output ) ? 'wordpress-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $admin_pot $common_pot -o $admin_pot" );
+		$admin_pot = realpath(is_null($output) ? 'wordpress-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot");
+		system("msgcat -u --use-first $admin_pot $common_pot -o $admin_pot");
 		return true;
 	}
 
 	public function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) return false;
 
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) return false;
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result)
 			return false;
 
-		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		$admin_pot = $this->tempnam('admin.pot');
+		if (false === $admin_pot) return false;
 
-		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
+		$admin_result = $this->wp_admin($dir, $admin_pot);
+		if ( ! $admin_result)
 			return false;
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
-			'includes' => $this->get_wp_network_admin_files( $dir ),
+			'includes' => $this->get_wp_network_admin_files($dir),
 			'excludes' => array(),
 			'default_output' => 'wordpress-admin-network.pot',
-		) );
+		));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot)
 			return false;
 
-		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot" );
+		$net_admin_pot = realpath(is_null($output) ? 'wordpress-network-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot");
+		system("msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot");
 		return true;
 	}
 
-	private function get_wp_network_admin_files( $dir ) {
-		$wp_version = $this->wp_version( $dir );
+	private function get_wp_network_admin_files($dir) {
+		$wp_version = $this->wp_version($dir);
 
 		// https://core.trac.wordpress.org/ticket/19852
-		$files = array( 'wp-admin/network/.*', 'wp-admin/network.php' );
+		$files = array('wp-admin/network/.*', 'wp-admin/network.php');
 
 		// https://core.trac.wordpress.org/ticket/34910
-		if ( version_compare( $wp_version, '4.5-beta', '>=' ) ) {
-			$files = array_merge( $files, array(
+		if (version_compare($wp_version, '4.5-beta', '>=')) {
+			$files = array_merge($files, array(
 				'wp-admin/includes/class-wp-ms.*',
 				'wp-admin/includes/network.php',
-			) );
+			));
 		}
 
 		return $files;
 	}
 
-	public function wp_tz( $dir, $output ) {
-		return $this->wp_generic( $dir, array(
+	public function wp_tz($dir, $output) {
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-tz', 'output' => $output,
-			'includes' => array( 'wp-admin/includes/continents-cities\.php' ),
+			'includes' => array('wp-admin/includes/continents-cities\.php'),
 			'excludes' => array(),
 			'default_output' => 'wordpress-continents-cities.pot',
-		) );
+		));
 	}
 
-	private function wp_version( $dir ) {
+	private function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
-		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
+		if ( ! is_readable($version_php)) return false;
+		return preg_match('/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents($version_php), $matches) ? $matches[1] : false;
 	}
 
 	public function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if ( ! $extf) return false;
 		$first_lines = '';
-		foreach(range(1, $lines) as $x) {
+		foreach (range(1, $lines) as $x) {
 			$line = fgets($extf);
 			if (feof($extf)) break;
 			if (false === $line) {
@@ -390,10 +390,10 @@ 
 		}
 
 		// PHP will close file handle, but we are good citizens.
-		fclose( $extf );
+		fclose($extf);
 
 		// Make sure we catch CR-only line endings.
-		$first_lines = str_replace( "\r", "\n", $first_lines );
+		$first_lines = str_replace("\r", "\n", $first_lines);
 
 		return $first_lines;
 	}
@@ -407,8 +407,8 @@ 
 		 * - '<?php // Header: Value ?>'
 		 * - '<?php /* Header: Value * / $foo='bar'; ?>'
 		 */
-		if ( preg_match( '/^(?:[ \t]*<\?php)?[ \t\/*#@]*' . preg_quote( $header, '/' ) . ':(.*)$/mi', $source, $matches ) ) {
-			return $this->_cleanup_header_comment( $matches[1] );
+		if (preg_match('/^(?:[ \t]*<\?php)?[ \t\/*#@]*'.preg_quote($header, '/').':(.*)$/mi', $source, $matches)) {
+			return $this->_cleanup_header_comment($matches[1]);
 		} else {
 			return false;
 		}
@@ -417,12 +417,12 @@ 
 	/**
 	 * Removes any trailing closing comment / PHP tags from the header value
 	 */
-	private function _cleanup_header_comment( $str ) {
-		return trim( preg_replace( '/\s*(?:\*\/|\?>).*/', '', $str ) );
+	private function _cleanup_header_comment($str) {
+		return trim(preg_replace('/\s*(?:\*\/|\?>).*/', '', $str));
 	}
 
 	public function generic($dir, $output) {
-		$output = is_null($output)? "generic.pot" : $output;
+		$output = is_null($output) ? "generic.pot" : $output;
 		return $this->xgettext('generic', $dir, $output, array());
 	}
 
@@ -437,53 +437,53 @@ 
 		return $slug;
 	}
 
-	public function wp_plugin( $dir, $output, $slug = null, $args = array() ) {
+	public function wp_plugin($dir, $output, $slug = null, $args = array()) {
 		$defaults = array(
 			'excludes' => array(),
 			'includes' => array(),
 		);
-		$args = array_merge( $defaults, $args );
+		$args = array_merge($defaults, $args);
 		$placeholders = array();
 		// guess plugin slug
 		if (is_null($slug)) {
 			$slug = $this->guess_plugin_slug($dir);
 		}
 
-		$plugins_dir = @opendir( $dir );
+		$plugins_dir = @opendir($dir);
 		$plugin_files = array();
-		if ( $plugins_dir ) {
-			while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-				if ( '.' === substr( $file, 0, 1 ) ) {
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if ('.' === substr($file, 0, 1)) {
 					continue;
 				}
 
-				if ( '.php' === substr( $file, -4 ) ) {
+				if ('.php' === substr($file, -4)) {
 					$plugin_files[] = $file;
 				}
 			}
-			closedir( $plugins_dir );
+			closedir($plugins_dir);
 		}
 
-		if ( empty( $plugin_files ) ) {
+		if (empty($plugin_files)) {
 			return false;
 		}
 
 		$main_file = '';
-		foreach ( $plugin_files as $plugin_file ) {
-			if ( ! is_readable( "$dir/$plugin_file" ) ) {
+		foreach ($plugin_files as $plugin_file) {
+			if ( ! is_readable("$dir/$plugin_file")) {
 				continue;
 			}
 
-			$source = $this->get_first_lines( "$dir/$plugin_file", $this->max_header_lines );
+			$source = $this->get_first_lines("$dir/$plugin_file", $this->max_header_lines);
 
 			// Stop when we find a file with a plugin name header in it.
-			if ( $this->get_addon_header( 'Plugin Name', $source ) != false ) {
+			if ($this->get_addon_header('Plugin Name', $source) != false) {
 				$main_file = "$dir/$plugin_file";
 				break;
 			}
 		}
 
-		if ( empty( $main_file ) ) {
+		if (empty($main_file)) {
 			return false;
 		}
 
@@ -492,9 +492,9 @@ 
 		$placeholders['name'] = $this->get_addon_header('Plugin Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$output = is_null($output)? "$slug.pot" : $output;
-		$res = $this->xgettext( 'wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes'] );
-		if (!$res) return false;
+		$output = is_null($output) ? "$slug.pot" : $output;
+		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes']);
+		if ( ! $res) return false;
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -517,37 +517,37 @@ 
 		$placeholders['name'] = $this->get_addon_header('Theme Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
+		$license = $this->get_addon_header('License', $source);
+		if ($license)
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
 		else
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
+		if ( ! $res)
 			return false;
 		$potextmeta = new PotExtMeta;
-		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
+		$res = $potextmeta->append($main_file, $output, array('Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI'));
+		if ( ! $res)
 			return false;
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
-		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
-		if ( ! $extract_templates ) {
-			$wp_dir = dirname( dirname( dirname( $dir ) ) );
-			$extract_templates = file_exists( "$wp_dir/wp-admin/user/about.php" ) || ! file_exists( "$wp_dir/wp-load.php" );
+		$extract_templates = ! in_array($slug, array('twentyten', 'twentyeleven', 'default', 'classic'));
+		if ( ! $extract_templates) {
+			$wp_dir = dirname(dirname(dirname($dir)));
+			$extract_templates = file_exists("$wp_dir/wp-admin/user/about.php") || ! file_exists("$wp_dir/wp-load.php");
 		}
-		if ( $extract_templates ) {
-			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
+		if ($extract_templates) {
+			$res = $potextmeta->append($dir, $output, array('Template Name'));
+			if ( ! $res)
 				return false;
-			$files = scandir( $dir );
-			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
+			$files = scandir($dir);
+			foreach ($files as $file) {
+				if ('.' == $file[0] || 'CVS' == $file)
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
+				if (is_dir($dir.'/'.$file)) {
+					$res = $potextmeta->append($dir.'/'.$file, $output, array('Template Name'));
+					if ( ! $res)
 						return false;
 				}
 			}
@@ -558,54 +558,54 @@ 
 		return $res;
 	}
 
-	public function glotpress( $dir, $output ) {
-		$output = is_null( $output ) ? "glotpress.pot" : $output;
-		return $this->xgettext( 'glotpress', $dir, $output );
+	public function glotpress($dir, $output) {
+		$output = is_null($output) ? "glotpress.pot" : $output;
+		return $this->xgettext('glotpress', $dir, $output);
 	}
 
-	public function wporg_bb_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg.pot' : $output;
-		return $this->xgettext( 'wporg-bb-forums', $dir, $output, array(), array(
+	public function wporg_bb_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg.pot' : $output;
+		return $this->xgettext('wporg-bb-forums', $dir, $output, array(), array(
 			'bb-plugins/elfakismet/.*',
 			'bb-plugins/support-forum/.*',
 			'themes/.*',
-		) );
+		));
 	}
 
-	public function wporg_themes( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-themes.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(), array(
+	public function wporg_themes($dir, $output) {
+		$output = is_null($output) ? 'wporg-themes.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(), array(
 			'plugins/theme-directory/.*',
 			'themes/pub/wporg-themes/.*'
-		) );
+		));
 	}
 
-	public function wporg_plugins( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-plugins.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(
+	public function wporg_plugins($dir, $output) {
+		$output = is_null($output) ? 'wporg-plugins.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(
 			'plugins/svn-track/i18n-tools/.*'
 			), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function wporg_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-forums.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(), array(
+	public function wporg_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg-forums.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function wordcamporg( $dir, $output ) {
-		$output = is_null( $output ) ? 'wordcamporg.pot' : $output;
-		return $this->xgettext( 'wordcamporg', $dir, $output, array(), array(), array(
+	public function wordcamporg($dir, $output) {
+		$output = is_null($output) ? 'wordcamporg.pot' : $output;
+		return $this->xgettext('wordcamporg', $dir, $output, array(), array(), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function rosetta( $dir, $output ) {
-		$output = is_null( $output )? 'rosetta.pot' : $output;
-		return $this->xgettext( 'rosetta', $dir, $output, array(), array(
+	public function rosetta($dir, $output) {
+		$output = is_null($output) ? 'rosetta.pot' : $output;
+		return $this->xgettext('rosetta', $dir, $output, array(), array(
 			'mu-plugins/rosetta/i18n-tools/.*',
 			'mu-plugins/rosetta/locales/.*',
 			), array(
@@ -615,7 +615,7 @@ 
 			'mu-plugins/rosetta/[^/]+\.php',
 			'mu-plugins/rosetta/tmpl/.*\.php',
 			'themes/rosetta/.*\.php',
-		) );
+		));
 	}
 }
 
@@ -625,7 +625,7 @@ 
 if ($included_files[0] == __FILE__) {
 	$makepot = new MakePOT;
 	if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
-		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
+		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3]) ? $argv[3] : null);
 		if (false === $res) {
 			fwrite(STDERR, "Couldn't generate POT file!\n");
 		}

Braces +61 added lines, -34 removed lines

@@ -152,8 +152,9 @@ 
 	}
 
 	public function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ( $this->temp_files as $temp_file ) {
+					unlink( $temp_file );
+		}
 	}
 
 	private function tempnam( $file ) {
@@ -211,13 +212,16 @@ 
 		$args = array_merge( $defaults, $args );
 		extract( $args );
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
-			$placeholders['version'] = $wp_version;
-		else
-			return false;
+		if ( $wp_version = $this->wp_version( $dir ) ) {
+					$placeholders['version'] = $wp_version;
+		} else {
+					return false;
+		}
 		$output = is_null( $output )? $default_output : $output;
 		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		if ( !$res ) {
+			return false;
+		}
 
 		if ( $extract_not_gettexted ) {
 			$old_dir = getcwd();
@@ -307,21 +311,29 @@ 
 	}
 
 	public function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
 
 		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		if ( false === $frontend_pot ) {
+			return false;
+		}
 
 		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
-			return false;
+		if ( ! $frontend_result ) {
+					return false;
+		}
 
 		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		if ( false === $admin_pot ) {
+			return false;
+		}
 
 		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
-			return false;
+		if ( ! $admin_result ) {
+					return false;
+		}
 
 		$result = $this->wp_generic( $dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
@@ -335,8 +347,9 @@ 
 		}
 
 		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
-			return false;
+		if ( ! $common_pot ) {
+					return false;
+		}
 
 		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
 		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
@@ -372,17 +385,23 @@ 
 
 	private function wp_version( $dir ) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
+		if ( !is_readable( $version_php ) ) {
+			return false;
+		}
 		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
 	}
 
 	public function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if (!$extf) {
+			return false;
+		}
 		$first_lines = '';
 		foreach(range(1, $lines) as $x) {
 			$line = fgets($extf);
-			if (feof($extf)) break;
+			if (feof($extf)) {
+				break;
+			}
 			if (false === $line) {
 				return false;
 			}
@@ -494,7 +513,9 @@ 
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext( 'wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes'] );
-		if (!$res) return false;
+		if (!$res) {
+			return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -518,19 +539,22 @@ 
 		$placeholders['slug'] = $slug;
 
 		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
-		else
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		if ( $license ) {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
+		} else {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		}
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
-			return false;
+		if (! $res ) {
+					return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
-			return false;
+		if ( ! $res ) {
+					return false;
+		}
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
 		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
 		if ( ! $extract_templates ) {
@@ -539,16 +563,19 @@ 
 		}
 		if ( $extract_templates ) {
 			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
-				return false;
+			if ( ! $res ) {
+							return false;
+			}
 			$files = scandir( $dir );
 			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
-					continue;
+				if ( '.' == $file[0] || 'CVS' == $file ) {
+									continue;
+				}
 				if ( is_dir( $dir . '/' . $file ) ) {
 					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
-						return false;
+					if ( ! $res ) {
+											return false;
+					}
 				}
 			}
 		}

tools/i18n/add-textdomain.php

Spacing +27 added lines, -27 removed lines

@@ -7,7 +7,7 @@ 
  */
 error_reporting(E_ALL);
 
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class AddTextdomain {
 
@@ -19,7 +19,7 @@ 
 	 */
 	public function __construct() {
 		$makepot = new MakePOT;
-		$this->funcs = array_keys( $makepot->rules );
+		$this->funcs = array_keys($makepot->rules);
 		$this->funcs[] = 'translate_nooped_plural';
 	}
 
@@ -41,13 +41,13 @@ 
 	 * @param string $source_filename Filename with optional path.
 	 * @param bool   $inplace         True to modifies the PHP file in place. False to print to standard output.
 	 */
-	public function process_file( $domain, $source_filename, $inplace ) {
-		$new_source = $this->process_string( $domain, file_get_contents( $source_filename ) );
+	public function process_file($domain, $source_filename, $inplace) {
+		$new_source = $this->process_string($domain, file_get_contents($source_filename));
 
-		if ( $inplace ) {
-			$f = fopen( $source_filename, 'w' );
-			fwrite( $f, $new_source );
-			fclose( $f );
+		if ($inplace) {
+			$f = fopen($source_filename, 'w');
+			fwrite($f, $new_source);
+			fclose($f);
 		} else {
 			echo $new_source;
 		}
@@ -64,9 +64,9 @@ 
 	 * @param string $string PHP code to parse.
 	 * @return string Modified source.
 	 */
-	public function process_string( $domain, $string ) {
-		$tokens = token_get_all( $string );
-		return $this->process_tokens( $domain, $tokens );
+	public function process_string($domain, $string) {
+		$tokens = token_get_all($string);
+		return $this->process_tokens($domain, $tokens);
 	}
 
 	/**
@@ -79,16 +79,16 @@ 
 	 *                       number in element 2.
 	 * @return string Modified source.
 	 */
-	public function process_tokens( $domain, $tokens ) {
+	public function process_tokens($domain, $tokens) {
 		$this->modified_contents = '';
-		$domain = addslashes( $domain );
+		$domain = addslashes($domain);
 
 		$in_func = false;
 		$args_started = false;
 		$parens_balance = 0;
 		$found_domain = false;
 
-		foreach($tokens as $index => $token) {
+		foreach ($tokens as $index => $token) {
 			$string_success = false;
 			if (is_array($token)) {
 				list($id, $text) = $token;
@@ -103,18 +103,18 @@ 
 					}
 				}
 				$token = $text;
-			} elseif ('(' == $token){
+			} elseif ('(' == $token) {
 				$args_started = true;
 				++$parens_balance;
 			} elseif (')' == $token) {
 				--$parens_balance;
 				if ($in_func && 0 == $parens_balance) {
-					if ( ! $found_domain ) {
+					if ( ! $found_domain) {
 						$token = ", '$domain'";
-						if ( T_WHITESPACE == $tokens[ $index - 1 ][0] ) {
+						if (T_WHITESPACE == $tokens[$index - 1][0]) {
 							$token .= ' '; // Maintain code standards if previously present
 							// Remove previous whitespace token to account for it.
-							$this->modified_contents = trim( $this->modified_contents );
+							$this->modified_contents = trim($this->modified_contents);
 						}
 						$token .= ')';
 					}
@@ -135,26 +135,26 @@ 
 if ($included_files[0] == __FILE__) {
 	$adddomain = new AddTextdomain();
 
-	if (!isset($argv[1]) || !isset($argv[2])) {
+	if ( ! isset($argv[1]) || ! isset($argv[2])) {
 		$adddomain->usage();
 	}
 
 	$inplace = false;
 	if ('-i' == $argv[1]) {
 		$inplace = true;
-		if (!isset($argv[3])) $adddomain->usage();
+		if ( ! isset($argv[3])) $adddomain->usage();
 		array_shift($argv);
 	}
 
-	if ( is_dir( $argv[2] ) ) {
-		$directory = new RecursiveDirectoryIterator( $argv[2], RecursiveDirectoryIterator::SKIP_DOTS );
-		$files = new RecursiveIteratorIterator( $directory );
-		foreach ( $files as $file ) {
-			if ( 'php' === $file->getExtension() ) {
-				$adddomain->process_file( $argv[1], $file->getPathname(), $inplace );
+	if (is_dir($argv[2])) {
+		$directory = new RecursiveDirectoryIterator($argv[2], RecursiveDirectoryIterator::SKIP_DOTS);
+		$files = new RecursiveIteratorIterator($directory);
+		foreach ($files as $file) {
+			if ('php' === $file->getExtension()) {
+				$adddomain->process_file($argv[1], $file->getPathname(), $inplace);
 			}
 		}
 	} else {
-		$adddomain->process_file( $argv[1], $argv[2], $inplace );
+		$adddomain->process_file($argv[1], $argv[2], $inplace);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -142,7 +142,9 @@
 	$inplace = false;
 	if ('-i' == $argv[1]) {
 		$inplace = true;
-		if (!isset($argv[3])) $adddomain->usage();
+		if (!isset($argv[3])) {
+			$adddomain->usage();
+		}
 		array_shift($argv);
 	}
 

tools/i18n/t/AddTextdomainTest.php

Spacing +17 added lines, -17 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/add-textdomain.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/add-textdomain.php';
 
 class AddTextDomainTest extends PHPUnit_Framework_TestCase {
 
@@ -17,30 +17,30 @@ 
 
 	function test_add() {
 		// Copy to a new file, so that we don't corrupt the old one.
-		copy( 'data/add-textdomain-0.php', 'data/add-textdomain-0-work.php' );
-		$this->atd->process_file( 'test-domain', 'data/add-textdomain-0-work.php', true );
-		$this->assertEquals( file_get_contents( 'data/add-textdomain-0-result.php' ), file_get_contents( 'data/add-textdomain-0-work.php' ) );
-		unlink( 'data/add-textdomain-0-work.php' );
+		copy('data/add-textdomain-0.php', 'data/add-textdomain-0-work.php');
+		$this->atd->process_file('test-domain', 'data/add-textdomain-0-work.php', true);
+		$this->assertEquals(file_get_contents('data/add-textdomain-0-result.php'), file_get_contents('data/add-textdomain-0-work.php'));
+		unlink('data/add-textdomain-0-work.php');
 	}
 
 	/**
 	 * @dataProvider data_textdomain_sources
 	 */
-	function test_basic_add_textdomain( $source, $expected ) {
-		$tokens = token_get_all( $source );
-		$result = $this->atd->process_tokens( 'foo', $tokens );
-		$this->assertEquals( $expected, $result );
+	function test_basic_add_textdomain($source, $expected) {
+		$tokens = token_get_all($source);
+		$result = $this->atd->process_tokens('foo', $tokens);
+		$this->assertEquals($expected, $result);
 	}
 
 	function data_textdomain_sources() {
 		return array(
-			array( "<?php __('string'); ?>", "<?php __('string', 'foo'); ?>" ), // Simple single quotes
-			array( '<?php __("string"); ?>', "<?php __(\"string\", 'foo'); ?>" ), // Simple double quotes
-			array( "<?php __( 'string' ); ?>", "<?php __( 'string', 'foo' ); ?>" ), // Simple single quotes CS
-			array( '<?php __( "string" ); ?>', "<?php __( \"string\", 'foo' ); ?>" ), // Simple double quotes CS
-			array( "<?php __( 'string', 'string2' ); ?>", "<?php __( 'string', 'string2', 'foo' ); ?>" ), // Multiple string args
-			array( '<?php __( \'string\', $var ); ?>', '<?php __( \'string\', $var, \'foo\' ); ?>' ), // Multiple string / var args
-			array( "<?php __( 'string', 'foo' ); ?>", "<?php __( 'string', 'foo' ); ?>" ), // Existing textdomain
+			array("<?php __('string'); ?>", "<?php __('string', 'foo'); ?>"), // Simple single quotes
+			array('<?php __("string"); ?>', "<?php __(\"string\", 'foo'); ?>"), // Simple double quotes
+			array("<?php __( 'string' ); ?>", "<?php __( 'string', 'foo' ); ?>"), // Simple single quotes CS
+			array('<?php __( "string" ); ?>', "<?php __( \"string\", 'foo' ); ?>"), // Simple double quotes CS
+			array("<?php __( 'string', 'string2' ); ?>", "<?php __( 'string', 'string2', 'foo' ); ?>"), // Multiple string args
+			array('<?php __( \'string\', $var ); ?>', '<?php __( \'string\', $var, \'foo\' ); ?>'), // Multiple string / var args
+			array("<?php __( 'string', 'foo' ); ?>", "<?php __( 'string', 'foo' ); ?>"), // Existing textdomain
 		);
 	}
 }

tools/i18n/t/ExtractTest.php

Spacing +71 added lines, -71 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once dirname( dirname( __FILE__ ) ) . '/extract.php';
+require_once dirname(dirname(__FILE__)).'/extract.php';
 
 class ExtractTest extends PHPUnit_Framework_TestCase {
 
@@ -12,126 +12,126 @@ 
 	}
 
 	function test_with_just_a_string() {
-		$expected = new Translation_Entry( array( 'singular' => 'baba', 'references' => array('baba.php:1') ) );
-		$result = $this->extractor->extract_from_code('<?php __("baba"); ?>', 'baba.php' );
-		$this->assertEquals( $expected, $result->entries['baba'] );
+		$expected = new Translation_Entry(array('singular' => 'baba', 'references' => array('baba.php:1')));
+		$result = $this->extractor->extract_from_code('<?php __("baba"); ?>', 'baba.php');
+		$this->assertEquals($expected, $result->entries['baba']);
 	}
 
 	function test_entry_from_call_simple() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba' ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba')));
 	}
 
 	function test_entry_from_call_nonexisting_function() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => 'f', 'args' => array('baba') ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$entry = $this->extractor->entry_from_call(array('name' => 'f', 'args' => array('baba')), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_too_few_args() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array() ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array()), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_non_expected_null_arg() {
-		$this->extractor->rules = array( '_nx' => array( 'singular', 'plural', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_nx', 'args' => array('%s baba', null, 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$this->extractor->rules = array('_nx' => array('singular', 'plural', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_nx', 'args' => array('%s baba', null, 'noun')), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_more_args_should_be_ok() {
-		$this->extractor->rules = array( '__' => array('string') );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba', 5, 'pijo', null) ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba' ) ) );
+		$this->extractor->rules = array('__' => array('string'));
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba', 5, 'pijo', null)), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba')));
 	}
 
 
 	function test_entry_from_call_context() {
-		$this->extractor->rules = array( '_x' => array( 'string', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_x', 'args' => array('baba', 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'context' => 'noun' ) ) );
+		$this->extractor->rules = array('_x' => array('string', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_x', 'args' => array('baba', 'noun')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'context' => 'noun')));
 	}
 
 	function test_entry_from_call_plural() {
-		$this->extractor->rules = array( '_n' => array( 'singular', 'plural' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_n', 'args' => array('%s baba', '%s babas') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '%s baba', 'plural' => '%s babas' ) ) );
+		$this->extractor->rules = array('_n' => array('singular', 'plural'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_n', 'args' => array('%s baba', '%s babas')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '%s baba', 'plural' => '%s babas')));
 	}
 
 	function test_entry_from_call_plural_and_context() {
-		$this->extractor->rules = array( '_nx' => array( 'singular', 'plural', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_nx', 'args' => array('%s baba', '%s babas', 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '%s baba', 'plural' => '%s babas', 'context' => 'noun' ) ) );
+		$this->extractor->rules = array('_nx' => array('singular', 'plural', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_nx', 'args' => array('%s baba', '%s babas', 'noun')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '%s baba', 'plural' => '%s babas', 'context' => 'noun')));
 	}
 
 	function test_entry_from_call_extracted_comment() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba'), 'comment' => 'translators: give me back my pants!' ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'extracted_comments' => "translators: give me back my pants!\n" ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba'), 'comment' => 'translators: give me back my pants!'), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'extracted_comments' => "translators: give me back my pants!\n")));
 	}
 
 	function test_entry_from_call_line_number() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba'), 'line' => 10 ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'references' => array('baba.php:10') ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba'), 'line' => 10), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'references' => array('baba.php:10'))));
 	}
 
 	function test_entry_from_call_zero() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('0') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '0' ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('0')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '0')));
 	}
 
 	function test_entry_from_call_multiple() {
-		$this->extractor->rules = array( 'c' => array( 'string', 'singular', 'plural' ) );
-		$entries = $this->extractor->entry_from_call( array( 'name' => 'c', 'args' => array('baba', 'dyado', 'dyados') ), 'baba.php' );
-		$this->assertEquals( array(
-				new Translation_Entry( array( 'singular' => 'baba' ) ), new Translation_Entry( array( 'singular' => 'dyado', 'plural' => 'dyados' ) ) ), $entries );
+		$this->extractor->rules = array('c' => array('string', 'singular', 'plural'));
+		$entries = $this->extractor->entry_from_call(array('name' => 'c', 'args' => array('baba', 'dyado', 'dyados')), 'baba.php');
+		$this->assertEquals(array(
+				new Translation_Entry(array('singular' => 'baba')), new Translation_Entry(array('singular' => 'dyado', 'plural' => 'dyados')) ), $entries);
 	}
 
 	function test_entry_from_call_multiple_first_plural_then_two_strings() {
-		$this->extractor->rules = array( 'c' => array( 'singular', 'plural', null, 'string', 'string' ) );
-		$entries = $this->extractor->entry_from_call( array( 'name' => 'c', 'args' => array('dyado', 'dyados', 'baba', 'foo', 'bar') ), 'baba.php' );
-		$this->assertEquals( array(
-				new Translation_Entry( array( 'singular' => 'dyado', 'plural' => 'dyados' ) ),
-				new Translation_Entry( array( 'singular' => 'foo' ) ),
-				new Translation_Entry( array( 'singular' => 'bar' ) ) ), $entries );
+		$this->extractor->rules = array('c' => array('singular', 'plural', null, 'string', 'string'));
+		$entries = $this->extractor->entry_from_call(array('name' => 'c', 'args' => array('dyado', 'dyados', 'baba', 'foo', 'bar')), 'baba.php');
+		$this->assertEquals(array(
+				new Translation_Entry(array('singular' => 'dyado', 'plural' => 'dyados')),
+				new Translation_Entry(array('singular' => 'foo')),
+				new Translation_Entry(array('singular' => 'bar')) ), $entries);
 	}
 
 	function test_find_function_calls_one_arg_literal() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( 'baba' ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("baba"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array('baba'), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("baba"); ?>'));
 	}
 
 	function test_find_function_calls_one_arg_zero() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( '0' ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("0"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array('0'), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("0"); ?>'));
 	}
 
 	function test_find_function_calls_one_arg_non_literal() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("baba" . "dudu"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("baba" . "dudu"); ?>'));
 	}
 
 	function test_find_function_calls_shouldnt_be_mistaken_by_a_class() {
-		$this->assertEquals( array(), $this->extractor->find_function_calls( array('__'), '<?php class __ { }; ("dyado");' ) );
+		$this->assertEquals(array(), $this->extractor->find_function_calls(array('__'), '<?php class __ { }; ("dyado");'));
 	}
 
 	function test_find_function_calls_2_args_bad_literal() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba" ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f(5, "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba"), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f(5, "baba" ); '));
 	}
 
 	function test_find_function_calls_2_args_bad_literal_bad() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba", null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f(5, "baba", 5 ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba", null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f(5, "baba", 5 ); '));
 	}
 
 	function test_find_function_calls_1_arg_bad_concat() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( "baba" . "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( "baba" . "baba" ); '));
 	}
 
 	function test_find_function_calls_1_arg_bad_function_call() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( g( "baba" ) ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( g( "baba" ) ); '));
 	}
 
 	function test_find_function_calls_2_arg_literal_bad() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( "baba", null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( "baba", null ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array("baba", null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( "baba", null ); '));
 	}
 
 	function test_find_function_calls_2_arg_bad_with_parens_literal() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba" ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( g( "dyado", "chicho", "lelya "), "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba"), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( g( "dyado", "chicho", "lelya "), "baba" ); '));
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 */
 	function test_find_function_calls_with_comment() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: let your ears fly! */ f( "baba" ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: let your ears fly! */ f( "baba" ); ')
 		);
 	}
 
@@ -149,8 +149,8 @@ 
 	 */
 	function test_find_function_calls_with_not_immediate_comment() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: let your ears fly! */ $foo = g ( f( "baba" ) ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: let your ears fly! */ $foo = g ( f( "baba" ) ); ')
 		);
 	}
 
@@ -159,8 +159,8 @@ 
 	 */
 	function test_find_function_calls_with_not_immediate_comment_include_only_latest() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: boo */ /* translators: let your ears fly! */ /* baba */ $foo = g ( f( "baba" ) ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: boo */ /* translators: let your ears fly! */ /* baba */ $foo = g ( f( "baba" ) ); ')
 		);
 	}
 
@@ -168,11 +168,11 @@ 
 	 * @group comment
 	 */
 	function test_find_function_calls_with_multi_line_comment() {
-		$this->assertEquals( array( array(
-				'name' => '__', 'args' => array( 'on' ), 'line' => 6,
+		$this->assertEquals(array(array(
+				'name' => '__', 'args' => array('on'), 'line' => 6,
 				'comment' => "Translators: If there are characters in your language that are not supported by Lato, translate this to 'off'. Do not translate into your own language."
-			) ),
-			$this->extractor->find_function_calls( array( '__' ),
+			)),
+			$this->extractor->find_function_calls(array('__'),
 				"<?php
 				/*
 				 * Translators: If there are characters in your language that are not supported
@@ -187,11 +187,11 @@ 
 	 * @group comment
 	 */
 	function test_find_function_calls_with_c_style_comment() {
-		$this->assertEquals( array( array(
-				'name' => '__', 'args' => array( 'on' ), 'line' => 3,
+		$this->assertEquals(array(array(
+				'name' => '__', 'args' => array('on'), 'line' => 3,
 				'comment' => 'translators: let your ears fly!'
-			) ),
-			$this->extractor->find_function_calls( array( '__' ),
+			)),
+			$this->extractor->find_function_calls(array('__'),
 				"<?php
 				// translators: let your ears fly!
 				__( 'on' );"
@@ -203,11 +203,11 @@ 
 	 * @group comment
 	 */
 	function test_find_function_calls_with_url_in_comment() {
-		$this->assertEquals( array( array(
-				'name' => '__', 'args' => array( 'F j, Y g:i a' ), 'line' => 3,
+		$this->assertEquals(array(array(
+				'name' => '__', 'args' => array('F j, Y g:i a'), 'line' => 3,
 				'comment' => 'translators: localized date and time format, see http://php.net/date'
-			) ),
-			$this->extractor->find_function_calls( array( '__' ),
+			)),
+			$this->extractor->find_function_calls(array('__'),
 				"<?php
 				/* translators: localized date and time format, see http://php.net/date */
 				__( 'F j, Y g:i a' );"
@@ -220,8 +220,8 @@ 
 	 */
 	function test_comment_prefix_should_be_case_insensitive() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'Translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* Translators: let your ears fly! */ f( "baba" ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'Translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* Translators: let your ears fly! */ f( "baba" ); ')
 		);
 	}
 }

tools/i18n/t/data/add-textdomain-0-result.php

Spacing +15 added lines, -15 removed lines

@@ -1,18 +1,18 @@
 <?php
 function call_some_i18n_methods() {
-	__( 'Hello World', 'test-domain' );
-	_e( 'Hello World', 'test-domain' );
-	_n( 'Single', 'Plural', 1, 'test-domain' );
-	_n_noop( 'Single Noop', 'Plural Noop', 1, 'test-domain' );
-	_x( 'Hello World', 'Testing', 'test-domain' );
-	_ex( 'Hello World', 'Testing', 'test-domain' );
-	_nx( 'Hello World', 'Testing', 'test-domain' );
-	_nx_noop( 'Hello World Noop', 'Testing', 'test-domain' );
-	esc_attr__( 'Attribute', 'test-domain' );
-	esc_html__( 'HTML', 'test-domain' );
-	esc_attr_e( 'Attribute', 'test-domain' );
-	esc_html_e( 'HTML', 'test-domain' );
-	esc_attr_x( 'Attribute', 'Testing', 'test-domain' );
-	esc_html_x( 'HTML', 'Testing', 'test-domain' );
-	translate_nooped_plural( 'Plural Noop', 2, 'test-domain' );
+	__('Hello World', 'test-domain');
+	_e('Hello World', 'test-domain');
+	_n('Single', 'Plural', 1, 'test-domain');
+	_n_noop('Single Noop', 'Plural Noop', 1, 'test-domain');
+	_x('Hello World', 'Testing', 'test-domain');
+	_ex('Hello World', 'Testing', 'test-domain');
+	_nx('Hello World', 'Testing', 'test-domain');
+	_nx_noop('Hello World Noop', 'Testing', 'test-domain');
+	esc_attr__('Attribute', 'test-domain');
+	esc_html__('HTML', 'test-domain');
+	esc_attr_e('Attribute', 'test-domain');
+	esc_html_e('HTML', 'test-domain');
+	esc_attr_x('Attribute', 'Testing', 'test-domain');
+	esc_html_x('HTML', 'Testing', 'test-domain');
+	translate_nooped_plural('Plural Noop', 2, 'test-domain');
 }