ntwb / wordpress

src/wp-activate.php

Indentation +4 added lines, -4 removed lines

@@ -43,10 +43,10 @@
 	 * Fires before the Site Activation page is loaded.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );
 

Braces +5 added lines, -2 removed lines

@@ -18,8 +18,9 @@ 
 	die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
+}
 
 // Fix for page title
 $wp_query->is_404 = false;
@@ -144,10 +145,12 @@ 
 					/* translators: 1: site URL, 2: login URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
 				?></p>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<p class="view"><?php
 					/* translators: 1: login URL, 2: network home URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+}
 				?></p>
 			<?php endif;
 		}

Spacing +29 added lines, -29 removed lines

@@ -6,19 +6,19 @@ 
  * @package WordPress
  */
 
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require(dirname(__FILE__).'/wp-load.php');
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require(dirname(__FILE__).'/wp-blog-header.php');
 
-if ( !is_multisite() ) {
-	wp_redirect( wp_registration_url() );
+if ( ! is_multisite()) {
+	wp_redirect(wp_registration_url());
 	die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if (is_object($wp_object_cache))
 	$wp_object_cache->cache_enabled = false;
 
 // Fix for page title
@@ -29,7 +29,7 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'activate_header' );
+do_action('activate_header');
 
 /**
  * Adds an action hook specific to this page.
@@ -46,9 +46,9 @@ 
      *
      * @since 3.0.0
      */
-    do_action( 'activate_wp_head' );
+    do_action('activate_wp_head');
 }
-add_action( 'wp_head', 'do_activate_header' );
+add_action('wp_head', 'do_activate_header');
 
 /**
  * Loads styles specific to this page.
@@ -66,14 +66,14 @@ 
 	</style>
 	<?php
 }
-add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+add_action('wp_head', 'wpmu_activate_stylesheet');
 
-get_header( 'wp-activate' );
+get_header('wp-activate');
 ?>
 
 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
+	<?php if (empty($_GET['key']) && empty($_POST['key'])) { ?>
 
 		<h2><?php _e('Activation Key Required') ?></h2>
 		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
@@ -88,20 +88,20 @@ 
 
 	<?php } else {
 
-		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-		$result = wpmu_activate_signup( $key );
-		if ( is_wp_error($result) ) {
-			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+		$key = ! empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup($key);
+		if (is_wp_error($result)) {
+			if ('already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code()) {
 				$signup = $result->get_error_data();
 				?>
 				<h2><?php _e('Your account is now active!'); ?></h2>
 				<?php
 				echo '<p class="lead-in">';
-				if ( $signup->domain . $signup->path == '' ) {
+				if ($signup->domain.$signup->path == '') {
 					printf(
 						/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-						__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						network_site_url( 'wp-login.php', 'login' ),
+						__('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'),
+						network_site_url('wp-login.php', 'login'),
 						$signup->user_login,
 						$signup->user_email,
 						wp_lostpassword_url()
@@ -109,8 +109,8 @@ 
 				} else {
 					printf(
 						/* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */
-						__( 'Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.' ),
-						'http://' . $signup->domain,
+						__('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'),
+						'http://'.$signup->domain,
 						$signup->domain,
 						$signup->user_login,
 						$signup->user_email,
@@ -120,13 +120,13 @@ 
 				echo '</p>';
 			} else {
 				?>
-				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+				<h2><?php _e('An error occurred during the activation'); ?></h2>
 				<p><?php echo $result->get_error_message(); ?></p>
 				<?php
 			}
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-			$user = get_userdata( (int) $result['user_id'] );
+			$url = isset($result['blog_id']) ? get_home_url((int) $result['blog_id']) : '';
+			$user = get_userdata((int) $result['user_id']);
 			?>
 			<h2><?php _e('Your account is now active!'); ?></h2>
 
@@ -135,19 +135,19 @@ 
 				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
 			</div>
 
-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
-				switch_to_blog( (int) $result['blog_id'] );
+			<?php if ($url && $url != network_home_url('', 'http')) :
+				switch_to_blog((int) $result['blog_id']);
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
 				<p class="view"><?php
 					/* translators: 1: site URL, 2: login URL */
-					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
+					printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, esc_url($login_url));
 				?></p>
 			<?php else: ?>
 				<p class="view"><?php
 					/* translators: 1: login URL, 2: network home URL */
-					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+					printf(__('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.'), network_site_url('wp-login.php', 'login'), network_home_url());
 				?></p>
 			<?php endif;
 		}
@@ -159,4 +159,4 @@ 
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer( 'wp-activate' );
+<?php get_footer('wp-activate');

tools/i18n/t/data/not-gettexted-0.php

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

src/wp-admin/includes/class-wp-filesystem-ssh2.php

Doc Comments +3 added lines, -3 removed lines

@@ -263,7 +263,7 @@ 
 	/**
 	 * @access public
 	 *
-	 * @return bool
+	 * @return string
 	 */
 	public function cwd() {
 		$cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
@@ -290,7 +290,7 @@ 
 	 * @param string $group
 	 * @param bool   $recursive
 	 *
-	 * @return bool
+	 * @return boolean|string
 	 */
 	public function chgrp($file, $group, $recursive = false ) {
 		if ( ! $this->exists($file) )
@@ -334,7 +334,7 @@ 
 	 * @param string     $file      Path to the file.
 	 * @param string|int $owner     A user name or number.
 	 * @param bool       $recursive Optional. If set True changes file owner recursivly. Default False.
-	 * @return bool True on success or false on failure.
+	 * @return boolean|string True on success or false on failure.
 	 */
 	public function chown( $file, $owner, $recursive = false ) {
 		if ( ! $this->exists($file) )

Spacing +108 added lines, -108 removed lines

@@ -52,21 +52,21 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ssh2';
 		$this->errors = new WP_Error();
 
 		//Check if possible to use ssh2 functions.
-		if ( ! extension_loaded('ssh2') ) {
+		if ( ! extension_loaded('ssh2')) {
 			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
 			return;
 		}
-		if ( !function_exists('stream_get_contents') ) {
+		if ( ! function_exists('stream_get_contents')) {
 			$this->errors->add(
 				'ssh2_php_requirement',
 				sprintf(
 					/* translators: %s: stream_get_contents() */
-					__( 'The ssh2 PHP extension is available, however, we require the PHP5 function %s' ),
+					__('The ssh2 PHP extension is available, however, we require the PHP5 function %s'),
 					'<code>stream_get_contents()</code>'
 				)
 			);
@@ -74,34 +74,34 @@ 
 		}
 
 		// Set defaults:
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 22;
 		else
 			$this->options['port'] = $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
+		if ( ! empty ($opt['public_key']) && ! empty ($opt['private_key'])) {
 			$this->options['public_key'] = $opt['public_key'];
 			$this->options['private_key'] = $opt['private_key'];
 
 			$this->options['hostkey'] = array('hostkey' => 'ssh-rsa');
 
 			$this->keys = true;
-		} elseif ( empty ($opt['username']) ) {
+		} elseif (empty ($opt['username'])) {
 			$this->errors->add('empty_username', __('SSH2 username is required'));
 		}
 
-		if ( !empty($opt['username']) )
+		if ( ! empty($opt['username']))
 			$this->options['username'] = $opt['username'];
 
-		if ( empty ($opt['password']) ) {
+		if (empty ($opt['password'])) {
 			// Password can be blank if we are using keys.
-			if ( !$this->keys )
+			if ( ! $this->keys)
 				$this->errors->add('empty_password', __('SSH2 password is required'));
 		} else {
 			$this->options['password'] = $opt['password'];
@@ -114,37 +114,37 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( ! $this->keys ) {
+		if ( ! $this->keys) {
 			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
 		} else {
 			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
 		}
 
-		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to SSH2 Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to SSH2 Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( !$this->keys ) {
-			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-				$this->errors->add( 'auth',
+		if ( ! $this->keys) {
+			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password'])) {
+				$this->errors->add('auth',
 					/* translators: %s: username */
-					sprintf( __( 'Username/Password incorrect for %s' ),
+					sprintf(__('Username/Password incorrect for %s'),
 						$this->options['username']
 					)
 				);
 				return false;
 			}
 		} else {
-			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-				$this->errors->add( 'auth',
+			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'])) {
+				$this->errors->add('auth',
 					/* translators: %s: username */
-					sprintf( __( 'Public and Private keys incorrect for %s' ),
+					sprintf(__('Public and Private keys incorrect for %s'),
 						$this->options['username']
 					)
 				);
@@ -152,12 +152,12 @@ 
 			}
 		}
 
-		$this->sftp_link = ssh2_sftp( $this->link );
-		if ( ! $this->sftp_link ) {
-			$this->errors->add( 'connect',
+		$this->sftp_link = ssh2_sftp($this->link);
+		if ( ! $this->sftp_link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to initialize a SFTP subsystem session with the SSH2 Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
@@ -181,11 +181,11 @@ 
 	 * @param string $path The File/Directory path on the remote server to return
 	 * @return string The ssh2.sftp:// wrapped path to use.
 	 */
-	public function sftp_path( $path ) {
-		if ( '/' === $path ) {
+	public function sftp_path($path) {
+		if ('/' === $path) {
 			$path = '/./';
 		}
-		return 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $path, '/' );
+		return 'ssh2.sftp://'.$this->sftp_link.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -196,25 +196,25 @@ 
 	 * @return bool|string True on success, false on failure. String if the command was executed, `$returnbool`
 	 *                     is false (default), and data from the resulting stream was retrieved.
 	 */
-	public function run_command( $command, $returnbool = false ) {
-		if ( ! $this->link )
+	public function run_command($command, $returnbool = false) {
+		if ( ! $this->link)
 			return false;
 
-		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
-			$this->errors->add( 'command',
+		if ( ! ($stream = ssh2_exec($this->link, $command))) {
+			$this->errors->add('command',
 				/* translators: %s: command */
-				sprintf( __( 'Unable to perform command: %s'),
+				sprintf(__('Unable to perform command: %s'),
 					$command
 				)
 			);
 		} else {
-			stream_set_blocking( $stream, true );
-			stream_set_timeout( $stream, FS_TIMEOUT );
-			$data = stream_get_contents( $stream );
-			fclose( $stream );
+			stream_set_blocking($stream, true);
+			stream_set_timeout($stream, FS_TIMEOUT);
+			$data = stream_get_contents($stream);
+			fclose($stream);
 
-			if ( $returnbool )
-				return ( $data === false ) ? false : '' != trim($data);
+			if ($returnbool)
+				return ($data === false) ? false : '' != trim($data);
 			else
 				return $data;
 		}
@@ -227,8 +227,8 @@ 
 	 * @param string $file
 	 * @return string|false
 	 */
-	public function get_contents( $file ) {
-		return file_get_contents( $this->sftp_path( $file ) );
+	public function get_contents($file) {
+		return file_get_contents($this->sftp_path($file));
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 * @return array
 	 */
 	public function get_contents_array($file) {
-		return file( $this->sftp_path( $file ) );
+		return file($this->sftp_path($file));
 	}
 
 	/**
@@ -249,10 +249,10 @@ 
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
-		$ret = file_put_contents( $this->sftp_path( $file ), $contents );
+	public function put_contents($file, $contents, $mode = false) {
+		$ret = file_put_contents($this->sftp_path($file), $contents);
 
-		if ( $ret !== strlen( $contents ) )
+		if ($ret !== strlen($contents))
 			return false;
 
 		$this->chmod($file, $mode);
@@ -266,9 +266,9 @@ 
 	 * @return bool
 	 */
 	public function cwd() {
-		$cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
-		if ( $cwd ) {
-			$cwd = trailingslashit( trim( $cwd ) );
+		$cwd = ssh2_sftp_realpath($this->sftp_link, '.');
+		if ($cwd) {
+			$cwd = trailingslashit(trim($cwd));
 		}
 		return $cwd;
 	}
@@ -280,7 +280,7 @@ 
 	 * @return bool|string
 	 */
 	public function chdir($dir) {
-		return $this->run_command('cd ' . $dir, true);
+		return $this->run_command('cd '.$dir, true);
 	}
 
 	/**
@@ -292,10 +292,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function chgrp($file, $group, $recursive = false ) {
-		if ( ! $this->exists($file) )
+	public function chgrp($file, $group, $recursive = false) {
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 	}
@@ -309,19 +309,19 @@ 
 	 * @return bool|string
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
 
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
 	}
@@ -336,10 +336,10 @@ 
 	 * @param bool       $recursive Optional. If set True changes file owner recursivly. Default False.
 	 * @return bool True on success or false on failure.
 	 */
-	public function chown( $file, $owner, $recursive = false ) {
-		if ( ! $this->exists($file) )
+	public function chown($file, $owner, $recursive = false) {
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 	}
@@ -351,10 +351,10 @@ 
 	 * @return string|false
 	 */
 	public function owner($file) {
-		$owneruid = @fileowner( $this->sftp_path( $file ) );
-		if ( ! $owneruid )
+		$owneruid = @fileowner($this->sftp_path($file));
+		if ( ! $owneruid)
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		if ( ! function_exists('posix_getpwuid'))
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
@@ -367,7 +367,7 @@ 
 	 * @return string
 	 */
 	public function getchmod($file) {
-		return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
+		return substr(decoct(@fileperms($this->sftp_path($file))), -3);
 	}
 
 	/**
@@ -377,10 +377,10 @@ 
 	 * @return string|false
 	 */
 	public function group($file) {
-		$gid = @filegroup( $this->sftp_path( $file ) );
-		if ( ! $gid )
+		$gid = @filegroup($this->sftp_path($file));
+		if ( ! $gid)
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		if ( ! function_exists('posix_getgrgid'))
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
@@ -396,10 +396,10 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 		$content = $this->get_contents($source);
-		if ( false === $content)
+		if (false === $content)
 			return false;
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -413,7 +413,7 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
+		return @ssh2_sftp_rename($this->sftp_link, $source, $destination);
 	}
 
 	/**
@@ -425,14 +425,14 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
+		if ( ! $recursive)
 			 return ssh2_sftp_rmdir($this->sftp_link, $file);
 		$filelist = $this->dirlist($file);
-		if ( is_array($filelist) ) {
-			foreach ( $filelist as $filename => $fileinfo) {
-				$this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
+		if (is_array($filelist)) {
+			foreach ($filelist as $filename => $fileinfo) {
+				$this->delete($file.'/'.$filename, $recursive, $fileinfo['type']);
 			}
 		}
 		return ssh2_sftp_rmdir($this->sftp_link, $file);
@@ -445,7 +445,7 @@ 
 	 * @return bool
 	 */
 	public function exists($file) {
-		return file_exists( $this->sftp_path( $file ) );
+		return file_exists($this->sftp_path($file));
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		return is_file( $this->sftp_path( $file ) );
+		return is_file($this->sftp_path($file));
 	}
 
 	/**
@@ -465,7 +465,7 @@ 
 	 * @return bool
 	 */
 	public function is_dir($path) {
-		return is_dir( $this->sftp_path( $path ) );
+		return is_dir($this->sftp_path($path));
 	}
 
 	/**
@@ -475,7 +475,7 @@ 
 	 * @return bool
 	 */
 	public function is_readable($file) {
-		return is_readable( $this->sftp_path( $file ) );
+		return is_readable($this->sftp_path($file));
 	}
 
 	/**
@@ -496,7 +496,7 @@ 
 	 * @return int
 	 */
 	public function atime($file) {
-		return fileatime( $this->sftp_path( $file ) );
+		return fileatime($this->sftp_path($file));
 	}
 
 	/**
@@ -506,7 +506,7 @@ 
 	 * @return int
 	 */
 	public function mtime($file) {
-		return filemtime( $this->sftp_path( $file ) );
+		return filemtime($this->sftp_path($file));
 	}
 
 	/**
@@ -516,7 +516,7 @@ 
 	 * @return int
 	 */
 	public function size($file) {
-		return filesize( $this->sftp_path( $file ) );
+		return filesize($this->sftp_path($file));
 	}
 
 	/**
@@ -541,16 +541,16 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
-		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true))
 			return false;
-		if ( $chown )
+		if ($chown)
 			$this->chown($path, $chown);
-		if ( $chgrp )
+		if ($chgrp)
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
@@ -575,54 +575,54 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
 			$path = dirname($path);
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir($path))
 			return false;
 
 		$ret = array();
-		$dir = @dir( $this->sftp_path( $path ) );
+		$dir = @dir($this->sftp_path($path));
 
-		if ( ! $dir )
+		if ( ! $dir)
 			return false;
 
-		while (false !== ($entry = $dir->read()) ) {
+		while (false !== ($entry = $dir->read())) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue; //Do not care about these folders.
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file )
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
+			$struc['number'] = false;
 			$struc['owner']    	= $this->owner($path.'/'.$entry);
 			$struc['group']    	= $this->group($path.'/'.$entry);
 			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			$struc['lastmodunix'] = $this->mtime($path.'/'.$entry);
+			$struc['lastmod']   = date('M j', $struc['lastmodunix']);
+			$struc['time']    	= date('h:i:s', $struc['lastmodunix']);
+			$struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		$dir->close();
 		unset($dir);

Braces +112 added lines, -78 removed lines

@@ -74,15 +74,17 @@ 
 		}
 
 		// Set defaults:
-		if ( empty($opt['port']) )
-			$this->options['port'] = 22;
-		else
-			$this->options['port'] = $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 22;
+		} else {
+					$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
 		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
@@ -96,13 +98,15 @@ 
 			$this->errors->add('empty_username', __('SSH2 username is required'));
 		}
 
-		if ( !empty($opt['username']) )
-			$this->options['username'] = $opt['username'];
+		if ( !empty($opt['username']) ) {
+					$this->options['username'] = $opt['username'];
+		}
 
 		if ( empty ($opt['password']) ) {
 			// Password can be blank if we are using keys.
-			if ( !$this->keys )
-				$this->errors->add('empty_password', __('SSH2 password is required'));
+			if ( !$this->keys ) {
+							$this->errors->add('empty_password', __('SSH2 password is required'));
+			}
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
@@ -197,8 +201,9 @@ 
 	 *                     is false (default), and data from the resulting stream was retrieved.
 	 */
 	public function run_command( $command, $returnbool = false ) {
-		if ( ! $this->link )
-			return false;
+		if ( ! $this->link ) {
+					return false;
+		}
 
 		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
 			$this->errors->add( 'command',
@@ -213,10 +218,11 @@ 
 			$data = stream_get_contents( $stream );
 			fclose( $stream );
 
-			if ( $returnbool )
-				return ( $data === false ) ? false : '' != trim($data);
-			else
-				return $data;
+			if ( $returnbool ) {
+							return ( $data === false ) ? false : '' != trim($data);
+			} else {
+							return $data;
+			}
 		}
 		return false;
 	}
@@ -252,8 +258,9 @@ 
 	public function put_contents($file, $contents, $mode = false ) {
 		$ret = file_put_contents( $this->sftp_path( $file ), $contents );
 
-		if ( $ret !== strlen( $contents ) )
-			return false;
+		if ( $ret !== strlen( $contents ) ) {
+					return false;
+		}
 
 		$this->chmod($file, $mode);
 
@@ -293,10 +300,12 @@ 
 	 * @return bool
 	 */
 	public function chgrp($file, $group, $recursive = false ) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 	}
 
@@ -309,20 +318,23 @@ 
 	 * @return bool|string
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
 
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
 	}
 
@@ -337,10 +349,12 @@ 
 	 * @return bool True on success or false on failure.
 	 */
 	public function chown( $file, $owner, $recursive = false ) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 	}
 
@@ -352,10 +366,12 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner( $this->sftp_path( $file ) );
-		if ( ! $owneruid )
-			return false;
-		if ( ! function_exists('posix_getpwuid') )
-			return $owneruid;
+		if ( ! $owneruid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getpwuid') ) {
+					return $owneruid;
+		}
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
@@ -378,10 +394,12 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup( $this->sftp_path( $file ) );
-		if ( ! $gid )
-			return false;
-		if ( ! function_exists('posix_getgrgid') )
-			return $gid;
+		if ( ! $gid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getgrgid') ) {
+					return $gid;
+		}
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
@@ -396,11 +414,13 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 		$content = $this->get_contents($source);
-		if ( false === $content)
-			return false;
+		if ( false === $content) {
+					return false;
+		}
 		return $this->put_contents($destination, $content, $mode);
 	}
 
@@ -425,10 +445,12 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( 'f' == $type || $this->is_file($file) )
-			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
-			 return ssh2_sftp_rmdir($this->sftp_link, $file);
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return ssh2_sftp_unlink($this->sftp_link, $file);
+		}
+		if ( ! $recursive ) {
+					 return ssh2_sftp_rmdir($this->sftp_link, $file);
+		}
 		$filelist = $this->dirlist($file);
 		if ( is_array($filelist) ) {
 			foreach ( $filelist as $filename => $fileinfo) {
@@ -541,17 +563,22 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
-		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
-			return false;
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
+		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) ) {
+					return false;
+		}
+		if ( $chown ) {
+					$this->chown($path, $chown);
+		}
+		if ( $chgrp ) {
+					$this->chgrp($path, $chgrp);
+		}
 		return true;
 	}
 
@@ -582,27 +609,33 @@ 
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
-			return false;
+		if ( ! $this->is_dir($path) ) {
+					return false;
+		}
 
 		$ret = array();
 		$dir = @dir( $this->sftp_path( $path ) );
 
-		if ( ! $dir )
-			return false;
+		if ( ! $dir ) {
+					return false;
+		}
 
 		while (false !== ($entry = $dir->read()) ) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue; //Do not care about these folders.
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
+			//Do not care about these folders.
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file )
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file ) {
+							continue;
+			}
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
@@ -616,10 +649,11 @@ 
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;

src/wp-includes/date.php

Doc Comments +1 added lines, -1 removed lines

@@ -804,7 +804,7 @@
 	 *
 	 * @param string $compare The compare operator to use
 	 * @param string|array $value The value
-	 * @return string|false|int The value to be used in SQL or false on error.
+	 * @return string The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
 		if ( ! isset( $value ) )

Spacing +197 added lines, -197 removed lines

@@ -60,7 +60,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
+	public $time_keys = array('after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second');
 
 	/**
 	 * Constructor.
@@ -150,37 +150,37 @@ 
 	 *                              Accepts 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
 	 *                              'comment_date', 'comment_date_gmt'.
 	 */
-	public function __construct( $date_query, $default_column = 'post_date' ) {
-		if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
+	public function __construct($date_query, $default_column = 'post_date') {
+		if (isset($date_query['relation']) && 'OR' === strtoupper($date_query['relation'])) {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		if ( ! is_array( $date_query ) ) {
+		if ( ! is_array($date_query)) {
 			return;
 		}
 
 		// Support for passing time-based keys in the top level of the $date_query array.
-		if ( ! isset( $date_query[0] ) && ! empty( $date_query ) ) {
-			$date_query = array( $date_query );
+		if ( ! isset($date_query[0]) && ! empty($date_query)) {
+			$date_query = array($date_query);
 		}
 
-		if ( empty( $date_query ) ) {
+		if (empty($date_query)) {
 			return;
 		}
 
-		if ( ! empty( $date_query['column'] ) ) {
-			$date_query['column'] = esc_sql( $date_query['column'] );
+		if ( ! empty($date_query['column'])) {
+			$date_query['column'] = esc_sql($date_query['column']);
 		} else {
-			$date_query['column'] = esc_sql( $default_column );
+			$date_query['column'] = esc_sql($default_column);
 		}
 
-		$this->column = $this->validate_column( $this->column );
+		$this->column = $this->validate_column($this->column);
 
-		$this->compare = $this->get_compare( $date_query );
+		$this->compare = $this->get_compare($date_query);
 
-		$this->queries = $this->sanitize_query( $date_query );
+		$this->queries = $this->sanitize_query($date_query);
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 *
 	 * @return array Sanitized queries.
 	 */
-	public function sanitize_query( $queries, $parent_query = null ) {
+	public function sanitize_query($queries, $parent_query = null) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -208,37 +208,37 @@ 
 		);
 
 		// Numeric keys should always have array values.
-		foreach ( $queries as $qkey => $qvalue ) {
-			if ( is_numeric( $qkey ) && ! is_array( $qvalue ) ) {
-				unset( $queries[ $qkey ] );
+		foreach ($queries as $qkey => $qvalue) {
+			if (is_numeric($qkey) && ! is_array($qvalue)) {
+				unset($queries[$qkey]);
 			}
 		}
 
 		// Each query should have a value for each default key. Inherit from the parent when possible.
-		foreach ( $defaults as $dkey => $dvalue ) {
-			if ( isset( $queries[ $dkey ] ) ) {
+		foreach ($defaults as $dkey => $dvalue) {
+			if (isset($queries[$dkey])) {
 				continue;
 			}
 
-			if ( isset( $parent_query[ $dkey ] ) ) {
-				$queries[ $dkey ] = $parent_query[ $dkey ];
+			if (isset($parent_query[$dkey])) {
+				$queries[$dkey] = $parent_query[$dkey];
 			} else {
-				$queries[ $dkey ] = $dvalue;
+				$queries[$dkey] = $dvalue;
 			}
 		}
 
 		// Validate the dates passed in the query.
-		if ( $this->is_first_order_clause( $queries ) ) {
-			$this->validate_date_values( $queries );
+		if ($this->is_first_order_clause($queries)) {
+			$this->validate_date_values($queries);
 		}
 
-		foreach ( $queries as $key => $q ) {
-			if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
+		foreach ($queries as $key => $q) {
+			if ( ! is_array($q) || in_array($key, $this->time_keys, true)) {
 				// This is a first-order query. Trust the values and sanitize when building SQL.
-				$cleaned_query[ $key ] = $q;
+				$cleaned_query[$key] = $q;
 			} else {
 				// Any array without a time key is another query, so we recurse.
-				$cleaned_query[] = $this->sanitize_query( $q, $queries );
+				$cleaned_query[] = $this->sanitize_query($q, $queries);
 			}
 		}
 
@@ -257,9 +257,9 @@ 
 	 * @param  array $query Query clause.
 	 * @return bool True if this is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		$time_keys = array_intersect( $this->time_keys, array_keys( $query ) );
-		return ! empty( $time_keys );
+	protected function is_first_order_clause($query) {
+		$time_keys = array_intersect($this->time_keys, array_keys($query));
+		return ! empty($time_keys);
 	}
 
 	/**
@@ -271,9 +271,9 @@ 
 	 * @param array $query A date query or a date subquery.
 	 * @return string The comparison operator.
 	 */
-	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+	public function get_compare($query) {
+		if ( ! empty($query['compare']) && in_array($query['compare'], array('=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN')))
+			return strtoupper($query['compare']);
 
 		return $this->compare;
 	}
@@ -291,8 +291,8 @@ 
 	 * @param  array $date_query The date_query array.
 	 * @return bool  True if all values in the query are valid, false if one or more fail.
 	 */
-	public function validate_date_values( $date_query = array() ) {
-		if ( empty( $date_query ) ) {
+	public function validate_date_values($date_query = array()) {
+		if (empty($date_query)) {
 			return false;
 		}
 
@@ -303,30 +303,30 @@ 
 		 * validation routine continue to be sure that all invalid
 		 * values generate errors too.
 		 */
-		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ){
-			$valid = $this->validate_date_values( $date_query['before'] );
+		if (array_key_exists('before', $date_query) && is_array($date_query['before'])) {
+			$valid = $this->validate_date_values($date_query['before']);
 		}
 
-		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ){
-			$valid = $this->validate_date_values( $date_query['after'] );
+		if (array_key_exists('after', $date_query) && is_array($date_query['after'])) {
+			$valid = $this->validate_date_values($date_query['after']);
 		}
 
 		// Array containing all min-max checks.
 		$min_max_checks = array();
 
 		// Days per year.
-		if ( array_key_exists( 'year', $date_query ) ) {
+		if (array_key_exists('year', $date_query)) {
 			/*
 			 * If a year exists in the date query, we can use it to get the days.
 			 * If multiple years are provided (as in a BETWEEN), use the first one.
 			 */
-			if ( is_array( $date_query['year'] ) ) {
-				$_year = reset( $date_query['year'] );
+			if (is_array($date_query['year'])) {
+				$_year = reset($date_query['year']);
 			} else {
 				$_year = $date_query['year'];
 			}
 
-			$max_days_of_year = date( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1;
+			$max_days_of_year = date('z', mktime(0, 0, 0, 12, 31, $_year)) + 1;
 		} else {
 			// otherwise we use the max of 366 (leap-year)
 			$max_days_of_year = 366;
@@ -356,12 +356,12 @@ 
 		);
 
 		// Weeks per year.
-		if ( isset( $_year ) ) {
+		if (isset($_year)) {
 			/*
 			 * If we have a specific year, use it to calculate number of weeks.
 			 * Note: the number of weeks in a year is the date in which Dec 28 appears.
 			 */
-			$week_count = date( 'W', mktime( 0, 0, 0, 12, 28, $_year ) );
+			$week_count = date('W', mktime(0, 0, 0, 12, 28, $_year));
 
 		} else {
 			// Otherwise set the week-count to a maximum of 53.
@@ -398,26 +398,26 @@ 
 		);
 
 		// Concatenate and throw a notice for each invalid value.
-		foreach ( $min_max_checks as $key => $check ) {
-			if ( ! array_key_exists( $key, $date_query ) ) {
+		foreach ($min_max_checks as $key => $check) {
+			if ( ! array_key_exists($key, $date_query)) {
 				continue;
 			}
 
 			// Throw a notice for each failing value.
-			foreach ( (array) $date_query[ $key ] as $_value ) {
+			foreach ((array) $date_query[$key] as $_value) {
 				$is_between = $_value >= $check['min'] && $_value <= $check['max'];
 
-				if ( ! is_numeric( $_value ) || ! $is_between ) {
+				if ( ! is_numeric($_value) || ! $is_between) {
 					$error = sprintf(
 						/* translators: Date query invalid date message: 1: invalid value, 2: type of value, 3: minimum valid value, 4: maximum valid value */
-						__( 'Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.' ),
-						'<code>' . esc_html( $_value ) . '</code>',
-						'<code>' . esc_html( $key ) . '</code>',
-						'<code>' . esc_html( $check['min'] ) . '</code>',
-						'<code>' . esc_html( $check['max'] ) . '</code>'
+						__('Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.'),
+						'<code>'.esc_html($_value).'</code>',
+						'<code>'.esc_html($key).'</code>',
+						'<code>'.esc_html($check['min']).'</code>',
+						'<code>'.esc_html($check['max']).'</code>'
 					);
 
-					_doing_it_wrong( __CLASS__, $error, '4.1.0' );
+					_doing_it_wrong(__CLASS__, $error, '4.1.0');
 
 					$valid = false;
 				}
@@ -425,49 +425,49 @@ 
 		}
 
 		// If we already have invalid date messages, don't bother running through checkdate().
-		if ( ! $valid ) {
+		if ( ! $valid) {
 			return $valid;
 		}
 
 		$day_month_year_error_msg = '';
 
-		$day_exists   = array_key_exists( 'day', $date_query ) && is_numeric( $date_query['day'] );
-		$month_exists = array_key_exists( 'month', $date_query ) && is_numeric( $date_query['month'] );
-		$year_exists  = array_key_exists( 'year', $date_query ) && is_numeric( $date_query['year'] );
+		$day_exists   = array_key_exists('day', $date_query) && is_numeric($date_query['day']);
+		$month_exists = array_key_exists('month', $date_query) && is_numeric($date_query['month']);
+		$year_exists  = array_key_exists('year', $date_query) && is_numeric($date_query['year']);
 
-		if ( $day_exists && $month_exists && $year_exists ) {
+		if ($day_exists && $month_exists && $year_exists) {
 			// 1. Checking day, month, year combination.
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], $date_query['year'], sprintf( '%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], $date_query['year'], sprintf('%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day']))) {
 				/* translators: 1: year, 2: month, 3: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.' ),
-					'<code>' . esc_html( $date_query['year'] ) . '</code>',
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.'),
+					'<code>'.esc_html($date_query['year']).'</code>',
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 
-		} elseif ( $day_exists && $month_exists ) {
+		} elseif ($day_exists && $month_exists) {
 			/*
 			 * 2. checking day, month combination
 			 * We use 2012 because, as a leap year, it's the most permissive.
 			 */
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], 2012, sprintf( '2012-%s-%s', $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], 2012, sprintf('2012-%s-%s', $date_query['month'], $date_query['day']))) {
 				/* translators: 1: month, 2: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: month %1$s, day %2$s.' ),
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: month %1$s, day %2$s.'),
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 		}
 
-		if ( ! empty( $day_month_year_error_msg ) ) {
-			_doing_it_wrong( __CLASS__, $day_month_year_error_msg, '4.1.0' );
+		if ( ! empty($day_month_year_error_msg)) {
+			_doing_it_wrong(__CLASS__, $day_month_year_error_msg, '4.1.0');
 		}
 
 		return $valid;
@@ -487,7 +487,7 @@ 
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
 	 */
-	public function validate_column( $column ) {
+	public function validate_column($column) {
 		global $wpdb;
 
 		$valid_columns = array(
@@ -497,7 +497,7 @@ 
 		);
 
 		// Attempt to detect a table prefix.
-		if ( false === strpos( $column, '.' ) ) {
+		if (false === strpos($column, '.')) {
 			/**
 			 * Filters the list of valid date query columns.
 			 *
@@ -509,7 +509,7 @@ 
 			 *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt',
 			 *	                           'user_registered'
 			 */
-			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
+			if ( ! in_array($column, apply_filters('date_query_valid_columns', $valid_columns))) {
 				$column = 'post_date';
 			}
 
@@ -534,9 +534,9 @@ 
 			);
 
 			// If it's a known column name, add the appropriate table prefix.
-			foreach ( $known_columns as $table_name => $table_columns ) {
-				if ( in_array( $column, $table_columns ) ) {
-					$column = $table_name . '.' . $column;
+			foreach ($known_columns as $table_name => $table_columns) {
+				if (in_array($column, $table_columns)) {
+					$column = $table_name.'.'.$column;
 					break;
 				}
 			}
@@ -544,7 +544,7 @@ 
 		}
 
 		// Remove unsafe characters.
-		return preg_replace( '/[^a-zA-Z0-9_$\.]/', '', $column );
+		return preg_replace('/[^a-zA-Z0-9_$\.]/', '', $column);
 	}
 
 	/**
@@ -568,7 +568,7 @@ 
 		 * @param string        $where WHERE clause of the date query.
 		 * @param WP_Date_Query $this  The WP_Date_Query instance.
 		 */
-		return apply_filters( 'get_date_sql', $where, $this );
+		return apply_filters('get_date_sql', $where, $this);
 	}
 
 	/**
@@ -588,10 +588,10 @@ 
 	 * }
 	 */
 	protected function get_sql_clauses() {
-		$sql = $this->get_sql_for_query( $this->queries );
+		$sql = $this->get_sql_for_query($this->queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -616,7 +616,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( $query, $depth = 0 ) {
+	protected function get_sql_for_query($query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -628,32 +628,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => $clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => $clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -662,21 +662,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -699,8 +699,8 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_subquery( $query ) {
-		return $this->get_sql_for_clause( $query, '' );
+	protected function get_sql_for_subquery($query) {
+		return $this->get_sql_for_clause($query, '');
 	}
 
 	/**
@@ -718,72 +718,72 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_clause( $query, $parent_query ) {
+	protected function get_sql_for_clause($query, $parent_query) {
 		global $wpdb;
 
 		// The sub-parts of a $where part.
 		$where_parts = array();
 
-		$column = ( ! empty( $query['column'] ) ) ? esc_sql( $query['column'] ) : $this->column;
+		$column = ( ! empty($query['column'])) ? esc_sql($query['column']) : $this->column;
 
-		$column = $this->validate_column( $column );
+		$column = $this->validate_column($column);
 
-		$compare = $this->get_compare( $query );
+		$compare = $this->get_compare($query);
 
-		$inclusive = ! empty( $query['inclusive'] );
+		$inclusive = ! empty($query['inclusive']);
 
 		// Assign greater- and less-than values.
 		$lt = '<';
 		$gt = '>';
 
-		if ( $inclusive ) {
+		if ($inclusive) {
 			$lt .= '=';
 			$gt .= '=';
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) ) {
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty($query['after'])) {
+			$where_parts[] = $wpdb->prepare("$column $gt %s", $this->build_mysql_datetime($query['after'], ! $inclusive));
 		}
-		if ( ! empty( $query['before'] ) ) {
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty($query['before'])) {
+			$where_parts[] = $wpdb->prepare("$column $lt %s", $this->build_mysql_datetime($query['before'], $inclusive));
 		}
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
+		if (isset($query['year']) && $value = $this->build_value($compare, $query['year']))
 			$where_parts[] = "YEAR( $column ) $compare $value";
 
-		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
+		if (isset($query['month']) && $value = $this->build_value($compare, $query['month'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
-		} elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
+		} elseif (isset($query['monthnum']) && $value = $this->build_value($compare, $query['monthnum'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
 		}
-		if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
+		if (isset($query['week']) && false !== ($value = $this->build_value($compare, $query['week']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
+		} elseif (isset($query['w']) && false !== ($value = $this->build_value($compare, $query['w']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
+		if (isset($query['dayofyear']) && $value = $this->build_value($compare, $query['dayofyear']))
 			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
+		if (isset($query['day']) && $value = $this->build_value($compare, $query['day']))
 			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
+		if (isset($query['dayofweek']) && $value = $this->build_value($compare, $query['dayofweek']))
 			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
+		if (isset($query['dayofweek_iso']) && $value = $this->build_value($compare, $query['dayofweek_iso']))
 			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
 
-		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
+		if (isset($query['hour']) || isset($query['minute']) || isset($query['second'])) {
 			// Avoid notices.
-			foreach ( array( 'hour', 'minute', 'second' ) as $unit ) {
-				if ( ! isset( $query[ $unit ] ) ) {
-					$query[ $unit ] = null;
+			foreach (array('hour', 'minute', 'second') as $unit) {
+				if ( ! isset($query[$unit])) {
+					$query[$unit] = null;
 				}
 			}
 
-			if ( $time_query = $this->build_time_query( $column, $compare, $query['hour'], $query['minute'], $query['second'] ) ) {
+			if ($time_query = $this->build_time_query($column, $compare, $query['hour'], $query['minute'], $query['second'])) {
 				$where_parts[] = $time_query;
 			}
 		}
@@ -808,45 +808,45 @@ 
 	 * @param string|array $value The value
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
-	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
+	public function build_value($compare, $value) {
+		if ( ! isset($value))
 			return false;
 
-		switch ( $compare ) {
+		switch ($compare) {
 			case 'IN':
 			case 'NOT IN':
 				$value = (array) $value;
 
 				// Remove non-numeric values.
-				$value = array_filter( $value, 'is_numeric' );
+				$value = array_filter($value, 'is_numeric');
 
-				if ( empty( $value ) ) {
+				if (empty($value)) {
 					return false;
 				}
 
-				return '(' . implode( ',', array_map( 'intval', $value ) ) . ')';
+				return '('.implode(',', array_map('intval', $value)).')';
 
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
-				if ( ! is_array( $value ) || 2 != count( $value ) ) {
-					$value = array( $value, $value );
+				if ( ! is_array($value) || 2 != count($value)) {
+					$value = array($value, $value);
 				} else {
-					$value = array_values( $value );
+					$value = array_values($value);
 				}
 
 				// If either value is non-numeric, bail.
-				foreach ( $value as $v ) {
-					if ( ! is_numeric( $v ) ) {
+				foreach ($value as $v) {
+					if ( ! is_numeric($v)) {
 						return false;
 					}
 				}
 
-				$value = array_map( 'intval', $value );
+				$value = array_map('intval', $value);
 
-				return $value[0] . ' AND ' . $value[1];
+				return $value[0].' AND '.$value[1];
 
 			default;
-				if ( ! is_numeric( $value ) ) {
+				if ( ! is_numeric($value)) {
 					return false;
 				}
 
@@ -871,75 +871,75 @@ 
 	 *                                     Default: false.
 	 * @return string|false A MySQL format date/time or false on failure
 	 */
-	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
-		$now = current_time( 'timestamp' );
+	public function build_mysql_datetime($datetime, $default_to_max = false) {
+		$now = current_time('timestamp');
 
-		if ( ! is_array( $datetime ) ) {
+		if ( ! is_array($datetime)) {
 
 			/*
 			 * Try to parse some common date formats, so we can detect
 			 * the level of precision and support the 'inclusive' parameter.
 			 */
-			if ( preg_match( '/^(\d{4})$/', $datetime, $matches ) ) {
+			if (preg_match('/^(\d{4})$/', $datetime, $matches)) {
 				// Y
 				$datetime = array(
-					'year' => intval( $matches[1] ),
+					'year' => intval($matches[1]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
-					'day'   => intval( $matches[3] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
+					'day'   => intval($matches[3]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d H:i
 				$datetime = array(
-					'year'   => intval( $matches[1] ),
-					'month'  => intval( $matches[2] ),
-					'day'    => intval( $matches[3] ),
-					'hour'   => intval( $matches[4] ),
-					'minute' => intval( $matches[5] ),
+					'year'   => intval($matches[1]),
+					'month'  => intval($matches[2]),
+					'day'    => intval($matches[3]),
+					'hour'   => intval($matches[4]),
+					'minute' => intval($matches[5]),
 				);
 			}
 
 			// If no match is found, we don't support default_to_max.
-			if ( ! is_array( $datetime ) ) {
+			if ( ! is_array($datetime)) {
 				// @todo Timezone issues here possibly
-				return gmdate( 'Y-m-d H:i:s', strtotime( $datetime, $now ) );
+				return gmdate('Y-m-d H:i:s', strtotime($datetime, $now));
 			}
 		}
 
-		$datetime = array_map( 'absint', $datetime );
+		$datetime = array_map('absint', $datetime);
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset($datetime['year']))
+			$datetime['year'] = gmdate('Y', $now);
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset($datetime['month']))
+			$datetime['month'] = ($default_to_max) ? 12 : 1;
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset($datetime['day']))
+			$datetime['day'] = ($default_to_max) ? (int) date('t', mktime(0, 0, 0, $datetime['month'], 1, $datetime['year'])) : 1;
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset($datetime['hour']))
+			$datetime['hour'] = ($default_to_max) ? 23 : 0;
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['minute']))
+			$datetime['minute'] = ($default_to_max) ? 59 : 0;
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['second']))
+			$datetime['second'] = ($default_to_max) ? 59 : 0;
 
-		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
+		return sprintf('%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second']);
 	}
 
 	/**
@@ -959,48 +959,48 @@ 
 	 * @param int|null $second Optional. A second value (0-59).
 	 * @return string|false A query part or false on failure.
 	 */
-	public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
+	public function build_time_query($column, $compare, $hour = null, $minute = null, $second = null) {
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
+		if ( ! isset($hour) && ! isset($minute) && ! isset($second))
 			return false;
 
 		// Complex combined queries aren't supported for multi-value queries
-		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+		if (in_array($compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
+			if (isset($hour) && false !== ($value = $this->build_value($compare, $hour)))
 				$return[] = "HOUR( $column ) $compare $value";
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
+			if (isset($minute) && false !== ($value = $this->build_value($compare, $minute)))
 				$return[] = "MINUTE( $column ) $compare $value";
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
+			if (isset($second) && false !== ($value = $this->build_value($compare, $second)))
 				$return[] = "SECOND( $column ) $compare $value";
 
-			return implode( ' AND ', $return );
+			return implode(' AND ', $return);
 		}
 
 		// Cases where just one unit is set
-		if ( isset( $hour ) && ! isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+		if (isset($hour) && ! isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $hour))) {
 			return "HOUR( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+		} elseif ( ! isset($hour) && isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $minute))) {
 			return "MINUTE( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && ! isset( $minute ) && isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+		} elseif ( ! isset($hour) && ! isset($minute) && isset($second) && false !== ($value = $this->build_value($compare, $second))) {
 			return "SECOND( $column ) $compare $value";
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
+		if ( ! isset($minute))
 			return false;
 
 		$format = $time = '';
 
 		// Hour
-		if ( null !== $hour ) {
+		if (null !== $hour) {
 			$format .= '%H.';
-			$time   .= sprintf( '%02d', $hour ) . '.';
+			$time   .= sprintf('%02d', $hour).'.';
 		} else {
 			$format .= '0.';
 			$time   .= '0.';
@@ -1008,13 +1008,13 @@ 
 
 		// Minute
 		$format .= '%i';
-		$time   .= sprintf( '%02d', $minute );
+		$time   .= sprintf('%02d', $minute);
 
-		if ( isset( $second ) ) {
+		if (isset($second)) {
 			$format .= '%s';
-			$time   .= sprintf( '%02d', $second );
+			$time   .= sprintf('%02d', $second);
 		}
 
-		return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+		return $wpdb->prepare("DATE_FORMAT( $column, %s ) $compare %f", $format, $time);
 	}
 }

Braces +54 added lines, -36 removed lines

@@ -272,8 +272,9 @@ 
 	 * @return string The comparison operator.
 	 */
 	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+					return strtoupper( $query['compare'] );
+		}
 
 		return $this->compare;
 	}
@@ -750,8 +751,9 @@ 
 		}
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
-			$where_parts[] = "YEAR( $column ) $compare $value";
+		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
+					$where_parts[] = "YEAR( $column ) $compare $value";
+		}
 
 		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
@@ -763,17 +765,21 @@ 
 		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
 			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
-			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) ) {
+					$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		}
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
-			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) ) {
+					$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
-			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) ) {
+					$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
-			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) ) {
+					$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		}
 
 		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
 			// Avoid notices.
@@ -809,8 +815,9 @@ 
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
-			return false;
+		if ( ! isset( $value ) ) {
+					return false;
+		}
 
 		switch ( $compare ) {
 			case 'IN':
@@ -921,23 +928,29 @@ 
 
 		$datetime = array_map( 'absint', $datetime );
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset( $datetime['year'] ) ) {
+					$datetime['year'] = gmdate( 'Y', $now );
+		}
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset( $datetime['month'] ) ) {
+					$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		}
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset( $datetime['day'] ) ) {
+					$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		}
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset( $datetime['hour'] ) ) {
+					$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		}
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['minute'] ) ) {
+					$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		}
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['second'] ) ) {
+					$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		}
 
 		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
 	}
@@ -963,21 +976,25 @@ 
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
-			return false;
+		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {
+					return false;
+		}
 
 		// Complex combined queries aren't supported for multi-value queries
 		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
-				$return[] = "HOUR( $column ) $compare $value";
+			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+							$return[] = "HOUR( $column ) $compare $value";
+			}
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
-				$return[] = "MINUTE( $column ) $compare $value";
+			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+							$return[] = "MINUTE( $column ) $compare $value";
+			}
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
-				$return[] = "SECOND( $column ) $compare $value";
+			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+							$return[] = "SECOND( $column ) $compare $value";
+			}
 
 			return implode( ' AND ', $return );
 		}
@@ -992,8 +1009,9 @@ 
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
-			return false;
+		if ( ! isset( $minute ) ) {
+					return false;
+		}
 
 		$format = $time = '';
 

src/wp-includes/deprecated.php

Doc Comments +4 added lines, -5 removed lines

@@ -610,7 +610,7 @@ 
  * @param string $feed_image
  * @param string $exclude
  * @param bool $hierarchical
- * @return false|null
+ * @return false|string
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
 				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
@@ -630,7 +630,7 @@ 
  * @see wp_list_categories()
  *
  * @param string|array $args
- * @return false|null|string
+ * @return false|string
  */
 function wp_list_cats($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
@@ -2101,7 +2101,6 @@ 
  * @param string|int $name            Widget ID.
  * @param callable   $output_callback Run when widget is called.
  * @param string     $classname       Optional. Classname widget option. Default empty.
- * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
@@ -2419,7 +2418,7 @@ 
  * @see count_user_posts()
  *
  * @param int $userid User to count posts for.
- * @return int Number of posts the given user has written.
+ * @return string Number of posts the given user has written.
  */
 function get_usernumposts( $userid ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
@@ -3601,7 +3600,7 @@ 
  * @deprecated 4.4.0 Use get_permalink()
  * @see get_permalink()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
 function post_permalink( $post_id = 0 ) {

Spacing +548 added lines, -548 removed lines

@@ -23,11 +23,11 @@ 
  * @return array Post data.
  */
 function get_postdata($postid) {
-	_deprecated_function( __FUNCTION__, '1.5.1', 'get_post()' );
+	_deprecated_function(__FUNCTION__, '1.5.1', 'get_post()');
 
 	$post = get_post($postid);
 
-	$postdata = array (
+	$postdata = array(
 		'ID' => $post->ID,
 		'Author_ID' => $post->post_author,
 		'Date' => $post->post_date,
@@ -61,12 +61,12 @@ 
 function start_wp() {
 	global $wp_query;
 
-	_deprecated_function( __FUNCTION__, '1.5.0', __('new WordPress Loop') );
+	_deprecated_function(__FUNCTION__, '1.5.0', __('new WordPress Loop'));
 
 	// Since the old style loop is being used, advance the query iterator here.
 	$wp_query->next_post();
 
-	setup_postdata( get_post() );
+	setup_postdata(get_post());
 }
 
 /**
@@ -80,13 +80,13 @@ 
  * @return int Category ID.
  */
 function the_category_ID($echo = true) {
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
+	if ($echo)
 		echo $cat;
 
 	return $cat;
@@ -102,15 +102,15 @@ 
  * @param string $before Optional. Text to display before the category. Default empty.
  * @param string $after  Optional. Text to display after the category. Default empty.
  */
-function the_category_head( $before = '', $after = '' ) {
+function the_category_head($before = '', $after = '') {
 	global $currentcat, $previouscat;
 
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category_by_ID()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
+	if ($currentcat != $previouscat) {
 		echo $before;
 		echo get_the_category_by_ID($currentcat);
 		echo $after;
@@ -132,22 +132,22 @@ 
  * @param int    $limitprev
  * @param string $excluded_categories
  */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
+function previous_post($format = '%', $previous = 'previous post: ', $title = 'yes', $in_same_cat = 'no', $limitprev = 1, $excluded_categories = '') {
 
-	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'previous_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -168,21 +168,21 @@ 
  * @param int $limitnext
  * @param string $excluded_categories
  */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
+function next_post($format = '%', $next = 'next post: ', $title = 'yes', $in_same_cat = 'no', $limitnext = 1, $excluded_categories = '') {
+	_deprecated_function(__FUNCTION__, '2.0.0', 'next_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -202,7 +202,7 @@ 
  * @return bool
  */
 function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level > 1);
@@ -221,7 +221,7 @@ 
  * @return bool
  */
 function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level >= 1);
@@ -240,15 +240,15 @@ 
  * @return bool
  */
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	$post = get_post($post_id);
 	$post_author_data = get_userdata($post->post_author);
 
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
+	if ((($user_id == $post_author_data->ID) && ! ($post->post_status == 'publish' && $author_data->user_level < 2))
 			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
+			 || ($author_data->user_level >= 10)) {
 		return true;
 	} else {
 		return false;
@@ -268,7 +268,7 @@ 
  * @return bool
  */
 function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit, one can delete
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -287,7 +287,7 @@ 
  * @return bool
  */
 function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
@@ -306,7 +306,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's date
  */
 function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
@@ -325,7 +325,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's comments
  */
 function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit a post, one can edit comments made on it
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -344,7 +344,7 @@ 
  * @return bool returns true if $user_id can delete $post_id's comments
  */
 function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit comments, one can delete comments
 	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
@@ -362,11 +362,11 @@ 
  * @return bool
  */
 function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+	if ($user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID)
 		return true;
 	else
 		return false;
@@ -395,11 +395,11 @@ 
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
 						 $show_description = true, $show_rating = false,
 						 $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
@@ -430,7 +430,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -454,12 +454,12 @@ 
  * @param int $limit Limit to X entries. If not specified, all entries are shown.
  * @return array
  */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+function get_linkobjectsbyname($cat_name = "noname", $orderby = 'name', $limit = -1) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	return get_linkobjects($cat_id, $orderby, $limit);
@@ -506,9 +506,9 @@ 
  * @return array
  */
 function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
-	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+	$links = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'limit' => $limit));
 
 	$links_array = array();
 	foreach ($links as $link)
@@ -539,7 +539,7 @@ 
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
 									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -566,7 +566,7 @@ 
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
 							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -581,7 +581,7 @@ 
  * @return int Only returns 0.
  */
 function get_autotoggle($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+	_deprecated_function(__FUNCTION__, '2.1.0');
 	return 0;
 }
 
@@ -613,9 +613,9 @@ 
  * @return false|null
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
-				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
-				   $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children = false, $child_of = 0, $categories = 0,
+				   $recurse = 0, $feed = '', $feed_image = '', $exclude = '', $hierarchical = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
 	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -633,22 +633,22 @@ 
  * @return false|null|string
  */
 function wp_list_cats($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
-	$r = wp_parse_args( $args );
+	$r = wp_parse_args($args);
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
+	if (isset($r['optionall']) && isset($r['all']))
 		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
+	if (isset($r['sort_column']))
 		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
+	if (isset($r['sort_order']))
 		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
+	if (isset($r['optiondates']))
 		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
+	if (isset($r['optioncount']))
 		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
+	if (isset($r['list']))
 		$r['style'] = $r['list'] ? 'list' : 'break';
 	$r['title_li'] = '';
 
@@ -677,14 +677,14 @@ 
 function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
 		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
 		$selected = 0, $exclude = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_dropdown_categories()');
 
 	$show_option_all = '';
-	if ( $optionall )
+	if ($optionall)
 		$show_option_all = $all;
 
 	$show_option_none = '';
-	if ( $optionnone )
+	if ($optionnone)
 		$show_option_none = __('None');
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
@@ -709,7 +709,7 @@ 
  * @return null|string
  */
 function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_authors()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_authors()');
 
 	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
 	return wp_list_authors($args);
@@ -727,7 +727,7 @@ 
  * @return array
  */
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_post_categories()');
 	return wp_get_post_categories($post_ID);
 }
 
@@ -745,7 +745,7 @@ 
  * @return bool|mixed
  */
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_set_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_set_post_categories()');
 	return wp_set_post_categories($post_ID, $post_categories);
 }
 
@@ -764,8 +764,8 @@ 
  * @param bool $show_post_count
  * @return string|null
  */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_archives()' );
+function get_archives($type = '', $limit = '', $format = 'html', $before = '', $after = '', $show_post_count = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_archives()');
 	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 	return wp_get_archives($args);
 }
@@ -783,11 +783,11 @@ 
  * @return string|null
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_author_posts_url()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_author_posts_url()');
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -808,9 +808,9 @@ 
  * @param string $more_file
  * @return string
  */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_link_pages()' );
+function link_pages($before = '<br />', $after = '<br />', $next_or_number = 'number', $nextpagelink = 'next page', $previouspagelink = 'previous page',
+					$pagelink = '%', $more_file = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_link_pages()');
 
 	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 	return wp_link_pages($args);
@@ -827,7 +827,7 @@ 
  * @return string
  */
 function get_settings($option) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_option()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_option()');
 
 	return get_option($option);
 }
@@ -840,7 +840,7 @@ 
  * @see the_permalink()
  */
 function permalink_link() {
-	_deprecated_function( __FUNCTION__, '1.2.0', 'the_permalink()' );
+	_deprecated_function(__FUNCTION__, '1.2.0', 'the_permalink()');
 	the_permalink();
 }
 
@@ -854,7 +854,7 @@ 
  * @param string $deprecated
  */
 function permalink_single_rss($deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.3.0', 'the_permalink_rss()' );
+	_deprecated_function(__FUNCTION__, '2.3.0', 'the_permalink_rss()');
 	the_permalink_rss();
 }
 
@@ -869,11 +869,11 @@ 
  * @return null|string
  */
 function wp_get_links($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
-	if ( strpos( $args, '=' ) === false ) {
+	if (strpos($args, '=') === false) {
 		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
+		$args = add_query_arg('category', $cat_id, $args);
 	}
 
 	$defaults = array(
@@ -892,7 +892,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -923,81 +923,81 @@ 
  */
 function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
 			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if (substr($orderby, 0, 1) == '_') {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ($category == -1) //get_bookmarks uses '' to signify all categories
 		$category = '';
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
+	if ( ! $results)
 		return;
 
 	$output = '';
 
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
+	foreach ((array) $results as $row) {
+		if ( ! isset($row->recently_updated))
 			$row->recently_updated = false;
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_prepend');
 		$the_link = '#';
-		if ( !empty($row->link_url) )
+		if ( ! empty($row->link_url))
 			$the_link = esc_url($row->link_url);
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ('' != $rel)
+			$rel = ' rel="'.$rel.'"';
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
+		if ($show_updated)
 			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+				$title .= ' ('.__('Last updated').' '.date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)).')';
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ('' != $title)
+			$title = ' title="'.$title.'"';
 
-		$alt = ' alt="' . $name . '"';
+		$alt = ' alt="'.$name.'"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ('' != $target)
+			$target = ' target="'.$target.'"';
 
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+		if ($row->link_image != null && $show_images) {
+			if (strpos($row->link_image, 'http') !== false)
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$row->link_image\" $alt $title />";
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_append');
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ($show_description && '' != $desc)
+			$output .= $between.$desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
+			$output .= $between.get_linkrating($row);
 		}
 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
+	if ( ! $echo)
 		return $output;
 	echo $output;
 }
@@ -1015,29 +1015,29 @@ 
  * @param string $order Sort link categories by 'name' or 'id'
  */
 function get_links_list($order = 'name') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
 	$order = strtolower($order);
 
 	// Handle link category sorting
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ('_' == substr($order, 0, 1)) {
 		$direction = 'DESC';
-		$order = substr($order,1);
+		$order = substr($order, 1);
 	}
 
-	if ( !isset($direction) )
+	if ( ! isset($direction))
 		$direction = '';
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
 	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
+	if ($cats) {
+		foreach ((array) $cats as $cat) {
 			// Handle each category.
 
 			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+			echo '  <li id="linkcat-'.$cat->term_id.'" class="linkcat"><h2>'.apply_filters('link_category', $cat->name)."</h2>\n\t<ul>\n";
 			// Call get_links() with all the appropriate params
 			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
 
@@ -1059,8 +1059,8 @@ 
  * @param string $file the page to open in the popup window
  * @param bool $count the number of links in the db
  */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+function links_popup_script($text = 'Links', $width = 400, $height = 400, $file = 'links.all.php', $count = true) {
+	_deprecated_function(__FUNCTION__, '2.1.0');
 }
 
 /**
@@ -1073,8 +1073,8 @@ 
  * @param object $link Link object.
  * @return mixed Value of the 'link_rating' field, false otherwise.
  */
-function get_linkrating( $link ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'sanitize_bookmark_field()' );
+function get_linkrating($link) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'sanitize_bookmark_field()');
 	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
 }
 
@@ -1089,16 +1089,16 @@ 
  * @return string
  */
 function get_linkcatname($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_category()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_category()');
 
 	$id = (int) $id;
 
-	if ( empty($id) )
+	if (empty($id))
 		return '';
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
+	if (empty($cats) || ! is_array($cats))
 		return '';
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
@@ -1117,7 +1117,7 @@ 
  * @param string $link_text
  */
 function comments_rss_link($link_text = 'Comments RSS') {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'post_comments_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'post_comments_feed_link()');
 	post_comments_feed_link($link_text);
 }
 
@@ -1133,11 +1133,11 @@ 
  * @return string
  */
 function get_category_rss_link($echo = false, $cat_ID = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_category_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_category_feed_link()');
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1154,10 +1154,10 @@ 
  * @return string
  */
 function get_author_rss_link($echo = false, $author_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_author_feed_link()');
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1172,8 +1172,8 @@ 
  * @return string
  */
 function comments_rss() {
-	_deprecated_function( __FUNCTION__, '2.2.0', 'get_post_comments_feed_link()' );
-	return esc_url( get_post_comments_feed_link() );
+	_deprecated_function(__FUNCTION__, '2.2.0', 'get_post_comments_feed_link()');
+	return esc_url(get_post_comments_feed_link());
 }
 
 /**
@@ -1189,7 +1189,7 @@ 
  * @return int The new user's ID.
  */
 function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'wp_create_user()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'wp_create_user()');
 	return wp_create_user($username, $password, $email);
 }
 
@@ -1199,7 +1199,7 @@ 
  * @deprecated 2.5.0
  */
 function gzip_compression() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 	return false;
 }
 
@@ -1215,8 +1215,8 @@ 
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7.0', 'get_comment()' );
+function get_commentdata($comment_ID, $no_cache = 0, $include_unapproved = false) {
+	_deprecated_function(__FUNCTION__, '2.7.0', 'get_comment()');
 	return get_comment($comment_ID, ARRAY_A);
 }
 
@@ -1230,9 +1230,9 @@ 
  * @param int $cat_ID Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+function get_catname($cat_ID) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_cat_name()');
+	return get_cat_name($cat_ID);
 }
 
 /**
@@ -1248,25 +1248,25 @@ 
  * @param array $visited Optional. Category Term IDs that have already been added.
  * @return string
  */
-function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
+function get_category_children($id, $before = '/', $after = '', $visited = array()) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_term_children()');
+	if (0 == $id)
 		return '';
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
-	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
+	foreach ((array) $cat_ids as $cat_id) {
+		if ($cat_id == $id)
 			continue;
 
-		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
+		$category = get_category($cat_id);
+		if (is_wp_error($category))
 			return $category;
-		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
+		if ($category->parent == $id && ! in_array($category->term_id, $visited)) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
-			$chain .= get_category_children( $category->term_id, $before, $after );
+			$chain .= get_category_children($category->term_id, $before, $after);
 		}
 	}
 	return $chain;
@@ -1284,11 +1284,11 @@ 
  * @return object List of all of the category IDs.
  */
 function get_all_category_ids() {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'get_terms()' );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'get_terms()');
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
+	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category')) {
+		$cat_ids = get_terms('category', array('fields' => 'ids', 'get' => 'all'));
+		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
 	return $cat_ids;
@@ -1304,7 +1304,7 @@ 
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')');
 	return get_the_author_meta('description');
 }
 
@@ -1316,7 +1316,7 @@ 
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'description\')');
 	the_author_meta('description');
 }
 
@@ -1330,7 +1330,7 @@ 
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')');
 	return get_the_author_meta('login');
 }
 
@@ -1342,7 +1342,7 @@ 
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'login\')');
 	the_author_meta('login');
 }
 
@@ -1356,7 +1356,7 @@ 
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')');
 	return get_the_author_meta('first_name');
 }
 
@@ -1368,7 +1368,7 @@ 
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')');
 	the_author_meta('first_name');
 }
 
@@ -1382,7 +1382,7 @@ 
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')');
 	return get_the_author_meta('last_name');
 }
 
@@ -1394,7 +1394,7 @@ 
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')');
 	the_author_meta('last_name');
 }
 
@@ -1408,7 +1408,7 @@ 
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')');
 	return get_the_author_meta('nickname');
 }
 
@@ -1420,7 +1420,7 @@ 
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')');
 	the_author_meta('nickname');
 }
 
@@ -1434,7 +1434,7 @@ 
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')');
 	return get_the_author_meta('email');
 }
 
@@ -1446,7 +1446,7 @@ 
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'email\')');
 	the_author_meta('email');
 }
 
@@ -1460,7 +1460,7 @@ 
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')');
 	return get_the_author_meta('icq');
 }
 
@@ -1472,7 +1472,7 @@ 
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')');
 	the_author_meta('icq');
 }
 
@@ -1486,7 +1486,7 @@ 
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')');
 	return get_the_author_meta('yim');
 }
 
@@ -1498,7 +1498,7 @@ 
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')');
 	the_author_meta('yim');
 }
 
@@ -1512,7 +1512,7 @@ 
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')');
 	return get_the_author_meta('msn');
 }
 
@@ -1524,7 +1524,7 @@ 
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')');
 	the_author_meta('msn');
 }
 
@@ -1538,7 +1538,7 @@ 
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')');
 	return get_the_author_meta('aim');
 }
 
@@ -1550,7 +1550,7 @@ 
  * @see the_author_meta()
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')');
 	the_author_meta('aim');
 }
 
@@ -1564,8 +1564,8 @@ 
  * @param int $auth_id The ID of the author.
  * @return string The author's display name.
  */
-function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')' );
+function get_author_name($auth_id = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')');
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1579,7 +1579,7 @@ 
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')');
 	return get_the_author_meta('url');
 }
 
@@ -1591,7 +1591,7 @@ 
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'url\')');
 	the_author_meta('url');
 }
 
@@ -1605,7 +1605,7 @@ 
  * @return string|int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')');
 	return get_the_author_meta('ID');
 }
 
@@ -1617,7 +1617,7 @@ 
  * @see the_author_meta()
  */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')');
 	the_author_meta('ID');
 }
 
@@ -1649,23 +1649,23 @@ 
  * @param int $cut Optional. Amount of words to keep for the content.
  * @param int $encode_html Optional. How to encode the content.
  */
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
+function the_content_rss($more_link_text = '(more...)', $stripteaser = 0, $more_file = '', $cut = 0, $encode_html = 0) {
+	_deprecated_function(__FUNCTION__, '2.9.0', 'the_content_feed');
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
+	if ($cut && ! $encode_html)
 		$encode_html = 2;
-	if ( 1== $encode_html ) {
+	if (1 == $encode_html) {
 		$content = esc_html($content);
 		$cut = 0;
-	} elseif ( 0 == $encode_html ) {
+	} elseif (0 == $encode_html) {
 		$content = make_url_footnote($content);
-	} elseif ( 2 == $encode_html ) {
+	} elseif (2 == $encode_html) {
 		$content = strip_tags($content);
 	}
-	if ( $cut ) {
+	if ($cut) {
 		$blah = explode(' ', $content);
-		if ( count($blah) > $cut ) {
+		if (count($blah) > $cut) {
 			$k = $cut;
 			$use_dotdotdot = 1;
 		} else {
@@ -1674,7 +1674,7 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
+		for ($i = 0; $i < $k; $i++)
 			$excerpt .= $blah[$i].' ';
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
@@ -1695,20 +1695,20 @@ 
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
  */
-function make_url_footnote( $content ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '' );
-	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
+function make_url_footnote($content) {
+	_deprecated_function(__FUNCTION__, '2.9.0', '');
+	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$links_summary = "\n";
-	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
+	for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
 		$link_match = $matches[0][$i];
-		$link_number = '['.($i+1).']';
+		$link_number = '['.($i + 1).']';
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
-		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-		$links_summary .= "\n" . $link_number . ' ' . $link_url;
+		$content = str_replace($link_match, $link_text.' '.$link_number, $content);
+		$link_url = ((strtolower(substr($link_url, 0, 7)) != 'http://') && (strtolower(substr($link_url, 0, 8)) != 'https://')) ? get_option('home').$link_url : $link_url;
+		$links_summary .= "\n".$link_number.' '.$link_url;
 	}
-	$content  = strip_tags( $content );
+	$content  = strip_tags($content);
 	$content .= $links_summary;
 	return $content;
 }
@@ -1734,9 +1734,9 @@ 
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _c( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function _c($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1751,9 +1751,9 @@ 
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function translate_with_context($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1772,9 +1772,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_nx()' );
-	return before_last_bar( _n( $single, $plural, $number, $domain ) );
+function _nc($single, $plural, $number, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_nx()');
+	return before_last_bar(_n($single, $plural, $number, $domain));
 }
 
 /**
@@ -1785,7 +1785,7 @@ 
  * @see _n()
  */
 function __ngettext() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n()');
 	$args = func_get_args();
 	return call_user_func_array('_n', $args);
 }
@@ -1798,7 +1798,7 @@ 
  * @see _n_noop()
  */
 function __ngettext_noop() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n_noop()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n_noop()');
 	$args = func_get_args();
 	return call_user_func_array('_n_noop', $args);
 
@@ -1814,7 +1814,7 @@ 
  * @return array List of all options.
  */
 function get_alloptions() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_load_alloptions()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_load_alloptions()');
 	return wp_load_alloptions();
 }
 
@@ -1832,14 +1832,14 @@ 
  * @return string
  */
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_link()');
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+	if (('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
 		return __('Missing Attachment');
 
-	if ( $permalink )
+	if ($permalink)
 		$url = get_attachment_link($_post->ID);
 
 	$post_title = esc_attr($_post->post_title);
@@ -1859,31 +1859,31 @@ 
  * @param bool $fullsize Optional, default to false. Whether to have full image.
  * @return array Icon URL and full path to file, respectively.
  */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
+function get_attachment_icon_src($id = 0, $fullsize = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+	if ( ! $fullsize && $src = wp_get_attachment_thumb_url($post->ID)) {
 		// We have a thumbnail desired, specified and existing
 
 		$src_file = basename($src);
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
+	} elseif (wp_attachment_is_image($post->ID)) {
 		// We have an image without a thumbnail
 
-		$src = wp_get_attachment_url( $post->ID );
+		$src = wp_get_attachment_url($post->ID);
 		$src_file = & $file;
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+	} elseif ($src = wp_mime_type_icon($post->ID)) {
 		// No thumb, no image. We'll look for a mime-related icon instead.
 
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
+		$icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+		$src_file = $icon_dir.'/'.basename($src);
 	}
 
-	if ( !isset($src) || !$src )
+	if ( ! isset($src) || ! $src)
 		return false;
 
 	return array($src, $src_file);
@@ -1901,27 +1901,27 @@ 
  * @param array $max_dims Optional. Dimensions of image.
  * @return false|string HTML content.
  */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+	if ( ! $src = get_attachment_icon_src($post->ID, $fullsize))
 		return false;
 
 	list($src, $src_file) = $src;
 
 	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+	if (($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file)) {
 
 		$imagesize = getimagesize($src_file);
 
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1]) {
 			$actual_aspect = $imagesize[0] / $imagesize[1];
 			$desired_aspect = $max_dims[0] / $max_dims[1];
 
-			if ( $actual_aspect >= $desired_aspect ) {
+			if ($actual_aspect >= $desired_aspect) {
 				$height = $actual_aspect * $max_dims[0];
 				$constraint = "width='{$max_dims[0]}' ";
 				$post->iconsize = array($max_dims[0], $height);
@@ -1942,7 +1942,7 @@ 
 
 	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
 
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
+	return apply_filters('attachment_icon', $icon, $post->ID);
 }
 
 /**
@@ -1958,12 +1958,12 @@ 
  * @return false|string
  */
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+	if ($innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
 		return $innerHTML;
 
 	$innerHTML = esc_attr($post->post_title);
@@ -1985,8 +1985,8 @@ 
  *                            'attribute', 'js', 'db', or 'display'. Default 'raw'.
  * @return object|array Bookmark object or array, depending on the type specified by `$output`.
  */
-function get_link( $bookmark_id, $output = OBJECT, $filter = 'raw' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmark()' );
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmark()');
 	return get_bookmark($bookmark_id, $output, $filter);
 }
 
@@ -2001,9 +2001,9 @@ 
  * @param array $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function sanitize_url( $url, $protocols = null ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_url_raw()' );
-	return esc_url_raw( $url, $protocols );
+function sanitize_url($url, $protocols = null) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_url_raw()');
+	return esc_url_raw($url, $protocols);
 }
 
 /**
@@ -2022,12 +2022,12 @@ 
  * @param string $context Optional. How the URL will be used. Default is 'display'.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
-function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+function clean_url($url, $protocols = null, $context = 'display') {
+	if ($context == 'db')
+		_deprecated_function('clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()');
 	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
-	return esc_url( $url, $protocols, $context );
+		_deprecated_function(__FUNCTION__, '3.0.0', 'esc_url()');
+	return esc_url($url, $protocols, $context);
 }
 
 /**
@@ -2042,9 +2042,9 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_js()' );
-	return esc_js( $text );
+function js_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_js()');
+	return esc_js($text);
 }
 
 /**
@@ -2059,13 +2059,13 @@ 
  * @param false        $double_encode Whether to double encode. Unused.
  * @return string Escaped `$string`.
  */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_html()' );
-	if ( func_num_args() > 1 ) { // Maintain back-compat for people passing additional arguments.
+function wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_html()');
+	if (func_num_args() > 1) { // Maintain back-compat for people passing additional arguments.
 		$args = func_get_args();
-		return call_user_func_array( '_wp_specialchars', $args );
+		return call_user_func_array('_wp_specialchars', $args);
 	} else {
-		return esc_html( $string );
+		return esc_html($string);
 	}
 }
 
@@ -2079,9 +2079,9 @@ 
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_attr()' );
-	return esc_attr( $text );
+function attribute_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_attr()');
+	return esc_attr($text);
 }
 
 /**
@@ -2104,10 +2104,10 @@ 
  * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2115,11 +2115,11 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
+	if ( ! empty($classname) && is_string($classname))
 		$options['classname'] = $classname;
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
@@ -2135,7 +2135,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_sidebar_widget($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()');
 	return wp_unregister_sidebar_widget($id);
 }
 
@@ -2159,10 +2159,10 @@ 
  * @param int $height Widget height.
  */
 function register_widget_control($name, $control_callback, $width = '', $height = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_widget_control()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2170,13 +2170,13 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
+	if ( ! empty($width))
 		$options['width'] = $width;
-	if ( !empty($height) )
+	if ( ! empty($height))
 		$options['height'] = $height;
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_widget_control', $args);
@@ -2192,7 +2192,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_widget_control($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_widget_control()');
 	return wp_unregister_widget_control($id);
 }
 
@@ -2208,32 +2208,32 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True deletion completed and false if user_id is not a number.
  */
-function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
+function delete_usermeta($user_id, $meta_key, $meta_value = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'delete_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
+	if (is_array($meta_value) || is_object($meta_value))
 		$meta_value = serialize($meta_value);
-	$meta_value = trim( $meta_value );
+	$meta_value = trim($meta_value);
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	if ( ! empty($meta_value))
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value));
 	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2254,28 +2254,28 @@ 
  * @param string $meta_key Optional. Metadata key.
  * @return mixed
  */
-function get_usermeta( $user_id, $meta_key = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_user_meta()' );
+function get_usermeta($user_id, $meta_key = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_user_meta()');
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
+	if ( ! $user_id)
 		return false;
 
-	if ( !empty($meta_key) ) {
+	if ( ! empty($meta_key)) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
+		if (false !== $user && isset($user->$meta_key))
 			$metas = array($user->$meta_key);
 		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+			$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 	} else {
-		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+		$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
 	}
 
-	if ( empty($metas) ) {
-		if ( empty($meta_key) )
+	if (empty($metas)) {
+		if (empty($meta_key))
 			return array();
 		else
 			return '';
@@ -2283,7 +2283,7 @@ 
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if (count($metas) == 1)
 		return $metas[0];
 	else
 		return $metas;
@@ -2307,15 +2307,15 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True on successful update, false on failure.
  */
-function update_usermeta( $user_id, $meta_key, $meta_value ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
+function update_usermeta($user_id, $meta_key, $meta_value) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'update_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
+	if (is_string($meta_value))
 		$meta_value = stripslashes($meta_value);
 	$meta_value = maybe_serialize($meta_value);
 
@@ -2323,25 +2323,25 @@ 
 		return delete_usermeta($user_id, $meta_key);
 	}
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur)
+		do_action('update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	if ( ! $cur)
+		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value'));
+	elseif ($cur->meta_value != $meta_value)
+		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key'));
 	else
 		return false;
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	if ( ! $cur)
+		do_action('added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value);
 	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+		do_action('updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2361,15 +2361,15 @@ 
  * @param int $id Site ID.
  * @return array List of users that are part of that site ID
  */
-function get_users_of_blog( $id = '' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_users_of_blog($id = '') {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
-	if ( empty( $id ) ) {
+	if (empty($id)) {
 		$id = get_current_blog_id();
 	}
 	$blog_prefix = $wpdb->get_blog_prefix($id);
-	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+	$users = $wpdb->get_results("SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id");
 	return $users;
 }
 
@@ -2382,13 +2382,13 @@ 
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
-function automatic_feed_links( $add = true ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
+function automatic_feed_links($add = true) {
+	_deprecated_function(__FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )");
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
+	if ($add)
+		add_theme_support('automatic-feed-links');
 	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+		remove_action('wp_head', 'feed_links_extra', 3); // Just do this yourself in 3.0+
 }
 
 /**
@@ -2402,13 +2402,13 @@ 
  * @param false|int $user Optional. User ID to retrieve the field for. Default false (current user).
  * @return string The author's field from the current author's DB object.
  */
-function get_profile( $field, $user = false ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_the_author_meta()' );
-	if ( $user ) {
-		$user = get_user_by( 'login', $user );
+function get_profile($field, $user = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_the_author_meta()');
+	if ($user) {
+		$user = get_user_by('login', $user);
 		$user = $user->ID;
 	}
-	return get_the_author_meta( $field, $user );
+	return get_the_author_meta($field, $user);
 }
 
 /**
@@ -2421,9 +2421,9 @@ 
  * @param int $userid User to count posts for.
  * @return int Number of posts the given user has written.
  */
-function get_usernumposts( $userid ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
-	return count_user_posts( $userid );
+function get_usernumposts($userid) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'count_user_posts()');
+	return count_user_posts($userid);
 }
 
 /**
@@ -2437,7 +2437,7 @@ 
  * @return string An HTML entity
  */
 function funky_javascript_callback($matches) {
-	return "&#".base_convert($matches[1],16,10).";";
+	return "&#".base_convert($matches[1], 16, 10).";";
 }
 
 /**
@@ -2455,12 +2455,12 @@ 
  * @return string Fixed text.
  */
 function funky_javascript_fix($text) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ($is_winIE || $is_macIE)
+		$text = preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
 
@@ -2477,9 +2477,9 @@ 
  * @param string $taxonomy Name of taxonomy object
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $taxonomy );
+function is_taxonomy($taxonomy) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'taxonomy_exists()');
+	return taxonomy_exists($taxonomy);
 }
 
 /**
@@ -2494,9 +2494,9 @@ 
  * @param int $parent ID of parent term under which to confine the exists search.
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term( $term, $taxonomy = '', $parent = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'term_exists()' );
-	return term_exists( $term, $taxonomy, $parent );
+function is_term($term, $taxonomy = '', $parent = 0) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'term_exists()');
+	return term_exists($term, $taxonomy, $parent);
 }
 
 /**
@@ -2512,11 +2512,11 @@ 
  * @return bool
  */
 function is_plugin_page() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
+	if (isset($plugin_page))
 		return true;
 
 	return false;
@@ -2535,7 +2535,7 @@ 
  * @return bool Always return True
  */
 function update_category_cache() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return true;
 }
@@ -2549,7 +2549,7 @@ 
  * @return bool
  */
 function wp_timezone_supported() {
-	_deprecated_function( __FUNCTION__, '3.2.0' );
+	_deprecated_function(__FUNCTION__, '3.2.0');
 
 	return true;
 }
@@ -2569,9 +2569,9 @@ 
  * @param bool   $extended      Optional. Unused.
  */
 function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
+	wp_editor($content, $id, array('media_buttons' => $media_buttons));
 }
 
 /**
@@ -2584,20 +2584,20 @@ 
  * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
  */
 function get_user_metavalues($ids) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
+	foreach ($ids as $id)
 		$objects[$id] = array();
 
 	$metas = update_meta_cache('user', $ids);
 
-	foreach ( $metas as $id => $meta ) {
-		foreach ( $meta as $key => $metavalues ) {
-			foreach ( $metavalues as $value ) {
-				$objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
+	foreach ($metas as $id => $meta) {
+		foreach ($meta as $key => $metavalues) {
+			foreach ($metavalues as $value) {
+				$objects[$id][] = (object) array('user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
 			}
 		}
 	}
@@ -2618,23 +2618,23 @@ 
  * @return object|array The now sanitized User Object or Array (will be the same type as $user)
  */
 function sanitize_user_object($user, $context = 'display') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
+	if (is_object($user)) {
+		if ( ! isset($user->ID))
 			$user->ID = 0;
-		if ( ! ( $user instanceof WP_User ) ) {
+		if ( ! ($user instanceof WP_User)) {
 			$vars = get_object_vars($user);
-			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
+			foreach (array_keys($vars) as $field) {
+				if (is_string($user->$field) || is_numeric($user->$field))
 					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
+		if ( ! isset($user['ID']))
 			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
+		foreach (array_keys($user) as $field)
 			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
 		$user['filter'] = $context;
 	}
@@ -2657,17 +2657,17 @@ 
  * @return string
  */
 function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
+	if (empty($posts))
 		return;
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
+	if (empty($post->post_title))
 		$post->post_title = $start ? __('First Post') : __('Last Post');
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2678,10 +2678,10 @@ 
 
 	$link = $start ? "<link rel='start' title='" : "<link rel='end' title='";
 	$link .= esc_attr($title);
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$boundary = $start ? 'start' : 'end';
-	return apply_filters( "{$boundary}_post_rel_link", $link );
+	return apply_filters("{$boundary}_post_rel_link", $link);
 }
 
 /**
@@ -2695,7 +2695,7 @@ 
  * @param string $excluded_categories Optional. Excluded categories IDs.
  */
 function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
 }
@@ -2709,10 +2709,10 @@ 
  * @return string
  */
 function get_index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	$link = "<link rel='index' title='" . esc_attr( get_bloginfo( 'name', 'display' ) ) . "' href='" . esc_url( user_trailingslashit( get_bloginfo( 'url', 'display' ) ) ) . "' />\n";
-	return apply_filters( "index_rel_link", $link );
+	$link = "<link rel='index' title='".esc_attr(get_bloginfo('name', 'display'))."' href='".esc_url(user_trailingslashit(get_bloginfo('url', 'display')))."' />\n";
+	return apply_filters("index_rel_link", $link);
 }
 
 /**
@@ -2722,7 +2722,7 @@ 
  * @deprecated 3.3.0
  */
 function index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_index_rel_link();
 }
@@ -2736,13 +2736,13 @@ 
  * @param string $title Optional. Link title format. Default '%title'.
  * @return string
  */
-function get_parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function get_parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
+	if ( ! empty($GLOBALS['post']) && ! empty($GLOBALS['post']->post_parent))
 		$post = get_post($GLOBALS['post']->post_parent);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2752,10 +2752,10 @@ 
 	$title = apply_filters('the_title', $title, $post->ID);
 
 	$link = "<link rel='up' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
-	return apply_filters( "parent_post_rel_link", $link );
+	return apply_filters("parent_post_rel_link", $link);
 }
 
 /**
@@ -2766,8 +2766,8 @@ 
  *
  * @param string $title Optional. Link title format. Default '%title'.
  */
-function parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_parent_post_rel_link($title);
 }
@@ -2780,18 +2780,18 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function wp_admin_bar_dashboard_view_site_menu($wp_admin_bar) {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$user_id = get_current_user_id();
 
-	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+	if (0 != $user_id) {
+		if (is_admin())
+			$wp_admin_bar->add_menu(array('id' => 'view-site', 'title' => __('Visit Site'), 'href' => home_url()));
+		elseif (is_multisite())
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => get_dashboard_url($user_id)));
 		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => admin_url()));
 	}
 }
 
@@ -2805,10 +2805,10 @@ 
  * @param int $blog_id Site ID
  * @return bool True if the current users belong to $blog_id, false if not.
  */
-function is_blog_user( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'is_user_member_of_blog()' );
+function is_blog_user($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'is_user_member_of_blog()');
 
-	return is_user_member_of_blog( get_current_user_id(), $blog_id );
+	return is_user_member_of_blog(get_current_user_id(), $blog_id);
 }
 
 /**
@@ -2824,8 +2824,8 @@ 
  * @param string $mode     Type of access you required to the stream.
  * @return false Always false.
  */
-function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fopen($filename, $mode) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 	return false;
 }
 
@@ -2841,10 +2841,10 @@ 
  * @param mixed  $fp     Unused.
  * @param string $string Message to log.
  */
-function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
+function debug_fwrite($fp, $string) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
+	if ( ! empty($GLOBALS['debug']))
+		error_log($string);
 }
 
 /**
@@ -2858,8 +2858,8 @@ 
  *
  * @param mixed $fp Unused.
  */
-function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fclose($fp) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 }
 
 /**
@@ -2876,21 +2876,21 @@ 
  * @return array Theme list with theme data.
  */
 function get_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_themes()');
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
+	if (isset($wp_themes))
 		return $wp_themes;
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		if (isset($wp_themes[$name]))
+			$wp_themes[$name.'/'.$theme->get_stylesheet()] = $theme;
 		else
-			$wp_themes[ $name ] = $theme;
+			$wp_themes[$name] = $theme;
 	}
 
 	return $wp_themes;
@@ -2906,12 +2906,12 @@ 
  * @param string $theme Theme name.
  * @return array|null Null, if theme name does not exist. Theme data, if exists.
  */
-function get_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
+function get_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )');
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if (is_array($themes) && array_key_exists($theme, $themes))
+		return $themes[$theme];
 	return null;
 }
 
@@ -2925,9 +2925,9 @@ 
  * @return string
  */
 function get_current_theme() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
 
-	if ( $theme = get_option( 'current_theme' ) )
+	if ($theme = get_option('current_theme'))
 		return $theme;
 
 	return wp_get_theme()->get('Name');
@@ -2946,10 +2946,10 @@ 
  * @return string The pre block without paragraph/line-break conversion.
  */
 function clean_pre($matches) {
-	_deprecated_function( __FUNCTION__, '3.4.0' );
+	_deprecated_function(__FUNCTION__, '3.4.0');
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
+	if (is_array($matches))
+		$text = $matches[1].$matches[2]."</pre>";
 	else
 		$text = $matches;
 
@@ -2972,15 +2972,15 @@ 
  * @param callable $admin_head_callback Call on custom header administration screen.
  * @param callable $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )' );
+function add_custom_image_header($wp_head_callback, $admin_head_callback, $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )');
 	$args = array(
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-header', $args );
+	return add_theme_support('custom-header', $args);
 }
 
 /**
@@ -2993,8 +2993,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_image_header() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )' );
-	return remove_theme_support( 'custom-header' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )');
+	return remove_theme_support('custom-header');
 }
 
 /**
@@ -3008,16 +3008,16 @@ 
  * @param callable $admin_head_callback Call on custom background administration screen.
  * @param callable $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
+function add_custom_background($wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )');
 	$args = array();
-	if ( $wp_head_callback )
+	if ($wp_head_callback)
 		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
+	if ($admin_head_callback)
 		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-background', $args );
+	return add_theme_support('custom-background', $args);
 }
 
 /**
@@ -3030,8 +3030,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_background() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )' );
-	return remove_theme_support( 'custom-background' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )');
+	return remove_theme_support('custom-background');
 }
 
 /**
@@ -3044,9 +3044,9 @@ 
  * @param string $theme_file Theme file path.
  * @return array Theme data.
  */
-function get_theme_data( $theme_file ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
-	$theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+function get_theme_data($theme_file) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
+	$theme = new WP_Theme(basename(dirname($theme_file)), dirname(dirname($theme_file)));
 
 	$theme_data = array(
 		'Name' => $theme->get('Name'),
@@ -3062,9 +3062,9 @@ 
 		'AuthorName' => $theme->get('Author'),
 	);
 
-	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+	foreach (apply_filters('extra_theme_headers', array()) as $extra_header) {
+		if ( ! isset($theme_data[$extra_header]))
+			$theme_data[$extra_header] = $theme->get($extra_header);
 	}
 
 	return $theme_data;
@@ -3081,10 +3081,10 @@ 
  *
  * @param array $pages list of page objects
  */
-function update_page_cache( &$pages ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'update_post_cache()' );
+function update_page_cache(&$pages) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'update_post_cache()');
 
-	update_post_cache( $pages );
+	update_post_cache($pages);
 }
 
 /**
@@ -3099,10 +3099,10 @@ 
  *
  * @param int $id Page ID to clean
  */
-function clean_page_cache( $id ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'clean_post_cache()' );
+function clean_page_cache($id) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'clean_post_cache()');
 
-	clean_post_cache( $id );
+	clean_post_cache($id);
 }
 
 /**
@@ -3117,9 +3117,9 @@ 
  * @param string $action Nonce action.
  * @return string Are you sure message.
  */
-function wp_explain_nonce( $action ) {
-	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
-	return __( 'Are you sure you want to do this?' );
+function wp_explain_nonce($action) {
+	_deprecated_function(__FUNCTION__, '3.4.1', 'wp_nonce_ays()');
+	return __('Are you sure you want to do this?');
 }
 
 /**
@@ -3131,9 +3131,9 @@ 
  *
  * @param int $post_id An optional post ID.
  */
-function sticky_class( $post_id = null ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
+function sticky_class($post_id = null) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'post_class()');
+	if (is_sticky($post_id))
 		echo ' sticky';
 }
 
@@ -3149,8 +3149,8 @@ 
  *
  * @param WP_Post &$post Post object, passed by reference (unused).
  */
-function _get_post_ancestors( &$post ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+function _get_post_ancestors(&$post) {
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -3163,28 +3163,28 @@ 
  * @param string $file Filename of the image to load.
  * @return resource The resulting image resource on success, Error string on failure.
  */
-function wp_load_image( $file ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function wp_load_image($file) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if (is_numeric($file))
+		$file = get_attached_file($file);
 
-	if ( ! is_file( $file ) ) {
+	if ( ! is_file($file)) {
 		/* translators: %s: file name */
-		return sprintf( __( 'File &#8220;%s&#8221; doesn&#8217;t exist?' ), $file );
+		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
 	}
 
-	if ( ! function_exists('imagecreatefromstring') )
+	if ( ! function_exists('imagecreatefromstring'))
 		return __('The GD image library is not installed.');
 
 	// Set artificially high because GD uses uncompressed images in memory.
-	wp_raise_memory_limit( 'image' );
+	wp_raise_memory_limit('image');
 
-	$image = imagecreatefromstring( file_get_contents( $file ) );
+	$image = imagecreatefromstring(file_get_contents($file));
 
-	if ( ! is_resource( $image ) ) {
+	if ( ! is_resource($image)) {
 		/* translators: %s: file name */
-		return sprintf( __( 'File &#8220;%s&#8221; is not an image.' ), $file );
+		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
 	}
 
 	return $image;
@@ -3214,22 +3214,22 @@ 
  * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
  * @return mixed WP_Error on failure. String with new destination path.
  */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function image_resize($file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($file);
+	if (is_wp_error($editor))
 		return $editor;
-	$editor->set_quality( $jpeg_quality );
+	$editor->set_quality($jpeg_quality);
 
-	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
+	$resized = $editor->resize($max_w, $max_h, $crop);
+	if (is_wp_error($resized))
 		return $resized;
 
-	$dest_file = $editor->generate_filename( $suffix, $dest_path );
-	$saved = $editor->save( $dest_file );
+	$dest_file = $editor->generate_filename($suffix, $dest_path);
+	$saved = $editor->save($dest_file);
 
-	if ( is_wp_error( $saved ) )
+	if (is_wp_error($saved))
 		return $saved;
 
 	return $dest_file;
@@ -3249,9 +3249,9 @@ 
  * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
  * @return WP_Post|null Post object or array holding post contents and information
  */
-function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
-	return get_post( $postid, $mode );
+function wp_get_single_post($postid = 0, $mode = OBJECT) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'get_post()');
+	return get_post($postid, $mode);
 }
 
 /**
@@ -3266,9 +3266,9 @@ 
  * @return bool False if does not authenticate, true if username and password authenticates.
  */
 function user_pass_ok($user_login, $user_pass) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
-	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_authenticate()');
+	$user = wp_authenticate($user_login, $user_pass);
+	if (is_wp_error($user))
 		return false;
 
 	return true;
@@ -3293,10 +3293,10 @@ 
  * @return bool
  */
 function gd_edit_image_support($mime_type) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_image_editor_supports()' );
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_image_editor_supports()');
 
-	if ( function_exists('imagetypes') ) {
-		switch( $mime_type ) {
+	if (function_exists('imagetypes')) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return (imagetypes() & IMG_JPG) != 0;
 			case 'image/png':
@@ -3305,7 +3305,7 @@ 
 				return (imagetypes() & IMG_GIF) != 0;
 		}
 	} else {
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return function_exists('imagecreatefromjpeg');
 			case 'image/png':
@@ -3327,22 +3327,22 @@ 
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
  */
-function wp_convert_bytes_to_hr( $bytes ) {
-	_deprecated_function( __FUNCTION__, '3.6.0', 'size_format()' );
+function wp_convert_bytes_to_hr($bytes) {
+	_deprecated_function(__FUNCTION__, '3.6.0', 'size_format()');
 
-	$units = array( 0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-	$log   = log( $bytes, KB_IN_BYTES );
+	$units = array(0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB');
+	$log   = log($bytes, KB_IN_BYTES);
 	$power = (int) $log;
-	$size  = pow( KB_IN_BYTES, $log - $power );
+	$size  = pow(KB_IN_BYTES, $log - $power);
 
-	if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {
-		$unit = $units[ $power ];
+	if ( ! is_nan($size) && array_key_exists($power, $units)) {
+		$unit = $units[$power];
 	} else {
 		$size = $bytes;
 		$unit = $units[0];
 	}
 
-	return $size . $unit;
+	return $size.$unit;
 }
 
 /**
@@ -3355,9 +3355,9 @@ 
  * @param string $t Search terms to "tidy", e.g. trim.
  * @return string Trimmed search terms.
  */
-function _search_terms_tidy( $t ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
-	return trim( $t, "\"'\n\r " );
+function _search_terms_tidy($t) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
+	return trim($t, "\"'\n\r ");
 }
 
 /**
@@ -3373,10 +3373,10 @@ 
  */
 function rich_edit_exists() {
 	global $wp_rich_edit_exists;
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+	_deprecated_function(__FUNCTION__, '3.9.0');
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset($wp_rich_edit_exists))
+		$wp_rich_edit_exists = file_exists(ABSPATH.WPINC.'/js/tinymce/tinymce.js');
 
 	return $wp_rich_edit_exists;
 }
@@ -3391,7 +3391,7 @@ 
  * @param int $count Number of topics.
  * @return int Number of topics.
  */
-function default_topic_count_text( $count ) {
+function default_topic_count_text($count) {
 	return $count;
 }
 
@@ -3406,8 +3406,8 @@ 
  * @param string $content The text to format.
  * @return string The very same text.
  */
-function format_to_post( $content ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+function format_to_post($content) {
+	_deprecated_function(__FUNCTION__, '3.9.0');
 	return $content;
 }
 
@@ -3422,8 +3422,8 @@ 
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'wpdb::esc_like()' );
-	return str_replace( array( "%", "_" ), array( "\\%", "\\_" ), $text );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'wpdb::esc_like()');
+	return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
 }
 
 /**
@@ -3438,14 +3438,14 @@ 
  * @param string $url The URL to test.
  * @return bool Whether SSL access is available.
  */
-function url_is_accessable_via_ssl( $url ) {
-	_deprecated_function( __FUNCTION__, '4.0.0' );
+function url_is_accessable_via_ssl($url) {
+	_deprecated_function(__FUNCTION__, '4.0.0');
 
-	$response = wp_remote_get( set_url_scheme( $url, 'https' ) );
+	$response = wp_remote_get(set_url_scheme($url, 'https'));
 
-	if ( !is_wp_error( $response ) ) {
-		$status = wp_remote_retrieve_response_code( $response );
-		if ( 200 == $status || 401 == $status ) {
+	if ( ! is_wp_error($response)) {
+		$status = wp_remote_retrieve_response_code($response);
+		if (200 == $status || 401 == $status) {
 			return true;
 		}
 	}
@@ -3463,7 +3463,7 @@ 
  * @deprecated 4.3.0
  */
 function preview_theme() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 }
 
 /**
@@ -3476,7 +3476,7 @@ 
  * @return string
  */
 function _preview_theme_template_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3490,7 +3490,7 @@ 
  * @return string
  */
 function _preview_theme_stylesheet_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3504,8 +3504,8 @@ 
  * @param string $content
  * @return string
  */
-function preview_theme_ob_filter( $content ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter($content) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return $content;
 }
 
@@ -3521,8 +3521,8 @@ 
  * @param array $matches
  * @return string
  */
-function preview_theme_ob_filter_callback( $matches ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter_callback($matches) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3539,9 +3539,9 @@ 
  * @return string The formatted text after filter is applied.
  */
 function wp_richedit_pre($text) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( empty( $text ) ) {
+	if (empty($text)) {
 		/**
 		 * Filters text returned for the rich text editor.
 		 *
@@ -3557,15 +3557,15 @@ 
 		 *
 		 * @param string $output Text for the rich text editor.
 		 */
-		return apply_filters( 'richedit_pre', '' );
+		return apply_filters('richedit_pre', '');
 	}
 
 	$output = convert_chars($text);
 	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset'));
 
 	/** This filter is documented in wp-includes/deprecated.php */
-	return apply_filters( 'richedit_pre', $output );
+	return apply_filters('richedit_pre', $output);
 }
 
 /**
@@ -3582,10 +3582,10 @@ 
  * @return string Formatted text after filter applied.
  */
 function wp_htmledit_pre($output) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( ! empty($output))
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset')); // convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3595,7 +3595,7 @@ 
 	 *
 	 * @param string $output The HTML-formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters('htmledit_pre', $output);
 }
 
 /**
@@ -3608,10 +3608,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
-function post_permalink( $post_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'get_permalink()' );
+function post_permalink($post_id = 0) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'get_permalink()');
 
-	return get_permalink( $post_id );
+	return get_permalink($post_id);
 }
 
 /**
@@ -3630,44 +3630,44 @@ 
  *                               returns false. Default 1.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'WP_Http' );
+function wp_get_http($url, $file_path = false, $red = 1) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'WP_Http');
 
-	@set_time_limit( 60 );
+	@set_time_limit(60);
 
-	if ( $red > 5 )
+	if ($red > 5)
 		return false;
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		$options['method'] = 'HEAD';
 	else
 		$options['method'] = 'GET';
 
-	$response = wp_safe_remote_request( $url, $options );
+	$response = wp_safe_remote_request($url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	$headers = wp_remote_retrieve_headers($response);
+	$headers['response'] = wp_remote_retrieve_response_code($response);
 
 	// WP_HTTP no longer follows redirects for HEAD requests.
-	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
-		return wp_get_http( $headers['location'], $file_path, ++$red );
+	if ('HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset($headers['location'])) {
+		return wp_get_http($headers['location'], $file_path, ++$red);
 	}
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		return $headers;
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
+	if ( ! $out_fp)
 		return $headers;
 
-	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
+	fwrite($out_fp, wp_remote_retrieve_body($response));
 	fclose($out_fp);
 	clearstatcache();
 
@@ -3684,9 +3684,9 @@ 
  * @param string|bool $force Optional Whether to force SSL login. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_login( $force = null ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'force_ssl_admin()' );
-	return force_ssl_admin( $force );
+function force_ssl_login($force = null) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'force_ssl_admin()');
+	return force_ssl_admin($force);
 }
 
 /**
@@ -3698,7 +3698,7 @@ 
  * @return string Full path to comments popup template file.
  */
 function get_comments_popup_template() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return '';
 }
@@ -3712,7 +3712,7 @@ 
  * @return bool
  */
 function is_comments_popup() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return false;
 }
@@ -3724,7 +3724,7 @@ 
  * @deprecated 4.5.0
  */
 function comments_popup_script() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 }
 
 /**
@@ -3736,8 +3736,8 @@ 
  * @param string $text Content to replace links to open in a new window.
  * @return string Content that has filtered links.
  */
-function popuplinks( $text ) {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+function popuplinks($text) {
+	_deprecated_function(__FUNCTION__, '4.5.0');
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }
@@ -3753,8 +3753,8 @@ 
  *
  * @return string An empty string.
  */
-function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+function wp_embed_handler_googlevideo($matches, $attr, $url, $rawattr) {
+	_deprecated_function(__FUNCTION__, '4.6.0');
 
 	return '';
 }
@@ -3768,9 +3768,9 @@ 
  * @return string Full path to paged template file.
  */
 function get_paged_template() {
-	_deprecated_function( __FUNCTION__, '4.7.0' );
+	_deprecated_function(__FUNCTION__, '4.7.0');
 
-	return get_query_template( 'paged' );
+	return get_query_template('paged');
 }
 
 /**
@@ -3793,10 +3793,10 @@ 
  * @param string $string
  * @return string
  */
-function wp_kses_js_entities( $string ) {
-	_deprecated_function( __FUNCTION__, '4.7.0' );
+function wp_kses_js_entities($string) {
+	_deprecated_function(__FUNCTION__, '4.7.0');
 
-	return preg_replace( '%&\s*\{[^}]*(\}\s*;?|$)%', '', $string );
+	return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 }
 
 /**
@@ -3813,12 +3813,12 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_ID( $a, $b ) {
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+function _usort_terms_by_ID($a, $b) {
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	if ( $a->term_id > $b->term_id )
+	if ($a->term_id > $b->term_id)
 		return 1;
-	elseif ( $a->term_id < $b->term_id )
+	elseif ($a->term_id < $b->term_id)
 		return -1;
 	else
 		return 0;
@@ -3838,10 +3838,10 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_name( $a, $b ) {
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+function _usort_terms_by_name($a, $b) {
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	return strcmp( $a->name, $b->name );
+	return strcmp($a->name, $b->name);
 }
 
 /**
@@ -3857,24 +3857,24 @@ 
  * @param object $b The second object to compare
  * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
  */
-function _sort_nav_menu_items( $a, $b ) {
+function _sort_nav_menu_items($a, $b) {
 	global $_menu_item_sort_prop;
 
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	if ( empty( $_menu_item_sort_prop ) )
+	if (empty($_menu_item_sort_prop))
 		return 0;
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
+	if ( ! isset($a->$_menu_item_sort_prop) || ! isset($b->$_menu_item_sort_prop))
 		return 0;
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
+	if ($a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop)
 		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
+	elseif ($_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop)
 		return $_a < $_b ? -1 : 1;
 	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+		return strcmp($a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop);
 }

Braces +401 added lines, -282 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
-		echo $cat;
+	if ( $echo ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -399,8 +407,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -459,8 +468,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -511,8 +521,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -638,18 +649,24 @@ 
 	$r = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
-		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
-		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
-		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
-		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
-		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
-		$r['style'] = $r['list'] ? 'list' : 'break';
+	if ( isset($r['optionall']) && isset($r['all'])) {
+			$r['show_option_all'] = $r['all'];
+	}
+	if ( isset($r['sort_column']) ) {
+			$r['orderby'] = $r['sort_column'];
+	}
+	if ( isset($r['sort_order']) ) {
+			$r['order'] = $r['sort_order'];
+	}
+	if ( isset($r['optiondates']) ) {
+			$r['show_last_update'] = $r['optiondates'];
+	}
+	if ( isset($r['optioncount']) ) {
+			$r['show_count'] = $r['optioncount'];
+	}
+	if ( isset($r['list']) ) {
+			$r['style'] = $r['list'] ? 'list' : 'break';
+	}
 	$r['title_li'] = '';
 
 	return wp_list_categories($r);
@@ -680,12 +697,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -787,8 +806,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -931,64 +951,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ( $category == -1 ) {
+		//get_bookmarks uses '' to signify all categories
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+				// If it's a relative path
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -997,8 +1031,9 @@ 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
-		return $output;
+	if ( !$echo ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1026,8 +1061,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1093,13 +1129,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1137,8 +1175,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1157,8 +1196,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1250,19 +1290,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1653,8 +1696,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1674,8 +1718,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1836,11 +1881,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1862,8 +1909,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1883,8 +1931,9 @@ 
 		$src_file = $icon_dir . '/' . basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1904,11 +1953,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1960,11 +2011,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2023,10 +2076,11 @@ 
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2107,20 +2161,23 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
-		$options['classname'] = $classname;
+	if ( !empty($classname) && is_string($classname) ) {
+			$options['classname'] = $classname;
+	}
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
 }
@@ -2162,22 +2219,26 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
-		$options['width'] = $width;
-	if ( !empty($height) )
-		$options['height'] = $height;
+	if ( !empty($width) ) {
+			$options['width'] = $width;
+	}
+	if ( !empty($height) ) {
+			$options['height'] = $height;
+	}
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_widget_control', $args);
 }
@@ -2211,29 +2272,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2259,35 +2325,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2310,13 +2380,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2325,23 +2397,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2385,10 +2460,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+
 }
 
 /**
@@ -2459,10 +2536,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2516,8 +2594,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2589,8 +2668,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2621,21 +2701,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2661,14 +2745,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2739,11 +2825,13 @@ 
 function get_parent_post_rel_link( $title = '%title' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2786,12 +2874,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2843,9 +2932,10 @@ 
  */
 function debug_fwrite( $fp, $string ) {
 	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $string );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2879,18 +2969,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2910,8 +3002,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2927,8 +3020,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2948,10 +3042,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2978,8 +3073,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -3011,12 +3107,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3063,8 +3162,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3133,9 +3233,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3166,16 +3267,18 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
 	if ( ! is_file( $file ) ) {
 		/* translators: %s: file name */
 		return sprintf( __( 'File &#8220;%s&#8221; doesn&#8217;t exist?' ), $file );
 	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory.
 	wp_raise_memory_limit( 'image' );
@@ -3218,19 +3321,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3268,8 +3374,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3375,8 +3482,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9.0' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3584,8 +3692,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3635,21 +3745,24 @@ 
 
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -3659,13 +3772,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);
@@ -3816,13 +3931,14 @@ 
 function _usort_terms_by_ID( $a, $b ) {
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
 
-	if ( $a->term_id > $b->term_id )
-		return 1;
-	elseif ( $a->term_id < $b->term_id )
-		return -1;
-	else
-		return 0;
-}
+	if ( $a->term_id > $b->term_id ) {
+			return 1;
+	} elseif ( $a->term_id < $b->term_id ) {
+			return -1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Sort categories by name.
@@ -3862,19 +3978,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
 
-	if ( empty( $_menu_item_sort_prop ) )
-		return 0;
+	if ( empty( $_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-		return 0;
+	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-		return $_a < $_b ? -1 : 1;
-	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}
+	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop ) {
+			return 0;
+	} elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop ) {
+			return $_a < $_b ? -1 : 1;
+	} else {
+			return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+	}
+	}

src/wp-includes/revision.php

Doc Comments +1 added lines, -1 removed lines

@@ -432,7 +432,7 @@
  *
  * @see get_children()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */

Indentation +5 added lines, -5 removed lines

@@ -596,11 +596,11 @@
 	}
 
 	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
-	     empty( $_REQUEST['preview_id'] ) ||
-	     $post->ID != $post_id ||
-	     '_thumbnail_id' != $meta_key ||
-	     'revision' == $post->post_type ||
-	     $post_id != $_REQUEST['preview_id']
+		 empty( $_REQUEST['preview_id'] ) ||
+		 $post->ID != $post_id ||
+		 '_thumbnail_id' != $meta_key ||
+		 'revision' == $post->post_type ||
+		 $post_id != $_REQUEST['preview_id']
 	) {
 		return $value;
 	}

Spacing +152 added lines, -152 removed lines

@@ -21,19 +21,19 @@ 
  * @param bool          $deprecated Not used.
  * @return array Array of fields that can be versioned.
  */
-function _wp_post_revision_fields( $post = array(), $deprecated = false ) {
+function _wp_post_revision_fields($post = array(), $deprecated = false) {
 	static $fields = null;
 
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	if ( is_null( $fields ) ) {
+	if (is_null($fields)) {
 		// Allow these to be versioned
 		$fields = array(
-			'post_title' => __( 'Title' ),
-			'post_content' => __( 'Content' ),
-			'post_excerpt' => __( 'Excerpt' ),
+			'post_title' => __('Title'),
+			'post_content' => __('Content'),
+			'post_excerpt' => __('Excerpt'),
 		);
 	}
 
@@ -53,11 +53,11 @@ 
 	 *                      'post_content', and 'post_excerpt' by default.
 	 * @param array $post   A post array being processed for insertion as a post revision.
 	 */
-	$fields = apply_filters( '_wp_post_revision_fields', $fields, $post );
+	$fields = apply_filters('_wp_post_revision_fields', $fields, $post);
 
 	// WP uses these internally either in versioning or elsewhere - they cannot be versioned
-	foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {
-		unset( $fields[ $protect ] );
+	foreach (array('ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author') as $protect) {
+		unset($fields[$protect]);
 	}
 
 
@@ -75,25 +75,25 @@ 
  * @param bool          $autosave Optional. Is the revision an autosave? Default false.
  * @return array Post array ready to be inserted as a post revision.
  */
-function _wp_post_revision_data( $post = array(), $autosave = false ) {
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+function _wp_post_revision_data($post = array(), $autosave = false) {
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	$fields = _wp_post_revision_fields( $post );
+	$fields = _wp_post_revision_fields($post);
 
 	$revision_data = array();
 
-	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) {
-		$revision_data[ $field ] = $post[ $field ];
+	foreach (array_intersect(array_keys($post), array_keys($fields)) as $field) {
+		$revision_data[$field] = $post[$field];
 	}
 
 	$revision_data['post_parent']   = $post['ID'];
 	$revision_data['post_status']   = 'inherit';
 	$revision_data['post_type']     = 'revision';
 	$revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version
-	$revision_data['post_date']     = isset( $post['post_modified'] ) ? $post['post_modified'] : '';
-	$revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : '';
+	$revision_data['post_date']     = isset($post['post_modified']) ? $post['post_modified'] : '';
+	$revision_data['post_date_gmt'] = isset($post['post_modified_gmt']) ? $post['post_modified_gmt'] : '';
 
 	return $revision_data;
 }
@@ -109,29 +109,29 @@ 
  * @param int $post_id The ID of the post to save as a revision.
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
-function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+function wp_save_post_revision($post_id) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 		return;
 
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return;
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		return;
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		return;
 
-	if ( ! wp_revisions_enabled( $post ) )
+	if ( ! wp_revisions_enabled($post))
 		return;
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
 	// If no previous revisions, save one
-	if ( $revisions = wp_get_post_revisions( $post_id ) ) {
+	if ($revisions = wp_get_post_revisions($post_id)) {
 		// grab the last revision, but not an autosave
-		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
+		foreach ($revisions as $revision) {
+			if (false !== strpos($revision->post_name, "{$revision->post_parent}-revision")) {
 				$last_revision = $revision;
 				break;
 			}
@@ -151,11 +151,11 @@ 
 		 * @param WP_Post $post              The post object.
 		 *
 		 */
-		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
+		if (isset($last_revision) && apply_filters('wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post)) {
 			$post_has_changed = false;
 
-			foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
+			foreach (array_keys(_wp_post_revision_fields($post)) as $field) {
+				if (normalize_whitespace($post->$field) != normalize_whitespace($last_revision->$field)) {
 					$post_has_changed = true;
 					break;
 				}
@@ -174,38 +174,38 @@ 
 			 * @param WP_Post $post             The post object.
 			 *
 			 */
-			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
+			$post_has_changed = (bool) apply_filters('wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post);
 
 			//don't save revision if post unchanged
-			if ( ! $post_has_changed ) {
+			if ( ! $post_has_changed) {
 				return;
 			}
 		}
 	}
 
-	$return = _wp_put_post_revision( $post );
+	$return = _wp_put_post_revision($post);
 
 	// If a limit for the number of revisions to keep has been set,
 	// delete the oldest ones.
-	$revisions_to_keep = wp_revisions_to_keep( $post );
+	$revisions_to_keep = wp_revisions_to_keep($post);
 
-	if ( $revisions_to_keep < 0 )
+	if ($revisions_to_keep < 0)
 		return $return;
 
-	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
+	$revisions = wp_get_post_revisions($post_id, array('order' => 'ASC'));
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
+	if ($delete < 1)
 		return $return;
 
-	$revisions = array_slice( $revisions, 0, $delete );
+	$revisions = array_slice($revisions, 0, $delete);
 
-	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
+	for ($i = 0; isset($revisions[$i]); $i++) {
+		if (false !== strpos($revisions[$i]->post_name, 'autosave'))
 			continue;
 
-		wp_delete_post_revision( $revisions[ $i ]->ID );
+		wp_delete_post_revision($revisions[$i]->ID);
 	}
 
 	return $return;
@@ -224,12 +224,12 @@ 
  * @param int $user_id Optional The post author ID.
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
-function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-	$revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+function wp_get_post_autosave($post_id, $user_id = 0) {
+	$revisions = wp_get_post_revisions($post_id, array('check_enabled' => false));
 
-	foreach ( $revisions as $revision ) {
-		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
+	foreach ($revisions as $revision) {
+		if (false !== strpos($revision->post_name, "{$post_id}-autosave")) {
+			if ($user_id && $user_id != $revision->post_author)
 				continue;
 
 			return $revision;
@@ -247,8 +247,8 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
-function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_revision($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
 	return (int) $post->post_parent;
@@ -262,11 +262,11 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
-function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_autosave($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+	if (false !== strpos($post->post_name, "{$post->post_parent}-autosave"))
 		return (int) $post->post_parent;
 
 	return false;
@@ -282,26 +282,26 @@ 
  * @param bool                   $autosave Optional. Is the revision an autosave?
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
-function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
+function _wp_put_post_revision($post = null, $autosave = false) {
+	if (is_object($post))
+		$post = get_object_vars($post);
+	elseif ( ! is_array($post))
 		$post = get_post($post, ARRAY_A);
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']))
+		return new WP_Error('invalid_post', __('Invalid post ID.'));
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if (isset($post['post_type']) && 'revision' == $post['post_type'])
+		return new WP_Error('post_type', __('Cannot create a revision of a revision'));
 
-	$post = _wp_post_revision_data( $post, $autosave );
+	$post = _wp_post_revision_data($post, $autosave);
 	$post = wp_slash($post); //since data is from db
 
-	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
+	$revision_id = wp_insert_post($post);
+	if (is_wp_error($revision_id))
 		return $revision_id;
 
-	if ( $revision_id ) {
+	if ($revision_id) {
 		/**
 		 * Fires once a revision has been saved.
 		 *
@@ -309,7 +309,7 @@ 
 		 *
 		 * @param int $revision_id Post revision ID.
 		 */
-		do_action( '_wp_put_post_revision', $revision_id );
+		do_action('_wp_put_post_revision', $revision_id);
 	}
 
 	return $revision_id;
@@ -327,17 +327,17 @@ 
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
+	if ( ! $revision = get_post($post, OBJECT, $filter))
 		return $revision;
-	if ( 'revision' !== $revision->post_type )
+	if ('revision' !== $revision->post_type)
 		return null;
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $revision;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$_revision = get_object_vars($revision);
 		return $_revision;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$_revision = array_values(get_object_vars($revision));
 		return $_revision;
 	}
@@ -356,31 +356,31 @@ 
  * @param array       $fields      Optional. What fields to restore from. Defaults to all.
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
-function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
+function wp_restore_post_revision($revision_id, $fields = null) {
+	if ( ! $revision = wp_get_post_revision($revision_id, ARRAY_A))
 		return $revision;
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( ! is_array($fields))
+		$fields = array_keys(_wp_post_revision_fields($revision));
 
 	$update = array();
-	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
+	foreach (array_intersect(array_keys($revision), $fields) as $field) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
+	if ( ! $update)
 		return false;
 
 	$update['ID'] = $revision['post_parent'];
 
-	$update = wp_slash( $update ); //since data is from db
+	$update = wp_slash($update); //since data is from db
 
-	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
+	$post_id = wp_update_post($update);
+	if ( ! $post_id || is_wp_error($post_id))
 		return $post_id;
 
 	// Update last edit user
-	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
+	update_post_meta($post_id, '_edit_last', get_current_user_id());
 
 	/**
 	 * Fires after a post revision has been restored.
@@ -390,7 +390,7 @@ 
 	 * @param int $post_id     Post ID.
 	 * @param int $revision_id Post revision ID.
 	 */
-	do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
+	do_action('wp_restore_post_revision', $post_id, $revision['ID']);
 
 	return $post_id;
 }
@@ -405,13 +405,13 @@ 
  * @param int|WP_Post $revision_id Revision ID or revision object.
  * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
  */
-function wp_delete_post_revision( $revision_id ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+function wp_delete_post_revision($revision_id) {
+	if ( ! $revision = wp_get_post_revision($revision_id)) {
 		return $revision;
 	}
 
-	$delete = wp_delete_post( $revision->ID );
-	if ( $delete ) {
+	$delete = wp_delete_post($revision->ID);
+	if ($delete) {
 		/**
 		 * Fires once a post revision has been deleted.
 		 *
@@ -420,7 +420,7 @@ 
 		 * @param int          $revision_id Post revision ID.
 		 * @param object|array $revision    Post revision object or array.
 		 */
-		do_action( 'wp_delete_post_revision', $revision->ID, $revision );
+		do_action('wp_delete_post_revision', $revision->ID, $revision);
 	}
 
 	return $delete;
@@ -437,20 +437,20 @@ 
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */
-function wp_get_post_revisions( $post_id = 0, $args = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
+function wp_get_post_revisions($post_id = 0, $args = null) {
+	$post = get_post($post_id);
+	if ( ! $post || empty($post->ID))
 		return array();
 
-	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true);
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
+	if ($args['check_enabled'] && ! wp_revisions_enabled($post))
 		return array();
 
-	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
+	$args = array_merge($args, array('post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit'));
 
-	if ( ! $revisions = get_children( $args ) )
+	if ( ! $revisions = get_children($args))
 		return array();
 
 	return $revisions;
@@ -464,8 +464,8 @@ 
  * @param WP_Post $post The post object.
  * @return bool True if number of revisions to keep isn't zero, false otherwise.
  */
-function wp_revisions_enabled( $post ) {
-	return wp_revisions_to_keep( $post ) !== 0;
+function wp_revisions_enabled($post) {
+	return wp_revisions_to_keep($post) !== 0;
 }
 
 /**
@@ -481,15 +481,15 @@ 
  * @param WP_Post $post The post object.
  * @return int The number of revisions to keep.
  */
-function wp_revisions_to_keep( $post ) {
+function wp_revisions_to_keep($post) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
+	if (true === $num)
 		$num = -1;
 	else
-		$num = intval( $num );
+		$num = intval($num);
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		$num = 0;
 
 	/**
@@ -502,7 +502,7 @@ 
 	 * @param int     $num  Number of revisions to store.
 	 * @param WP_Post $post Post object.
 	 */
-	return (int) apply_filters( 'wp_revisions_to_keep', $num, $post );
+	return (int) apply_filters('wp_revisions_to_keep', $num, $post);
 }
 
 /**
@@ -514,24 +514,24 @@ 
  * @param WP_Post $post
  * @return WP_Post|false
  */
-function _set_preview( $post ) {
-	if ( ! is_object( $post ) ) {
+function _set_preview($post) {
+	if ( ! is_object($post)) {
 		return $post;
 	}
 
-	$preview = wp_get_post_autosave( $post->ID );
-	if ( ! is_object( $preview ) ) {
+	$preview = wp_get_post_autosave($post->ID);
+	if ( ! is_object($preview)) {
 		return $post;
 	}
 
-	$preview = sanitize_post( $preview );
+	$preview = sanitize_post($preview);
 
 	$post->post_content = $preview->post_content;
 	$post->post_title = $preview->post_title;
 	$post->post_excerpt = $preview->post_excerpt;
 
-	add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
-	add_filter( 'get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3 );
+	add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
+	add_filter('get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3);
 
 	return $post;
 }
@@ -543,11 +543,11 @@ 
  * @access private
  */
 function _show_post_preview() {
-	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
+	if (isset($_GET['preview_id']) && isset($_GET['preview_nonce'])) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if (false === wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.$id))
+			wp_die(__('Sorry, you are not allowed to preview drafts.'));
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -564,17 +564,17 @@ 
  * @param string $taxonomy
  * @return array
  */
-function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
+function _wp_preview_terms_filter($terms, $post_id, $taxonomy) {
+	if ( ! $post = get_post())
 		return $terms;
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+	if (empty($_REQUEST['post_format']) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type)
 		return $terms;
 
-	if ( 'standard' == $_REQUEST['post_format'] )
+	if ('standard' == $_REQUEST['post_format'])
 		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	elseif ($term = get_term_by('slug', 'post-format-'.sanitize_key($_REQUEST['post_format']), 'post_format'))
+		$terms = array($term); // Can only have one post format
 
 	return $terms;
 }
@@ -590,13 +590,13 @@ 
  * @param string            $meta_key Meta key.
  * @return null|array The default return value or the post thumbnail meta array.
  */
-function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
-	if ( ! $post = get_post() ) {
+function _wp_preview_post_thumbnail_filter($value, $post_id, $meta_key) {
+	if ( ! $post = get_post()) {
 		return $value;
 	}
 
-	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
-	     empty( $_REQUEST['preview_id'] ) ||
+	if (empty($_REQUEST['_thumbnail_id']) ||
+	     empty($_REQUEST['preview_id']) ||
 	     $post->ID != $post_id ||
 	     '_thumbnail_id' != $meta_key ||
 	     'revision' == $post->post_type ||
@@ -605,12 +605,12 @@ 
 		return $value;
 	}
 
-	$thumbnail_id = intval( $_REQUEST['_thumbnail_id'] );
-	if ( $thumbnail_id <= 0 ) {
+	$thumbnail_id = intval($_REQUEST['_thumbnail_id']);
+	if ($thumbnail_id <= 0) {
 		return '';
 	}
 
-	return strval( $thumbnail_id );
+	return strval($thumbnail_id);
 }
 
 /**
@@ -622,13 +622,13 @@ 
  * @param WP_Post $revision
  * @return int|false
  */
-function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
+function _wp_get_post_revision_version($revision) {
+	if (is_object($revision))
+		$revision = get_object_vars($revision);
+	elseif ( ! is_array($revision))
 		return false;
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
+	if (preg_match('/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches))
 		return (int) $matches[1];
 
 	return 0;
@@ -646,23 +646,23 @@ 
  * @param array   $revisions Current revisions of the post
  * @return bool true if the revisions were upgraded, false if problems
  */
-function _wp_upgrade_revisions_of_post( $post, $revisions ) {
+function _wp_upgrade_revisions_of_post($post, $revisions) {
 	global $wpdb;
 
 	// Add post option exclusively
 	$lock = "revision-upgrade-{$post->ID}";
 	$now = time();
-	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
-	if ( ! $result ) {
+	$result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now));
+	if ( ! $result) {
 		// If we couldn't get a lock, see how old the previous lock is
-		$locked = get_option( $lock );
-		if ( ! $locked ) {
+		$locked = get_option($lock);
+		if ( ! $locked) {
 			// Can't write to the lock, and can't read the lock.
 			// Something broken has happened
 			return false;
 		}
 
-		if ( $locked > $now - 3600 ) {
+		if ($locked > $now - 3600) {
 			// Lock is not too old: some other process may be upgrading this post.  Bail.
 			return false;
 		}
@@ -671,57 +671,57 @@ 
 	}
 
 	// If we could get a lock, re-"add" the option to fire all the correct filters.
-	update_option( $lock, $now );
+	update_option($lock, $now);
 
-	reset( $revisions );
+	reset($revisions);
 	$add_last = true;
 
 	do {
-		$this_revision = current( $revisions );
-		$prev_revision = next( $revisions );
+		$this_revision = current($revisions);
+		$prev_revision = next($revisions);
 
-		$this_revision_version = _wp_get_post_revision_version( $this_revision );
+		$this_revision_version = _wp_get_post_revision_version($this_revision);
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
+		if (false === $this_revision_version)
 			continue;
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
-		if ( 0 < $this_revision_version ) {
+		if (0 < $this_revision_version) {
 			$add_last = false;
 			continue;
 		}
 
 		// Always update the revision version
 		$update = array(
-			'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),
+			'post_name' => preg_replace('/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name),
 		);
 
 		// If this revision is the oldest revision of the post, i.e. no $prev_revision,
 		// the correct post_author is probably $post->post_author, but that's only a good guess.
 		// Update the revision version only and Leave the author as-is.
-		if ( $prev_revision ) {
-			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+		if ($prev_revision) {
+			$prev_revision_version = _wp_get_post_revision_version($prev_revision);
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
+			if ($prev_revision_version < 1)
 				$update['post_author'] = $prev_revision->post_author;
 		}
 
 		// Upgrade this revision
-		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
+		$result = $wpdb->update($wpdb->posts, $update, array('ID' => $this_revision->ID));
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ($result)
+			wp_cache_delete($this_revision->ID, 'posts');
 
-	} while ( $prev_revision );
+	} while ($prev_revision);
 
-	delete_option( $lock );
+	delete_option($lock);
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ($add_last)
+		wp_save_post_revision($post->ID);
 
 	return true;
 }

Braces +120 added lines, -82 removed lines

@@ -110,20 +110,25 @@ 
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
 function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-		return;
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+	}
 
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		return;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			return;
+	}
 
-	if ( 'auto-draft' == $post->post_status )
-		return;
+	if ( 'auto-draft' == $post->post_status ) {
+			return;
+	}
 
-	if ( ! wp_revisions_enabled( $post ) )
-		return;
+	if ( ! wp_revisions_enabled( $post ) ) {
+			return;
+	}
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
@@ -189,21 +194,24 @@ 
 	// delete the oldest ones.
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
-	if ( $revisions_to_keep < 0 )
-		return $return;
+	if ( $revisions_to_keep < 0 ) {
+			return $return;
+	}
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
-		return $return;
+	if ( $delete < 1 ) {
+			return $return;
+	}
 
 	$revisions = array_slice( $revisions, 0, $delete );
 
 	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
-			continue;
+		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
+					continue;
+		}
 
 		wp_delete_post_revision( $revisions[ $i ]->ID );
 	}
@@ -229,8 +237,9 @@ 
 
 	foreach ( $revisions as $revision ) {
 		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
-				continue;
+			if ( $user_id && $user_id != $revision->post_author ) {
+							continue;
+			}
 
 			return $revision;
 		}
@@ -248,8 +257,9 @@ 
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
 function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
 	return (int) $post->post_parent;
 }
@@ -263,11 +273,13 @@ 
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
 function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
-		return (int) $post->post_parent;
+	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
+			return (int) $post->post_parent;
+	}
 
 	return false;
 }
@@ -283,23 +295,27 @@ 
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
-		$post = get_post($post, ARRAY_A);
+	if ( is_object($post) ) {
+			$post = get_object_vars( $post );
+	} elseif ( !is_array($post) ) {
+			$post = get_post($post, ARRAY_A);
+	}
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	}
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if ( isset($post['post_type']) && 'revision' == $post['post_type'] ) {
+			return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	}
 
 	$post = _wp_post_revision_data( $post, $autosave );
 	$post = wp_slash($post); //since data is from db
 
 	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
-		return $revision_id;
+	if ( is_wp_error($revision_id) ) {
+			return $revision_id;
+	}
 
 	if ( $revision_id ) {
 		/**
@@ -327,10 +343,12 @@ 
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
-		return $revision;
-	if ( 'revision' !== $revision->post_type )
-		return null;
+	if ( !$revision = get_post( $post, OBJECT, $filter ) ) {
+			return $revision;
+	}
+	if ( 'revision' !== $revision->post_type ) {
+			return null;
+	}
 
 	if ( $output == OBJECT ) {
 		return $revision;
@@ -357,27 +375,31 @@ 
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
-		return $revision;
+	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
+			return $revision;
+	}
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( !is_array( $fields ) ) {
+			$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	}
 
 	$update = array();
 	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
-		return false;
+	if ( !$update ) {
+			return false;
+	}
 
 	$update['ID'] = $revision['post_parent'];
 
 	$update = wp_slash( $update ); //since data is from db
 
 	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
-		return $post_id;
+	if ( ! $post_id || is_wp_error( $post_id ) ) {
+			return $post_id;
+	}
 
 	// Update last edit user
 	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
@@ -439,19 +461,22 @@ 
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
-		return array();
+	if ( ! $post || empty( $post->ID ) ) {
+			return array();
+	}
 
 	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
-		return array();
+	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) {
+			return array();
+	}
 
 	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
 
-	if ( ! $revisions = get_children( $args ) )
-		return array();
+	if ( ! $revisions = get_children( $args ) ) {
+			return array();
+	}
 
 	return $revisions;
 }
@@ -484,13 +509,15 @@ 
 function wp_revisions_to_keep( $post ) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
-		$num = -1;
-	else
-		$num = intval( $num );
+	if ( true === $num ) {
+			$num = -1;
+	} else {
+			$num = intval( $num );
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		$num = 0;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			$num = 0;
+	}
 
 	/**
 	 * Filters the number of revisions to save for the given post.
@@ -546,8 +573,9 @@ 
 	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) {
+					wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		}
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -565,16 +593,20 @@ 
  * @return array
  */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
-		return $terms;
+	if ( ! $post = get_post() ) {
+			return $terms;
+	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
-		return $terms;
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
+			return $terms;
+	}
 
-	if ( 'standard' == $_REQUEST['post_format'] )
-		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	if ( 'standard' == $_REQUEST['post_format'] ) {
+			$terms = array();
+	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
+			$terms = array( $term );
+	}
+	// Can only have one post format
 
 	return $terms;
 }
@@ -623,13 +655,15 @@ 
  * @return int|false
  */
 function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
-		return false;
+	if ( is_object( $revision ) ) {
+			$revision = get_object_vars( $revision );
+	} elseif ( !is_array( $revision ) ) {
+			return false;
+	}
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
-		return (int) $matches[1];
+	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) ) {
+			return (int) $matches[1];
+	}
 
 	return 0;
 }
@@ -683,8 +717,9 @@ 
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
-			continue;
+		if ( false === $this_revision_version ) {
+					continue;
+		}
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
@@ -705,23 +740,26 @@ 
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
-				$update['post_author'] = $prev_revision->post_author;
+			if ( $prev_revision_version < 1 ) {
+							$update['post_author'] = $prev_revision->post_author;
+			}
 		}
 
 		// Upgrade this revision
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ( $result ) {
+					wp_cache_delete( $this_revision->ID, 'posts' );
+		}
 
 	} while ( $prev_revision );
 
 	delete_option( $lock );
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ( $add_last ) {
+			wp_save_post_revision( $post->ID );
+	}
 
 	return true;
 }

src/wp-admin/update.php

Spacing +112 added lines, -112 removed lines

@@ -6,99 +6,99 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
-	define( 'IFRAME_REQUEST', true );
+if ( ! defined('IFRAME_REQUEST') && isset($_GET['action']) && in_array($_GET['action'], array('update-selected', 'activate-plugin', 'update-selected-themes')))
+	define('IFRAME_REQUEST', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
-if ( isset($_GET['action']) ) {
+if (isset($_GET['action'])) {
 	$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
 	$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+	if ('update-selected' == $action) {
+		if ( ! current_user_can('update_plugins'))
+			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer( 'bulk-update-plugins' );
+		check_admin_referer('bulk-update-plugins');
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['plugins']))
+			$plugins = explode(',', stripslashes($_GET['plugins']));
+		elseif (isset($_POST['checked']))
 			$plugins = (array) $_POST['checked'];
 		else
 			$plugins = array();
 
 		$plugins = array_map('urldecode', $plugins);
 
-		$url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
+		$url = 'update.php?action=update-selected&plugins='.urlencode(implode(',', $plugins));
 		$nonce = 'bulk-update-plugins';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Plugin_Upgrader( new Bulk_Plugin_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $plugins );
+		$upgrader = new Plugin_Upgrader(new Bulk_Plugin_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($plugins);
 
 		iframe_footer();
 
-	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('upgrade-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer('upgrade-plugin_' . $plugin);
+		check_admin_referer('upgrade-plugin_'.$plugin);
 
 		$title = __('Update Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugins.php';
 
-		wp_enqueue_script( 'updates' );
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		wp_enqueue_script('updates');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-plugin_' . $plugin;
-		$url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
+		$nonce = 'upgrade-plugin_'.$plugin;
+		$url = 'update.php?action=upgrade-plugin&plugin='.urlencode($plugin);
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Upgrader_Skin(compact('title', 'nonce', 'url', 'plugin')));
 		$upgrader->upgrade($plugin);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('activate-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer('activate-plugin_' . $plugin);
-		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
-			activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-			wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
+		check_admin_referer('activate-plugin_'.$plugin);
+		if ( ! isset($_GET['failure']) && ! isset($_GET['success'])) {
+			wp_redirect(admin_url('update.php?action=activate-plugin&failure=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
+			activate_plugin($plugin, '', ! empty($_GET['networkwide']), true);
+			wp_redirect(admin_url('update.php?action=activate-plugin&success=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
 			die();
 		}
-		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		iframe_header(__('Plugin Reactivation'), true);
+		if (isset($_GET['success']))
+			echo '<p>'.__('Plugin reactivated successfully.').'</p>';
 
-		if ( isset($_GET['failure']) ){
-			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
+		if (isset($_GET['failure'])) {
+			echo '<p>'.__('Plugin failed to reactivate due to a fatal error.').'</p>';
 
-			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+			error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-			wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-			include( WP_PLUGIN_DIR . '/' . $plugin );
+			wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
+			include(WP_PLUGIN_DIR.'/'.$plugin);
 		}
 		iframe_footer();
-	} elseif ( 'install-plugin' == $action ) {
+	} elseif ('install-plugin' == $action) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins'))
+			wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+		include_once(ABSPATH.'wp-admin/includes/plugin-install.php'); //for plugins_api..
 
-		check_admin_referer( 'install-plugin_' . $plugin );
-		$api = plugins_api( 'plugin_information', array(
+		check_admin_referer('install-plugin_'.$plugin);
+		$api = plugins_api('plugin_information', array(
 			'slug' => $plugin,
 			'fields' => array(
 				'short_description' => false,
@@ -114,34 +114,34 @@ 
 				'homepage' => false,
 				'donate_link' => false,
 			),
-		) );
+		));
 
-		if ( is_wp_error( $api ) ) {
-	 		wp_die( $api );
+		if (is_wp_error($api)) {
+	 		wp_die($api);
 		}
 
 		$title = __('Plugin Install');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-plugin_' . $plugin;
-		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		$title = sprintf(__('Installing Plugin: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-plugin_'.$plugin;
+		$url = 'update.php?action=install-plugin&plugin='.urlencode($plugin);
+		if (isset($_GET['from']))
+			$url .= '&from='.urlencode(stripslashes($_GET['from']));
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-plugin' == $action ) {
+	} elseif ('upload-plugin' == $action) {
 
-		if ( ! current_user_can( 'upload_plugins' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('upload_plugins')) {
+			wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
 		}
 
 		check_admin_referer('plugin-upload');
@@ -151,128 +151,128 @@ 
 		$title = __('Upload Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Plugin from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'plugin-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upgrade-theme' == $action ) {
+	} elseif ('upgrade-theme' == $action) {
 
-		if ( ! current_user_can('update_themes') )
+		if ( ! current_user_can('update_themes'))
 			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
 
-		check_admin_referer('upgrade-theme_' . $theme);
+		check_admin_referer('upgrade-theme_'.$theme);
 
-		wp_enqueue_script( 'customize-loader' );
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('customize-loader');
+		wp_enqueue_script('updates');
 
 		$title = __('Update Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-theme_' . $theme;
-		$url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
+		$nonce = 'upgrade-theme_'.$theme;
+		$url = 'update.php?action=upgrade-theme&theme='.urlencode($theme);
 
-		$upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Upgrader_Skin(compact('title', 'nonce', 'url', 'theme')));
 		$upgrader->upgrade($theme);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
-	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		include(ABSPATH.'wp-admin/admin-footer.php');
+	} elseif ('update-selected-themes' == $action) {
+		if ( ! current_user_can('update_themes'))
+			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
 
-		check_admin_referer( 'bulk-update-themes' );
+		check_admin_referer('bulk-update-themes');
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['themes']))
+			$themes = explode(',', stripslashes($_GET['themes']));
+		elseif (isset($_POST['checked']))
 			$themes = (array) $_POST['checked'];
 		else
 			$themes = array();
 
 		$themes = array_map('urldecode', $themes);
 
-		$url = 'update.php?action=update-selected-themes&amp;themes=' . urlencode(implode(',', $themes));
+		$url = 'update.php?action=update-selected-themes&amp;themes='.urlencode(implode(',', $themes));
 		$nonce = 'bulk-update-themes';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Theme_Upgrader( new Bulk_Theme_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $themes );
+		$upgrader = new Theme_Upgrader(new Bulk_Theme_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($themes);
 
 		iframe_footer();
-	} elseif ( 'install-theme' == $action ) {
+	} elseif ('install-theme' == $action) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes'))
+			wp_die(__('Sorry, you are not allowed to install themes on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
+		include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php'); //for themes_api..
 
-		check_admin_referer( 'install-theme_' . $theme );
-		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		check_admin_referer('install-theme_'.$theme);
+		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false))); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
+		if (is_wp_error($api))
 	 		wp_die($api);
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Install Themes');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-theme_' . $theme;
-		$url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
+		$title = sprintf(__('Installing Theme: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-theme_'.$theme;
+		$url = 'update.php?action=install-theme&theme='.urlencode($theme);
 		$type = 'web'; //Install theme type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-theme' == $action ) {
+	} elseif ('upload-theme' == $action) {
 
-		if ( ! current_user_can( 'upload_themes' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('upload_themes')) {
+			wp_die(__('Sorry, you are not allowed to install themes on this site.'));
 		}
 
 		check_admin_referer('theme-upload');
 
 		$file_upload = new File_Upload_Upgrader('themezip', 'package');
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Upload Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'theme-install.php';
 
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Theme from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'theme-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
 	} else {
 		/**
@@ -284,6 +284,6 @@ 
 		 *
 		 * @since 2.8.0
 		 */
-		do_action( "update-custom_{$action}" );
+		do_action("update-custom_{$action}");
 	}
 }

Braces +52 added lines, -37 removed lines

@@ -6,8 +6,9 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -20,17 +21,19 @@ 
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
 	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		if ( ! current_user_can( 'update_plugins' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-plugins' );
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$plugins = (array) $_POST['checked'];
-		else
-			$plugins = array();
+		if ( isset( $_GET['plugins'] ) ) {
+					$plugins = explode( ',', stripslashes($_GET['plugins']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$plugins = (array) $_POST['checked'];
+		} else {
+					$plugins = array();
+		}
 
 		$plugins = array_map('urldecode', $plugins);
 
@@ -46,8 +49,9 @@ 
 		iframe_footer();
 
 	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('upgrade-plugin_' . $plugin);
 
@@ -67,8 +71,9 @@ 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('activate-plugin_' . $plugin);
 		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
@@ -78,8 +83,9 @@ 
 			die();
 		}
 		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		if ( isset($_GET['success']) ) {
+					echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		}
 
 		if ( isset($_GET['failure']) ){
 			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
@@ -92,8 +98,9 @@ 
 		iframe_footer();
 	} elseif ( 'install-plugin' == $action ) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins') ) {
+					wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
@@ -128,8 +135,9 @@ 
 		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
 		$nonce = 'install-plugin_' . $plugin;
 		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		if ( isset($_GET['from']) ) {
+					$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		}
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
@@ -161,15 +169,17 @@ 
 		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ( 'upgrade-theme' == $action ) {
 
-		if ( ! current_user_can('update_themes') )
-			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		if ( ! current_user_can('update_themes') ) {
+					wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		}
 
 		check_admin_referer('upgrade-theme_' . $theme);
 
@@ -189,17 +199,19 @@ 
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		if ( ! current_user_can( 'update_themes' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-themes' );
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$themes = (array) $_POST['checked'];
-		else
-			$themes = array();
+		if ( isset( $_GET['themes'] ) ) {
+					$themes = explode( ',', stripslashes($_GET['themes']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$themes = (array) $_POST['checked'];
+		} else {
+					$themes = array();
+		}
 
 		$themes = array_map('urldecode', $themes);
 
@@ -215,16 +227,18 @@ 
 		iframe_footer();
 	} elseif ( 'install-theme' == $action ) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes') ) {
+					wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
-	 		wp_die($api);
+		if ( is_wp_error($api) ) {
+			 		wp_die($api);
+		}
 
 		wp_enqueue_script( 'customize-loader' );
 
@@ -269,8 +283,9 @@ 
 		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 

src/wp-admin/plugins.php

Braces +52 added lines, -36 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('activate_plugins') )
+if ( ! current_user_can('activate_plugins') ) {
 	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Plugins_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -29,8 +30,9 @@ 
 
 	switch ( $action ) {
 		case 'activate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
 				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
@@ -68,8 +70,9 @@ 
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -121,12 +124,13 @@ 
 
 			check_admin_referer( 'bulk-plugins' );
 
-			if ( isset( $_GET['plugins'] ) )
-				$plugins = explode( ',', $_GET['plugins'] );
-			elseif ( isset( $_POST['checked'] ) )
-				$plugins = (array) $_POST['checked'];
-			else
-				$plugins = array();
+			if ( isset( $_GET['plugins'] ) ) {
+							$plugins = explode( ',', $_GET['plugins'] );
+			} elseif ( isset( $_POST['checked'] ) ) {
+							$plugins = (array) $_POST['checked'];
+			} else {
+							$plugins = array();
+			}
 
 			$title = __( 'Update Plugins' );
 			$parent_file = 'plugins.php';
@@ -146,14 +150,16 @@ 
 			exit;
 
 		case 'error_scrape':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('plugin-activation-error_' . $plugin);
 
 			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
-				wp_die($valid);
+			if ( is_wp_error($valid) ) {
+							wp_die($valid);
+			}
 
 			if ( ! WP_DEBUG ) {
 				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
@@ -167,8 +173,9 @@ 
 			exit;
 
 		case 'deactivate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('deactivate-plugin_' . $plugin);
 
@@ -185,15 +192,17 @@ 
 				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
 			}
 
-			if ( headers_sent() )
-				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
-			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			if ( headers_sent() ) {
+							echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
+			} else {
+							wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			}
 			exit;
 
 		case 'deactivate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -290,8 +299,11 @@ 
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
-				<?php else: ?>
-					<h1><?php _e( 'Delete Plugins' ); ?></h1>
+				<?php else {
+	: ?>
+					<h1><?php _e( 'Delete Plugins' );
+}
+?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
@@ -313,10 +325,11 @@ 
 						?>
 					</ul>
 				<p><?php
-				if ( $data_to_delete )
-					_e('Are you sure you wish to delete these files and data?');
-				else
-					_e('Are you sure you wish to delete these files?');
+				if ( $data_to_delete ) {
+									_e('Are you sure you wish to delete these files and data?');
+				} else {
+									_e('Are you sure you wish to delete these files?');
+				}
 				?></p>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
@@ -423,12 +436,13 @@ 
 
 <?php if ( isset($_GET['error']) ) :
 
-	if ( isset( $_GET['main'] ) )
-		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
-		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
-	else
-		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	if ( isset( $_GET['main'] ) ) {
+			$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
+	} elseif ( isset($_GET['charsout']) ) {
+			$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
+	} else {
+			$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	}
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
@@ -451,12 +465,14 @@ 
 
 		if ( is_wp_error($delete_result) ) : ?>
 		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
 				<?php
 				if ( 1 == (int) $_GET['deleted'] ) {
 					_e( 'The selected plugin has been <strong>deleted</strong>.' );
+}
 				} else {
 					_e( 'The selected plugins have been <strong>deleted</strong>.' );
 				}

Spacing +205 added lines, -205 removed lines

@@ -7,10 +7,10 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('activate_plugins') )
-	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+if ( ! current_user_can('activate_plugins'))
+	wp_die(__('Sorry, you are not allowed to manage plugins for this site.'));
 
 $wp_list_table = _get_list_table('WP_Plugins_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -18,310 +18,310 @@ 
 $action = $wp_list_table->current_action();
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
-$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
+$s = isset($_REQUEST['s']) ? urlencode(wp_unslash($_REQUEST['s'])) : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
 $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
 
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('updates');
 
-if ( $action ) {
+if ($action) {
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'activate':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
-			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (is_multisite() && ! is_network_admin() && is_network_only_plugin($plugin)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			check_admin_referer('activate-plugin_' . $plugin);
+			check_admin_referer('activate-plugin_'.$plugin);
 
-			$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
-			if ( is_wp_error( $result ) ) {
-				if ( 'unexpected_output' == $result->get_error_code() ) {
-					$redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
-					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+			$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin='.$plugin), is_network_admin());
+			if (is_wp_error($result)) {
+				if ('unexpected_output' == $result->get_error_code()) {
+					$redirect = self_admin_url('plugins.php?error=true&charsout='.strlen($result->get_error_data()).'&plugin='.$plugin."&plugin_status=$status&paged=$page&s=$s");
+					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_'.$plugin), $redirect));
 					exit;
 				} else {
 					wp_die($result);
 				}
 			}
 
-			if ( ! is_network_admin() ) {
-				$recent = (array) get_option( 'recently_activated' );
-				unset( $recent[ $plugin ] );
-				update_option( 'recently_activated', $recent );
+			if ( ! is_network_admin()) {
+				$recent = (array) get_option('recently_activated');
+				unset($recent[$plugin]);
+				update_option('recently_activated', $recent);
 			} else {
-				$recent = (array) get_site_option( 'recently_activated' );
-				unset( $recent[ $plugin ] );
-				update_site_option( 'recently_activated', $recent );
+				$recent = (array) get_site_option('recently_activated');
+				unset($recent[$plugin]);
+				update_site_option('recently_activated', $recent);
 			}
 
-			if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-				wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
+			if (isset($_GET['from']) && 'import' == $_GET['from']) {
+				wp_redirect(self_admin_url("import.php?import=".str_replace('-importer', '', dirname($plugin)))); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
 			} else {
-				wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
+				wp_redirect(self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s")); // overrides the ?error=true one above
 			}
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
 			check_admin_referer('bulk-plugins');
 
-			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+			$plugins = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
 
-			if ( is_network_admin() ) {
-				foreach ( $plugins as $i => $plugin ) {
+			if (is_network_admin()) {
+				foreach ($plugins as $i => $plugin) {
 					// Only activate plugins which are not already network activated.
-					if ( is_plugin_active_for_network( $plugin ) ) {
-						unset( $plugins[ $i ] );
+					if (is_plugin_active_for_network($plugin)) {
+						unset($plugins[$i]);
 					}
 				}
 			} else {
-				foreach ( $plugins as $i => $plugin ) {
+				foreach ($plugins as $i => $plugin) {
 					// Only activate plugins which are not already active and are not network-only when on Multisite.
-					if ( is_plugin_active( $plugin ) || ( is_multisite() && is_network_only_plugin( $plugin ) ) ) {
-						unset( $plugins[ $i ] );
+					if (is_plugin_active($plugin) || (is_multisite() && is_network_only_plugin($plugin))) {
+						unset($plugins[$i]);
 					}
 				}
 			}
 
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin() );
+			activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin());
 
-			if ( ! is_network_admin() ) {
-				$recent = (array) get_option('recently_activated' );
+			if ( ! is_network_admin()) {
+				$recent = (array) get_option('recently_activated');
 			} else {
-				$recent = (array) get_site_option('recently_activated' );
+				$recent = (array) get_site_option('recently_activated');
 			}
 
-			foreach ( $plugins as $plugin ) {
-				unset( $recent[ $plugin ] );
+			foreach ($plugins as $plugin) {
+				unset($recent[$plugin]);
 			}
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', $recent );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', $recent);
 			} else {
-				update_site_option( 'recently_activated', $recent );
+				update_site_option('recently_activated', $recent);
 			}
 
-			wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect(self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'update-selected' :
 
-			check_admin_referer( 'bulk-plugins' );
+			check_admin_referer('bulk-plugins');
 
-			if ( isset( $_GET['plugins'] ) )
-				$plugins = explode( ',', $_GET['plugins'] );
-			elseif ( isset( $_POST['checked'] ) )
+			if (isset($_GET['plugins']))
+				$plugins = explode(',', $_GET['plugins']);
+			elseif (isset($_POST['checked']))
 				$plugins = (array) $_POST['checked'];
 			else
 				$plugins = array();
 
-			$title = __( 'Update Plugins' );
+			$title = __('Update Plugins');
 			$parent_file = 'plugins.php';
 
-			wp_enqueue_script( 'updates' );
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+			wp_enqueue_script('updates');
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			echo '<h1>' . esc_html( $title ) . '</h1>';
+			echo '<h1>'.esc_html($title).'</h1>';
 
-			$url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
+			$url = self_admin_url('update.php?action=update-selected&amp;plugins='.urlencode(join(',', $plugins)));
 			$url = wp_nonce_url($url, 'bulk-update-plugins');
 
 			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
 			echo '</div>';
-			require_once(ABSPATH . 'wp-admin/admin-footer.php');
+			require_once(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 
 		case 'error_scrape':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
-			check_admin_referer('plugin-activation-error_' . $plugin);
+			check_admin_referer('plugin-activation-error_'.$plugin);
 
 			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
+			if (is_wp_error($valid))
 				wp_die($valid);
 
-			if ( ! WP_DEBUG ) {
-				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+			if ( ! WP_DEBUG) {
+				error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 			}
 
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			// Go back to "sandbox" scope so we get the same errors as before
-			plugin_sandbox_scrape( $plugin );
+			plugin_sandbox_scrape($plugin);
 			/** This action is documented in wp-admin/includes/plugin.php */
-			do_action( "activate_{$plugin}" );
+			do_action("activate_{$plugin}");
 			exit;
 
 		case 'deactivate':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
 
-			check_admin_referer('deactivate-plugin_' . $plugin);
+			check_admin_referer('deactivate-plugin_'.$plugin);
 
-			if ( ! is_network_admin() && is_plugin_active_for_network( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if ( ! is_network_admin() && is_plugin_active_for_network($plugin)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			deactivate_plugins( $plugin, false, is_network_admin() );
+			deactivate_plugins($plugin, false, is_network_admin());
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', array($plugin => time()) + (array) get_option('recently_activated'));
 			} else {
-				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
+				update_site_option('recently_activated', array($plugin => time()) + (array) get_site_option('recently_activated'));
 			}
 
-			if ( headers_sent() )
-				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
+			if (headers_sent())
+				echo "<meta http-equiv='refresh' content='".esc_attr("0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s")."' />";
 			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect(self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'deactivate-selected':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
 
 			check_admin_referer('bulk-plugins');
 
-			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+			$plugins = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
 			// Do not deactivate plugins which are already deactivated.
-			if ( is_network_admin() ) {
-				$plugins = array_filter( $plugins, 'is_plugin_active_for_network' );
+			if (is_network_admin()) {
+				$plugins = array_filter($plugins, 'is_plugin_active_for_network');
 			} else {
-				$plugins = array_filter( $plugins, 'is_plugin_active' );
-				$plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) );
+				$plugins = array_filter($plugins, 'is_plugin_active');
+				$plugins = array_diff($plugins, array_filter($plugins, 'is_plugin_active_for_network'));
 			}
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			deactivate_plugins( $plugins, false, is_network_admin() );
+			deactivate_plugins($plugins, false, is_network_admin());
 
 			$deactivated = array();
-			foreach ( $plugins as $plugin ) {
-				$deactivated[ $plugin ] = time();
+			foreach ($plugins as $plugin) {
+				$deactivated[$plugin] = time();
 			}
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', $deactivated + (array) get_option('recently_activated'));
 			} else {
-				update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
+				update_site_option('recently_activated', $deactivated + (array) get_site_option('recently_activated'));
 			}
 
-			wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect(self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'delete-selected':
-			if ( ! current_user_can('delete_plugins') ) {
+			if ( ! current_user_can('delete_plugins')) {
 				wp_die(__('Sorry, you are not allowed to delete plugins for this site.'));
 			}
 
 			check_admin_referer('bulk-plugins');
 
 			//$_POST = from the plugin form; $_GET = from the FTP details screen.
-			$plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
-			if ( empty( $plugins ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			$plugins = isset($_REQUEST['checked']) ? (array) $_REQUEST['checked'] : array();
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
 			$plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete Activated plugins.
-			if ( empty( $plugins ) ) {
-				wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
 			// Bail on all if any paths are invalid.
 			// validate_file() returns truthy for invalid files
-			$invalid_plugin_files = array_filter( $plugins, 'validate_file' );
-			if ( $invalid_plugin_files ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			$invalid_plugin_files = array_filter($plugins, 'validate_file');
+			if ($invalid_plugin_files) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			include(ABSPATH . 'wp-admin/update.php');
+			include(ABSPATH.'wp-admin/update.php');
 
 			$parent_file = 'plugins.php';
 
-			if ( ! isset($_REQUEST['verify-delete']) ) {
+			if ( ! isset($_REQUEST['verify-delete'])) {
 				wp_enqueue_script('jquery');
-				require_once(ABSPATH . 'wp-admin/admin-header.php');
+				require_once(ABSPATH.'wp-admin/admin-header.php');
 				?>
 			<div class="wrap">
 				<?php
 					$plugin_info = array();
 					$have_non_network_plugins = false;
-					foreach ( (array) $plugins as $plugin ) {
-						$plugin_slug = dirname( $plugin );
-
-						if ( '.' == $plugin_slug ) {
-							if ( $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ) {
-								$plugin_info[ $plugin ] = $data;
-								$plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-								if ( ! $plugin_info[ $plugin ]['Network'] ) {
+					foreach ((array) $plugins as $plugin) {
+						$plugin_slug = dirname($plugin);
+
+						if ('.' == $plugin_slug) {
+							if ($data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin)) {
+								$plugin_info[$plugin] = $data;
+								$plugin_info[$plugin]['is_uninstallable'] = is_uninstallable_plugin($plugin);
+								if ( ! $plugin_info[$plugin]['Network']) {
 									$have_non_network_plugins = true;
 								}
 							}
 						} else {
 							// Get plugins list from that folder.
-							if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
-								foreach ( $folder_plugins as $plugin_file => $data ) {
-									$plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
-									$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-									if ( ! $plugin_info[ $plugin_file ]['Network'] ) {
+							if ($folder_plugins = get_plugins('/'.$plugin_slug)) {
+								foreach ($folder_plugins as $plugin_file => $data) {
+									$plugin_info[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $data);
+									$plugin_info[$plugin_file]['is_uninstallable'] = is_uninstallable_plugin($plugin);
+									if ( ! $plugin_info[$plugin_file]['Network']) {
 										$have_non_network_plugins = true;
 									}
 								}
 							}
 						}
 					}
-					$plugins_to_delete = count( $plugin_info );
+					$plugins_to_delete = count($plugin_info);
 				?>
-				<?php if ( 1 == $plugins_to_delete ) : ?>
-					<h1><?php _e( 'Delete Plugin' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
+				<?php if (1 == $plugins_to_delete) : ?>
+					<h1><?php _e('Delete Plugin'); ?></h1>
+					<?php if ($have_non_network_plugins && is_network_admin()) : ?>
+						<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('This plugin may be active on other sites in the network.'); ?></p></div>
 					<?php endif; ?>
-					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
+					<p><?php _e('You are about to remove the following plugin:'); ?></p>
 				<?php else: ?>
-					<h1><?php _e( 'Delete Plugins' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
+					<h1><?php _e('Delete Plugins'); ?></h1>
+					<?php if ($have_non_network_plugins && is_network_admin()) : ?>
+						<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('These plugins may be active on other sites in the network.'); ?></p></div>
 					<?php endif; ?>
-					<p><?php _e( 'You are about to remove the following plugins:' ); ?></p>
+					<p><?php _e('You are about to remove the following plugins:'); ?></p>
 				<?php endif; ?>
 					<ul class="ul-disc">
 						<?php
 						$data_to_delete = false;
-						foreach ( $plugin_info as $plugin ) {
-							if ( $plugin['is_uninstallable'] ) {
+						foreach ($plugin_info as $plugin) {
+							if ($plugin['is_uninstallable']) {
 								/* translators: 1: plugin name, 2: plugin author */
-								echo '<li>', sprintf( __( '%1$s by %2$s (will also <strong>delete its data</strong>)' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] . '</em>' ), '</li>';
+								echo '<li>', sprintf(__('%1$s by %2$s (will also <strong>delete its data</strong>)'), '<strong>'.$plugin['Name'].'</strong>', '<em>'.$plugin['AuthorName'].'</em>'), '</li>';
 								$data_to_delete = true;
 							} else {
 								/* translators: 1: plugin name, 2: plugin author */
-								echo '<li>', sprintf( _x('%1$s by %2$s', 'plugin' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] ) . '</em>', '</li>';
+								echo '<li>', sprintf(_x('%1$s by %2$s', 'plugin'), '<strong>'.$plugin['Name'].'</strong>', '<em>'.$plugin['AuthorName']).'</em>', '</li>';
 							}
 						}
 						?>
 					</ul>
 				<p><?php
-				if ( $data_to_delete )
+				if ($data_to_delete)
 					_e('Are you sure you wish to delete these files and data?');
 				else
 					_e('Are you sure you wish to delete these files?');
@@ -330,50 +330,50 @@ 
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array) $plugins as $plugin ) {
-							echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
+						foreach ((array) $plugins as $plugin) {
+							echo '<input type="hidden" name="checked[]" value="'.esc_attr($plugin).'" />';
 						}
 					?>
 					<?php wp_nonce_field('bulk-plugins') ?>
-					<?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), '', 'submit', false ); ?>
+					<?php submit_button($data_to_delete ? __('Yes, delete these files and data') : __('Yes, delete these files'), '', 'submit', false); ?>
 				</form>
 				<?php
 				$referer = wp_get_referer();
 				?>
-				<form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
-					<?php submit_button( __( 'No, return me to the plugin list' ), '', 'submit', false ); ?>
+				<form method="post" action="<?php echo $referer ? esc_url($referer) : ''; ?>" style="display:inline;">
+					<?php submit_button(__('No, return me to the plugin list'), '', 'submit', false); ?>
 				</form>
 			</div>
 				<?php
-				require_once(ABSPATH . 'wp-admin/admin-footer.php');
+				require_once(ABSPATH.'wp-admin/admin-footer.php');
 				exit;
 			} else {
-				$plugins_to_delete = count( $plugins );
+				$plugins_to_delete = count($plugins);
 			} // endif verify-delete
 
-			$delete_result = delete_plugins( $plugins );
+			$delete_result = delete_plugins($plugins);
 
-			set_transient('plugins_delete_result_' . $user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
-			wp_redirect( self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s") );
+			set_transient('plugins_delete_result_'.$user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
+			wp_redirect(self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'clear-recent-list':
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', array() );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', array());
 			} else {
-				update_site_option( 'recently_activated', array() );
+				update_site_option('recently_activated', array());
 			}
 			break;
 
 		default:
-			if ( isset( $_POST['checked'] ) ) {
+			if (isset($_POST['checked'])) {
 				check_admin_referer('bulk-plugins');
-				$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+				$plugins = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
 				$sendback = wp_get_referer();
 
 				/** This action is documented in wp-admin/edit-comments.php */
-				$sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $action, $plugins );
-				wp_safe_redirect( $sendback );
+				$sendback = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $sendback, $action, $plugins);
+				wp_safe_redirect($sendback);
 				exit;
 			}
 			break;
@@ -386,132 +386,132 @@ 
 wp_enqueue_script('plugin-install');
 add_thickbox();
 
-add_screen_option( 'per_page', array( 'default' => 999 ) );
+add_screen_option('per_page', array('default' => 999));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
-	'<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . sprintf(
+	'<p>'.__('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.').'</p>'.
+	'<p>'.__('The search for installed plugins will search for terms in their name, description, or author.').' <span id="live-search-desc" class="hide-if-no-js">'.__('The search results will be updated as you type.').'</span></p>'.
+	'<p>'.sprintf(
 		/* translators: %s: WordPress Plugin Directory URL */
-		__( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
-		__( 'https://wordpress.org/plugins/' )
-	) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+		__('If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'),
+		__('https://wordpress.org/plugins/')
+	).'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'compatibility-problems',
 'title'		=> __('Troubleshooting'),
 'content'	=>
-	'<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
-	'<p>' . sprintf(
+	'<p>'.__('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.').'</p>'.
+	'<p>'.sprintf(
 		/* translators: WP_PLUGIN_DIR constant value */
-		__( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
-		'<code>' . WP_PLUGIN_DIR . '</code>'
-	) . '</p>'
-) );
+		__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'),
+		'<code>'.WP_PLUGIN_DIR.'</code>'
+	).'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter plugins list' ),
-	'heading_pagination' => __( 'Plugins list navigation' ),
-	'heading_list'       => __( 'Plugins list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter plugins list'),
+	'heading_pagination' => __('Plugins list navigation'),
+	'heading_list'       => __('Plugins list'),
+));
 
 $title = __('Plugins');
 $parent_file = 'plugins.php';
 
-require_once(ABSPATH . 'wp-admin/admin-header.php');
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 $invalid = validate_active_plugins();
-if ( ! empty( $invalid ) ) {
-	foreach ( $invalid as $plugin_file => $error ) {
+if ( ! empty($invalid)) {
+	foreach ($invalid as $plugin_file => $error) {
 		echo '<div id="message" class="error"><p>';
 		printf(
 			/* translators: 1: plugin file 2: error message */
-			__( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
-			'<code>' . esc_html( $plugin_file ) . '</code>',
+			__('The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s'),
+			'<code>'.esc_html($plugin_file).'</code>',
 			$error->get_error_message() );
 		echo '</p></div>';
 	}
 }
 ?>
 
-<?php if ( isset($_GET['error']) ) :
+<?php if (isset($_GET['error'])) :
 
-	if ( isset( $_GET['main'] ) )
-		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
+	if (isset($_GET['main']))
+		$errmsg = __('You cannot delete a plugin while it is active on the main site.');
+	elseif (isset($_GET['charsout']))
 		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
 	else
 		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
-		if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
-			$iframe_url = add_query_arg( array(
+		if ( ! isset($_GET['main']) && ! isset($_GET['charsout']) && wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_'.$plugin)) {
+			$iframe_url = add_query_arg(array(
 				'action'   => 'error_scrape',
-				'plugin'   => urlencode( $plugin ),
-				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
-			), admin_url( 'plugins.php' ) );
+				'plugin'   => urlencode($plugin),
+				'_wpnonce' => urlencode($_GET['_error_nonce']),
+			), admin_url('plugins.php'));
 		?>
-		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
+		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url($iframe_url); ?>"></iframe>
 	<?php
 		}
 	?>
 	</div>
-<?php elseif ( isset($_GET['deleted']) ) :
-		$delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
+<?php elseif (isset($_GET['deleted'])) :
+		$delete_result = get_transient('plugins_delete_result_'.$user_ID);
 		// Delete it once we're done.
-		delete_transient( 'plugins_delete_result_' . $user_ID );
+		delete_transient('plugins_delete_result_'.$user_ID);
 
-		if ( is_wp_error($delete_result) ) : ?>
-		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+		if (is_wp_error($delete_result)) : ?>
+		<div id="message" class="error notice is-dismissible"><p><?php printf(__('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message()); ?></p></div>
 		<?php else : ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
 				<?php
-				if ( 1 == (int) $_GET['deleted'] ) {
-					_e( 'The selected plugin has been <strong>deleted</strong>.' );
+				if (1 == (int) $_GET['deleted']) {
+					_e('The selected plugin has been <strong>deleted</strong>.');
 				} else {
-					_e( 'The selected plugins have been <strong>deleted</strong>.' );
+					_e('The selected plugins have been <strong>deleted</strong>.');
 				}
 				?>
 			</p>
 		</div>
 		<?php endif; ?>
-<?php elseif ( isset($_GET['activate']) ) : ?>
+<?php elseif (isset($_GET['activate'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
 <?php elseif (isset($_GET['activate-multi'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>activated</strong>.'); ?></p></div>
-<?php elseif ( isset($_GET['deactivate']) ) : ?>
+<?php elseif (isset($_GET['deactivate'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div>
 <?php elseif (isset($_GET['deactivate-multi'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>deactivated</strong>.'); ?></p></div>
-<?php elseif ( 'update-selected' == $action ) : ?>
+<?php elseif ('update-selected' == $action) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('All selected plugins are up to date.'); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
 <?php
-if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
-	<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
+if (( ! is_multisite() || is_network_admin()) && current_user_can('install_plugins')) { ?>
+	<a href="<?php echo self_admin_url('plugin-install.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
 <?php
 }
 
-if ( strlen( $s ) ) {
+if (strlen($s)) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( urldecode( $s ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(urldecode($s)));
 }
 ?>
 
@@ -530,13 +530,13 @@ 
  *
  * @param array $plugins_all An array containing all installed plugins.
  */
-do_action( 'pre_current_active_plugins', $plugins['all'] );
+do_action('pre_current_active_plugins', $plugins['all']);
 ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form class="search-form search-plugins" method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Plugins' ), 'plugin' ); ?>
+<?php $wp_list_table->search_box(__('Search Installed Plugins'), 'plugin'); ?>
 </form>
 
 <form method="post" id="bulk-action-form">
@@ -555,4 +555,4 @@ 
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/import.php

Braces +8 added lines, -5 removed lines

@@ -73,10 +73,12 @@ 
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
-		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
-		continue;
+	if ( isset( $importers[ $pop_importer ] ) ) {
+			continue;
+	}
+	if ( isset( $importers[ $pop_data['importer-id'] ] ) ) {
+			continue;
+	}
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
 	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
@@ -193,8 +195,9 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
+if ( current_user_can('install_plugins') ) {
 	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+}
 ?>
 
 </div>

Spacing +67 added lines, -67 removed lines

@@ -9,28 +9,28 @@ 
 define('WP_LOAD_IMPORTERS', true);
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'import' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+if ( ! current_user_can('import')) {
+	wp_die(__('Sorry, you are not allowed to import content.'));
 }
 
 $title = __('Import');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
-		'<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.').'</p>'.
+		'<p>'.__('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen">Documentation on Import</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Import_Screen">Documentation on Import</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-if ( current_user_can( 'install_plugins' ) ) {
+if (current_user_can('install_plugins')) {
 	// List of popular importer plugins from the WordPress.org API.
 	$popular_importers = wp_get_popular_importers();
 } else {
@@ -38,30 +38,30 @@ 
 }
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
-if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
-	$importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
-	if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
-		wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
+if ( ! empty($_GET['invalid']) && isset($popular_importers[$_GET['invalid']])) {
+	$importer_id = $popular_importers[$_GET['invalid']]['importer-id'];
+	if ($importer_id != $_GET['invalid']) { // Prevent redirect loops.
+		wp_redirect(admin_url('admin.php?import='.$importer_id));
 		exit;
 	}
-	unset( $importer_id );
+	unset($importer_id);
 }
 
 add_thickbox();
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('plugin-install');
+wp_enqueue_script('updates');
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
-<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
+<h1><?php echo esc_html($title); ?></h1>
+<?php if ( ! empty($_GET['invalid'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
+		<p><strong><?php _e('ERROR:'); ?></strong> <?php
 			/* translators: %s: importer slug */
-			printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
+			printf(__('The %s importer is invalid or is not installed.'), '<strong>'.esc_html($_GET['invalid']).'</strong>');
 		?></p>
 	</div>
 <?php endif; ?>
@@ -72,108 +72,108 @@ 
 $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
-foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
+foreach ($popular_importers as $pop_importer => $pop_data) {
+	if (isset($importers[$pop_importer]))
 		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
+	if (isset($importers[$pop_data['importer-id']]))
 		continue;
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
-	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
+	$importers[$pop_data['importer-id']] = array($pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug']);
 }
 
-if ( empty( $importers ) ) {
-	echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
+if (empty($importers)) {
+	echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
 } else {
-	uasort( $importers, '_usort_by_first_member' );
+	uasort($importers, '_usort_by_first_member');
 ?>
 <table class="widefat importers striped">
 
 	<?php
-	foreach ( $importers as $importer_id => $data ) {
+	foreach ($importers as $importer_id => $data) {
 		$plugin_slug = $action = '';
 		$is_plugin_installed = false;
 
-		if ( isset( $data['install'] ) ) {
+		if (isset($data['install'])) {
 			$plugin_slug = $data['install'];
 
-			if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
+			if (file_exists(WP_PLUGIN_DIR.'/'.$plugin_slug)) {
 				// Looks like an importer is installed, but not active.
-				$plugins = get_plugins( '/' . $plugin_slug );
-				if ( ! empty( $plugins ) ) {
-					$keys = array_keys( $plugins );
-					$plugin_file = $plugin_slug . '/' . $keys[0];
-					$url = wp_nonce_url( add_query_arg( array(
+				$plugins = get_plugins('/'.$plugin_slug);
+				if ( ! empty($plugins)) {
+					$keys = array_keys($plugins);
+					$plugin_file = $plugin_slug.'/'.$keys[0];
+					$url = wp_nonce_url(add_query_arg(array(
 						'action' => 'activate',
 						'plugin' => $plugin_file,
 						'from'   => 'import',
-					), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file );
+					), admin_url('plugins.php')), 'activate-plugin_'.$plugin_file);
 					$action = sprintf(
 						'<a href="%s" aria-label="%s">%s</a>',
-						esc_url( $url ),
+						esc_url($url),
 						/* translators: %s: Importer name */
-						esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
-						__( 'Run Importer' )
+						esc_attr(sprintf(__('Run %s'), $data[0])),
+						__('Run Importer')
 					);
 
 					$is_plugin_installed = true;
 				}
 			}
 
-			if ( empty( $action ) ) {
-				if ( is_main_site() ) {
-					$url = wp_nonce_url( add_query_arg( array(
+			if (empty($action)) {
+				if (is_main_site()) {
+					$url = wp_nonce_url(add_query_arg(array(
 						'action' => 'install-plugin',
 						'plugin' => $plugin_slug,
 						'from'   => 'import',
-					), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug );
+					), self_admin_url('update.php')), 'install-plugin_'.$plugin_slug);
 					$action = sprintf(
 						'<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
-						esc_url( $url ),
-						esc_attr( $plugin_slug ),
-						esc_attr( $data[0] ),
+						esc_url($url),
+						esc_attr($plugin_slug),
+						esc_attr($data[0]),
 						/* translators: %s: Importer name */
-						esc_attr( sprintf( __( 'Install %s' ), $data[0] ) ),
-						__( 'Install Now' )
+						esc_attr(sprintf(__('Install %s'), $data[0])),
+						__('Install Now')
 					);
 				} else {
 					$action = sprintf(
 						/* translators: URL to wp-admin/import.php */
-						__( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ),
-						get_admin_url( get_current_network_id(), 'import.php' )
+						__('This importer is not installed. Please install importers from <a href="%s">the main site</a>.'),
+						get_admin_url(get_current_network_id(), 'import.php')
 					);
 				}
 			}
 		} else {
-			$url = add_query_arg( array(
+			$url = add_query_arg(array(
 				'import' => $importer_id,
-			), self_admin_url( 'admin.php' ) );
+			), self_admin_url('admin.php'));
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-				esc_url( $url ),
+				esc_url($url),
 				/* translators: %s: Importer name */
-				esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
-				__( 'Run Importer' )
+				esc_attr(sprintf(__('Run %s'), $data[0])),
+				__('Run Importer')
 			);
 
 			$is_plugin_installed = true;
 		}
 
-		if ( ! $is_plugin_installed && is_main_site() ) {
-			$url = add_query_arg( array(
+		if ( ! $is_plugin_installed && is_main_site()) {
+			$url = add_query_arg(array(
 				'tab'       => 'plugin-information',
 				'plugin'    => $plugin_slug,
 				'from'      => 'import',
 				'TB_iframe' => 'true',
 				'width'     => 600,
 				'height'    => 550,
-			), network_admin_url( 'plugin-install.php' ) );
+			), network_admin_url('plugin-install.php'));
 			$action .= sprintf(
 				' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
-				esc_url( $url ),
+				esc_url($url),
 				/* translators: %s: Importer name */
-				esc_attr( sprintf( __( 'More information about %s' ), $data[0] ) ),
-				__( 'Details' )
+				esc_attr(sprintf(__('More information about %s'), $data[0])),
+				__('Details')
 			);
 		}
 
@@ -193,8 +193,8 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+if (current_user_can('install_plugins'))
+	echo '<p>'.sprintf(__('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url(network_admin_url('plugin-install.php?tab=search&type=tag&s=importer'))).'</p>';
 ?>
 
 </div>
@@ -203,4 +203,4 @@ 
 wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');