ntwb / wordpress

src/wp-admin/network.php

Indentation +31 added lines, -31 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Network installation administration panel.
- *
- * A multi-step process allowing the user to enable a network of WordPress sites.
- *
- * @since 3.0.0
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Network installation administration panel.
+	 *
+	 * A multi-step process allowing the user to enable a network of WordPress sites.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 define( 'WP_INSTALLING_NETWORK', true );
 
@@ -64,23 +64,23 @@ 
 	return true;
 }
 /**
- * Allow subdirectory install.
- *
- * @since 3.0.0
- *
- * @global wpdb $wpdb
- *
- * @return bool Whether subdirectory install is allowed
- */
+	 * Allow subdirectory install.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @global wpdb $wpdb
+	 *
+	 * @return bool Whether subdirectory install is allowed
+	 */
 function allow_subdirectory_install() {
 	global $wpdb;
-        /**
-         * Filter whether to enable the subdirectory install feature in Multisite.
-         *
-         * @since 3.0.0
-         *
-         * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false.
-         */
+		/**
+		 * Filter whether to enable the subdirectory install feature in Multisite.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false.
+		 */
 	if ( apply_filters( 'allow_subdirectory_install', false ) )
 		return true;
 
@@ -94,11 +94,11 @@ 
 	return false;
 }
 /**
- * Get base domain of network.
- *
- * @since 3.0.0
- * @return string Base domain.
- */
+	 * Get base domain of network.
+	 *
+	 * @since 3.0.0
+	 * @return string Base domain.
+	 */
 function get_clean_basedomain() {
 	if ( $existing_domain = network_domain_check() )
 		return $existing_domain;
@@ -472,8 +472,8 @@ 
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
                 </rule>';
-                }
-                $web_config_file .= '
+				}
+				$web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
                     <action type="Redirect" url="' . $iis_subdir_replacement . 'wp-admin/" redirectType="Permanent" />

Spacing +206 added lines, -206 removed lines

@@ -10,25 +10,25 @@ 
  * @subpackage Administration
  */
 
-define( 'WP_INSTALLING_NETWORK', true );
+define('WP_INSTALLING_NETWORK', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_super_admin() )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! is_super_admin())
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
-if ( is_multisite() ) {
-	if ( ! is_network_admin() ) {
-		wp_redirect( network_admin_url( 'setup.php' ) );
+if (is_multisite()) {
+	if ( ! is_network_admin()) {
+		wp_redirect(network_admin_url('setup.php'));
 		exit;
 	}
-	if ( ! defined( 'MULTISITE' ) )
-		wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+	if ( ! defined('MULTISITE'))
+		wp_die(__('The Network creation panel is not for WordPress MU networks.'));
 }
 
 // We need to create references to ms global tables to enable Network.
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table)
 	$wpdb->$table = $prefixed_table;
 
 /**
@@ -43,9 +43,9 @@ 
 function network_domain_check() {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
-	if ( $wpdb->get_var( $sql ) ) {
-		return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
+	$sql = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->site));
+	if ($wpdb->get_var($sql)) {
+		return $wpdb->get_var("SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1");
 	}
 	return false;
 }
@@ -57,8 +57,8 @@ 
  * @return bool Whether subdomain install is allowed
  */
 function allow_subdomain_install() {
-	$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
-	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )
+	$domain = preg_replace('|https?://([^/]+)|', '$1', get_option('home'));
+	if (parse_url(get_option('home'), PHP_URL_PATH) || 'localhost' == $domain || preg_match('|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain))
 		return false;
 
 	return true;
@@ -81,14 +81,14 @@ 
          *
          * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false.
          */
-	if ( apply_filters( 'allow_subdirectory_install', false ) )
+	if (apply_filters('allow_subdirectory_install', false))
 		return true;
 
-	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL )
+	if (defined('ALLOW_SUBDIRECTORY_INSTALL') && ALLOW_SUBDIRECTORY_INSTALL)
 		return true;
 
-	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
-	if ( empty( $post ) )
+	$post = $wpdb->get_row("SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'");
+	if (empty($post))
 		return true;
 
 	return false;
@@ -100,52 +100,52 @@ 
  * @return string Base domain.
  */
 function get_clean_basedomain() {
-	if ( $existing_domain = network_domain_check() )
+	if ($existing_domain = network_domain_check())
 		return $existing_domain;
-	$domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
-	if ( $slash = strpos( $domain, '/' ) )
-		$domain = substr( $domain, 0, $slash );
+	$domain = preg_replace('|https?://|', '', get_option('siteurl'));
+	if ($slash = strpos($domain, '/'))
+		$domain = substr($domain, 0, $slash);
 	return $domain;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
-	wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
+if ( ! network_domain_check() && ( ! defined('WP_ALLOW_MULTISITE') || ! WP_ALLOW_MULTISITE))
+	wp_die(__('You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.'));
 
-if ( is_network_admin() ) {
-	$title = __( 'Network Setup' );
+if (is_network_admin()) {
+	$title = __('Network Setup');
 	$parent_file = 'settings.php';
 } else {
-	$title = __( 'Create a Network of WordPress Sites' );
+	$title = __('Create a Network of WordPress Sites');
 	$parent_file = 'tools.php';
 }
 
-$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
-	'<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
-	'<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
-	'<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
-	'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
-	'<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>') . '</p>';
-
-get_current_screen()->add_help_tab( array(
+$network_help = '<p>'.__('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.').'</p>'.
+	'<p>'.__('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).').'</p>'.
+	'<p>'.__('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.').'</p>'.
+	'<p>'.__('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).').'</p>'.
+	'<p>'.__('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.').'</p>'.
+	'<p>'.__('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.').'</p>'.
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>').'</p>';
+
+get_current_screen()->add_help_tab(array(
 	'id'      => 'network',
 	'title'   => __('Network'),
 	'content' => $network_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
 /**
@@ -160,90 +160,90 @@ 
  *
  * @param WP_Error $errors
  */
-function network_step1( $errors = false ) {
+function network_step1($errors = false) {
 	global $is_apache;
 
-	if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
-		echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
+		echo '<div class="error"><p><strong>'.__('ERROR:').'</strong> '.__('The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.').'</p></div>';
 		echo '</div>';
-		include( ABSPATH . 'wp-admin/admin-footer.php' );
+		include(ABSPATH.'wp-admin/admin-footer.php');
 		die();
 	}
 
-	$active_plugins = get_option( 'active_plugins' );
-	if ( ! empty( $active_plugins ) ) {
-		echo '<div class="updated"><p><strong>' . __('Warning:') . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
+	$active_plugins = get_option('active_plugins');
+	if ( ! empty($active_plugins)) {
+		echo '<div class="updated"><p><strong>'.__('Warning:').'</strong> '.sprintf(__('Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.'), admin_url('plugins.php?plugin_status=active')).'</p></div><p>'.__('Once the network is created, you may reactivate your plugins.').'</p>';
 		echo '</div>';
-		include( ABSPATH . 'wp-admin/admin-footer.php' );
+		include(ABSPATH.'wp-admin/admin-footer.php');
 		die();
 	}
 
 	$hostname = get_clean_basedomain();
-	$has_ports = strstr( $hostname, ':' );
-	if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
-		echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
-		echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
-		echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
+	$has_ports = strstr($hostname, ':');
+	if ((false !== $has_ports && ! in_array($has_ports, array(':80', ':443')))) {
+		echo '<div class="error"><p><strong>'.__('ERROR:').'</strong> '.__('You cannot install a network of sites with your server address.').'</p></div>';
+		echo '<p>'.sprintf(__('You cannot use port numbers such as <code>%s</code>.'), $has_ports).'</p>';
+		echo '<a href="'.esc_url(admin_url()).'">'.__('Return to Dashboard').'</a>';
 		echo '</div>';
-		include( ABSPATH . 'wp-admin/admin-footer.php' );
+		include(ABSPATH.'wp-admin/admin-footer.php');
 		die();
 	}
 
 	echo '<form method="post">';
 
-	wp_nonce_field( 'install-network-1' );
+	wp_nonce_field('install-network-1');
 
 	$error_codes = array();
-	if ( is_wp_error( $errors ) ) {
-		echo '<div class="error"><p><strong>' . __( 'ERROR: The network could not be created.' ) . '</strong></p>';
-		foreach ( $errors->get_error_messages() as $error )
+	if (is_wp_error($errors)) {
+		echo '<div class="error"><p><strong>'.__('ERROR: The network could not be created.').'</strong></p>';
+		foreach ($errors->get_error_messages() as $error)
 			echo "<p>$error</p>";
 		echo '</div>';
 		$error_codes = $errors->get_error_codes();
 	}
 
-	$site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) );
-	$admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' );
+	$site_name = ( ! empty($_POST['sitename']) && ! in_array('empty_sitename', $error_codes)) ? $_POST['sitename'] : sprintf(_x('%s Sites', 'Default network name'), get_option('blogname'));
+	$admin_email = ( ! empty($_POST['email']) && ! in_array('invalid_email', $error_codes)) ? $_POST['email'] : get_option('admin_email');
 	?>
-	<p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
-	<p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
+	<p><?php _e('Welcome to the Network installation process!'); ?></p>
+	<p><?php _e('Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.'); ?></p>
 	<?php
 
-	if ( isset( $_POST['subdomain_install'] ) ) {
+	if (isset($_POST['subdomain_install'])) {
 		$subdomain_install = (bool) $_POST['subdomain_install'];
-	} elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
+	} elseif (apache_mod_loaded('mod_rewrite')) { // assume nothing
 		$subdomain_install = true;
-	} elseif ( !allow_subdirectory_install() ) {
+	} elseif ( ! allow_subdirectory_install()) {
 		$subdomain_install = true;
 	} else {
 		$subdomain_install = false;
-		if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions
-			echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
-		elseif ( $is_apache )
-			echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
-		if ( $got_mod_rewrite || $is_apache ) // Protect against mod_rewrite mimicry (but ! Apache)
-			echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
+		if ($got_mod_rewrite = got_mod_rewrite()) // dangerous assumptions
+			echo '<div class="updated inline"><p><strong>'.__('Note:').'</strong> '.__('Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.').'</p>';
+		elseif ($is_apache)
+			echo '<div class="error inline"><p><strong>'.__('Warning!').'</strong> '.__('It looks like the Apache <code>mod_rewrite</code> module is not installed.').'</p>';
+		if ($got_mod_rewrite || $is_apache) // Protect against mod_rewrite mimicry (but ! Apache)
+			echo '<p>'.__('If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.').'</p></div>';
 	}
 
-	if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
-		<h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
-		<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
-		<p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
+	if (allow_subdomain_install() && allow_subdirectory_install()) : ?>
+		<h3><?php esc_html_e('Addresses of Sites in your Network'); ?></h3>
+		<p><?php _e('Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>'); ?></p>
+		<p><?php _e('You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.'); ?></p>
 		<?php // @todo: Link to an MS readme? ?>
 		<table class="form-table">
 			<tr>
-				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
+				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked($subdomain_install); ?> /> <?php _e('Sub-domains'); ?></label></th>
 				<td><?php printf(
 					/* translators: 1: hostname */
-					_x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
+					_x('like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples'),
 					$hostname
 				); ?></td>
 			</tr>
 			<tr>
-				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
+				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install); ?> /> <?php _e('Sub-directories'); ?></label></th>
 				<td><?php printf(
 					/* translators: 1: hostname */
-					_x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
+					_x('like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples'),
 					$hostname
 				); ?></td>
 			</tr>
@@ -252,82 +252,82 @@ 
 <?php
 	endif;
 
-		if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
-			echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+		if (WP_CONTENT_DIR != ABSPATH.'wp-content' && (allow_subdirectory_install() || ! allow_subdomain_install()))
+			echo '<div class="error inline"><p><strong>'.__('Warning!').'</strong> '.__('Subdirectory networks may not be fully compatible with custom wp-content directories.').'</p></div>';
 
-		$is_www = ( 0 === strpos( $hostname, 'www.' ) );
-		if ( $is_www ) :
+		$is_www = (0 === strpos($hostname, 'www.'));
+		if ($is_www) :
 		?>
-		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
-		<p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></p>
+		<h3><?php esc_html_e('Server Address'); ?></h3>
+		<p><?php printf(__('We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.'), substr($hostname, 4), $hostname); ?></p>
 		<table class="form-table">
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
+				<th scope='row'><?php esc_html_e('Server Address'); ?></th>
 				<td>
-					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
+					<?php printf(__('The internet address of your network will be <code>%s</code>.'), $hostname); ?>
 				</td>
 			</tr>
 		</table>
 		<?php endif; ?>
 
-		<h3><?php esc_html_e( 'Network Details' ); ?></h3>
+		<h3><?php esc_html_e('Network Details'); ?></h3>
 		<table class="form-table">
-		<?php if ( 'localhost' == $hostname ) : ?>
+		<?php if ('localhost' == $hostname) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
+				<th scope="row"><?php esc_html_e('Sub-directory Install'); ?></th>
 				<td><?php
-					_e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
+					_e('Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.');
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					if ( ! allow_subdirectory_install())
+						echo ' <strong>'.__('Warning!').' '.__('The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.').'</strong>';
 				?></td>
 			</tr>
-		<?php elseif ( !allow_subdomain_install() ) : ?>
+		<?php elseif ( ! allow_subdomain_install()) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
+				<th scope="row"><?php esc_html_e('Sub-directory Install'); ?></th>
 				<td><?php
-					_e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
+					_e('Because your install is in a directory, the sites in your WordPress network must use sub-directories.');
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					if ( ! allow_subdirectory_install())
+						echo ' <strong>'.__('Warning!').' '.__('The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.').'</strong>';
 				?></td>
 			</tr>
-		<?php elseif ( !allow_subdirectory_install() ) : ?>
+		<?php elseif ( ! allow_subdirectory_install()) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
-				<td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
-					echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				<th scope="row"><?php esc_html_e('Sub-domain Install'); ?></th>
+				<td><?php _e('Because your install is not new, the sites in your WordPress network must use sub-domains.');
+					echo ' <strong>'.__('The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.').'</strong>';
 				?></td>
 			</tr>
 		<?php endif; ?>
-		<?php if ( ! $is_www ) : ?>
+		<?php if ( ! $is_www) : ?>
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
+				<th scope='row'><?php esc_html_e('Server Address'); ?></th>
 				<td>
-					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
+					<?php printf(__('The internet address of your network will be <code>%s</code>.'), $hostname); ?>
 				</td>
 			</tr>
 		<?php endif; ?>
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Network Title' ); ?></th>
+				<th scope='row'><?php esc_html_e('Network Title'); ?></th>
 				<td>
-					<input name='sitename' type='text' size='45' value='<?php echo esc_attr( $site_name ); ?>' />
+					<input name='sitename' type='text' size='45' value='<?php echo esc_attr($site_name); ?>' />
 					<p class="description">
-						<?php _e( 'What would you like to call your network?' ); ?>
+						<?php _e('What would you like to call your network?'); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Network Admin Email' ); ?></th>
+				<th scope='row'><?php esc_html_e('Network Admin Email'); ?></th>
 				<td>
-					<input name='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' />
+					<input name='email' type='text' size='45' value='<?php echo esc_attr($admin_email); ?>' />
 					<p class="description">
-						<?php _e( 'Your email address.' ); ?>
+						<?php _e('Your email address.'); ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<?php submit_button( __( 'Install' ), 'primary', 'submit' ); ?>
+		<?php submit_button(__('Install'), 'primary', 'submit'); ?>
 	</form>
 	<?php
 }
@@ -341,45 +341,45 @@ 
  *
  * @param WP_Error $errors
  */
-function network_step2( $errors = false ) {
+function network_step2($errors = false) {
 	global $wpdb;
 
 	$hostname          = get_clean_basedomain();
-	$slashed_home      = trailingslashit( get_option( 'home' ) );
-	$base              = parse_url( $slashed_home, PHP_URL_PATH );
-	$document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
-	$abspath_fix       = str_replace( '\\', '/', ABSPATH );
-	$home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
-	$wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
-	$rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
+	$slashed_home      = trailingslashit(get_option('home'));
+	$base              = parse_url($slashed_home, PHP_URL_PATH);
+	$document_root_fix = str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']));
+	$abspath_fix       = str_replace('\\', '/', ABSPATH);
+	$home_path         = 0 === strpos($abspath_fix, $document_root_fix) ? $document_root_fix.$base : get_home_path();
+	$wp_siteurl_subdir = preg_replace('#^'.preg_quote($home_path, '#').'#', '', $abspath_fix);
+	$rewrite_base      = ! empty($wp_siteurl_subdir) ? ltrim(trailingslashit($wp_siteurl_subdir), '/') : '';
 
 
 	$location_of_wp_config = $abspath_fix;
-	if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) {
-		$location_of_wp_config = dirname( $abspath_fix );
+	if ( ! file_exists(ABSPATH.'wp-config.php') && file_exists(dirname(ABSPATH).'/wp-config.php')) {
+		$location_of_wp_config = dirname($abspath_fix);
 	}
-	$location_of_wp_config = trailingslashit( $location_of_wp_config );
+	$location_of_wp_config = trailingslashit($location_of_wp_config);
 
 	// Wildcard DNS message.
-	if ( is_wp_error( $errors ) )
-		echo '<div class="error">' . $errors->get_error_message() . '</div>';
+	if (is_wp_error($errors))
+		echo '<div class="error">'.$errors->get_error_message().'</div>';
 
-	if ( $_POST ) {
-		if ( allow_subdomain_install() )
-			$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
+	if ($_POST) {
+		if (allow_subdomain_install())
+			$subdomain_install = allow_subdirectory_install() ? ! empty($_POST['subdomain_install']) : true;
 		else
 			$subdomain_install = false;
 	} else {
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$subdomain_install = is_subdomain_install();
 ?>
-	<p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
+	<p><?php _e('The original configuration steps are shown here for reference.'); ?></p>
 <?php
 		} else {
-			$subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+			$subdomain_install = (bool) $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'");
 ?>
-	<div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
-	<p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
+	<div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e('An existing WordPress network was detected.'); ?></p></div>
+	<p><?php _e('Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.'); ?></p>
 <?php
 		}
 	}
@@ -388,23 +388,23 @@ 
 	$subdir_replacement_01 = $subdomain_install ? '' : '$1';
 	$subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
 
-	if ( $_POST || ! is_multisite() ) {
+	if ($_POST || ! is_multisite()) {
 ?>
-		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
-		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
+		<h3><?php esc_html_e('Enabling the Network'); ?></h3>
+		<p><?php _e('Complete the following steps to enable the features for creating a network of sites.'); ?></p>
 		<div class="updated inline"><p><?php
-			if ( file_exists( $home_path . '.htaccess' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
-			elseif ( file_exists( $home_path . 'web.config' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
+			if (file_exists($home_path.'.htaccess'))
+				printf(__('<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.'), '.htaccess');
+			elseif (file_exists($home_path.'web.config'))
+				printf(__('<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.'), 'web.config');
 			else
-				_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
+				_e('<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.');
 		?></p></div>
 <?php
 	}
 ?>
 		<ol>
-			<li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p>
+			<li><p><?php printf(__('Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:'), $location_of_wp_config); ?></p>
 				<textarea class="code" readonly="readonly" cols="100" rows="7">
 define('MULTISITE', true);
 define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
@@ -414,47 +414,47 @@ 
 define('BLOG_ID_CURRENT_SITE', 1);
 </textarea>
 <?php
-	$keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
-	foreach ( $keys_salts as $c => $v ) {
-		if ( defined( $c ) )
-			unset( $keys_salts[ $c ] );
+	$keys_salts = array('AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '');
+	foreach ($keys_salts as $c => $v) {
+		if (defined($c))
+			unset($keys_salts[$c]);
 	}
 
-	if ( ! empty( $keys_salts ) ) {
+	if ( ! empty($keys_salts)) {
 		$keys_salts_str = '';
-		$from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-		if ( is_wp_error( $from_api ) ) {
-			foreach ( $keys_salts as $c => $v ) {
-				$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+		$from_api = wp_remote_get('https://api.wordpress.org/secret-key/1.1/salt/');
+		if (is_wp_error($from_api)) {
+			foreach ($keys_salts as $c => $v) {
+				$keys_salts_str .= "\ndefine( '$c', '".wp_generate_password(64, true, true)."' );";
 			}
 		} else {
-			$from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
-			foreach ( $keys_salts as $c => $v ) {
-				$keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+			$from_api = explode("\n", wp_remote_retrieve_body($from_api));
+			foreach ($keys_salts as $c => $v) {
+				$keys_salts_str .= "\ndefine( '$c', '".substr(array_shift($from_api), 28, 64)."' );";
 			}
 		}
-		$num_keys_salts = count( $keys_salts );
+		$num_keys_salts = count($keys_salts);
 ?>
 	<p>
 		<?php
-			if ( 1 == $num_keys_salts ) {
-				_e( 'This unique authentication key is also missing from your <code>wp-config.php</code> file.' );
+			if (1 == $num_keys_salts) {
+				_e('This unique authentication key is also missing from your <code>wp-config.php</code> file.');
 			} else {
-				_e( 'These unique authentication keys are also missing from your <code>wp-config.php</code> file.' );
+				_e('These unique authentication keys are also missing from your <code>wp-config.php</code> file.');
 			}
 		?>
-		<?php _e( 'To make your installation more secure, you should also add:' ); ?>
+		<?php _e('To make your installation more secure, you should also add:'); ?>
 	</p>
-	<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
+	<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea($keys_salts_str); ?></textarea>
 <?php
 	}
 ?>
 </li>
 <?php
-	if ( iis7_supports_permalinks() ) :
+	if (iis7_supports_permalinks()) :
 		// IIS doesn't support RewriteBase, all your RewriteBase are belong to us
-		$iis_subdir_match = ltrim( $base, '/' ) . $subdir_match;
-		$iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base;
+		$iis_subdir_match = ltrim($base, '/').$subdir_match;
+		$iis_rewrite_base = ltrim($base, '/').$rewrite_base;
 		$iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
 
 		$web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
@@ -466,17 +466,17 @@ 
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
                 </rule>';
-				if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+				if (is_multisite() && get_site_option('ms_files_rewriting')) {
 					$web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
-                    <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
-                    <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
+                    <match url="^' . $iis_subdir_match.'files/(.+)" ignoreCase="false" />
+                    <action type="Rewrite" url="' . $iis_rewrite_base.WPINC.'/ms-files.php?file={R:1}" appendQueryString="false" />
                 </rule>';
                 }
                 $web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
-                    <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
-                    <action type="Redirect" url="' . $iis_subdir_replacement . 'wp-admin/" redirectType="Permanent" />
+                    <match url="^' . $iis_subdir_match.'wp-admin$" ignoreCase="false" />
+                    <action type="Redirect" url="' . $iis_subdir_replacement.'wp-admin/" redirectType="Permanent" />
                 </rule>
                 <rule name="WordPress Rule 3" stopProcessing="true">
                     <match url="^" ignoreCase="false" />
@@ -487,12 +487,12 @@ 
                     <action type="None" />
                 </rule>
                 <rule name="WordPress Rule 4" stopProcessing="true">
-                    <match url="^' . $iis_subdir_match . '(wp-(content|admin|includes).*)" ignoreCase="false" />
-                    <action type="Rewrite" url="' . $iis_rewrite_base . '{R:1}" />
+                    <match url="^' . $iis_subdir_match.'(wp-(content|admin|includes).*)" ignoreCase="false" />
+                    <action type="Rewrite" url="' . $iis_rewrite_base.'{R:1}" />
                 </rule>
                 <rule name="WordPress Rule 5" stopProcessing="true">
-                    <match url="^' . $iis_subdir_match . '([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
-                    <action type="Rewrite" url="' . $iis_rewrite_base . '{R:2}" />
+                    <match url="^' . $iis_subdir_match.'([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
+                    <action type="Rewrite" url="' . $iis_rewrite_base.'{R:2}" />
                 </rule>
                 <rule name="WordPress Rule 6" stopProcessing="true">
                     <match url="." ignoreCase="false" />
@@ -506,22 +506,22 @@ 
 
 		echo '<li><p>';
 		/* translators: 1: a filename like .htaccess. 2: a file path. */
-		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<code>web.config</code>', '<code>' . $home_path . '</code>' );
+		printf(__('Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:'),
+			'<code>web.config</code>', '<code>'.$home_path.'</code>');
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH.'wp-content')
+			echo '<p><strong>'.__('Warning:').' '.__('Subdirectory networks may not be fully compatible with custom wp-content directories.').'</strong></p>';
 		?>
-		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
+		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea($web_config_file); ?>
 		</textarea></li>
 		</ol>
 
 	<?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
 
 		$ms_files_rewriting = '';
-		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+		if (is_multisite() && get_site_option('ms_files_rewriting')) {
 			$ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
-			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
+			$ms_files_rewriting .= $subdir_match."files/(.+) {$rewrite_base}".WPINC."/ms-files.php?file={$subdir_replacement_12} [L]"."\n";
 		}
 
 		$htaccess_file = <<<EOF
@@ -543,47 +543,47 @@ 
 
 		echo '<li><p>';
 		/* translators: 1: a filename like .htaccess. 2: a file path. */
-		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<code>.htaccess</code>', '<code>' . $home_path . '</code>' );
+		printf(__('Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:'),
+			'<code>.htaccess</code>', '<code>'.$home_path.'</code>');
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH.'wp-content')
+			echo '<p><strong>'.__('Warning:').' '.__('Subdirectory networks may not be fully compatible with custom wp-content directories.').'</strong></p>';
 		?>
-		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
-<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
+		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count($htaccess_file, "\n") + 1; ?>">
+<?php echo esc_textarea($htaccess_file); ?></textarea></li>
 		</ol>
 
 	<?php endif; // end IIS/Apache code branches.
 
-	if ( !is_multisite() ) { ?>
-		<p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( site_url( 'wp-login.php' ) ); ?>"><?php _e( 'Log In' ); ?></a></p>
+	if ( ! is_multisite()) { ?>
+		<p><?php _e('Once you complete these steps, your network is enabled and configured. You will have to log in again.'); ?> <a href="<?php echo esc_url(site_url('wp-login.php')); ?>"><?php _e('Log In'); ?></a></p>
 <?php
 	}
 }
 
-if ( $_POST ) {
+if ($_POST) {
 
-	check_admin_referer( 'install-network-1' );
+	check_admin_referer('install-network-1');
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 	// Create network tables.
 	install_network();
-	$base              = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
-	$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
-	if ( ! network_domain_check() ) {
-		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
-		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
+	$base              = parse_url(trailingslashit(get_option('home')), PHP_URL_PATH);
+	$subdomain_install = allow_subdomain_install() ? ! empty($_POST['subdomain_install']) : false;
+	if ( ! network_domain_check()) {
+		$result = populate_network(1, get_clean_basedomain(), sanitize_email($_POST['email']), wp_unslash($_POST['sitename']), $base, $subdomain_install);
+		if (is_wp_error($result)) {
+			if (1 == count($result->get_error_codes()) && 'no_wildcard_dns' == $result->get_error_code())
+				network_step2($result);
 			else
-				network_step1( $result );
+				network_step1($result);
 		} else {
 			network_step2();
 		}
 	} else {
 		network_step2();
 	}
-} elseif ( is_multisite() || network_domain_check() ) {
+} elseif (is_multisite() || network_domain_check()) {
 	network_step2();
 } else {
 	network_step1();
@@ -591,4 +591,4 @@ 
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +80 added lines, -53 removed lines

@@ -15,21 +15,24 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_super_admin() )
+if ( ! is_super_admin() ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 if ( is_multisite() ) {
 	if ( ! is_network_admin() ) {
 		wp_redirect( network_admin_url( 'setup.php' ) );
 		exit;
 	}
-	if ( ! defined( 'MULTISITE' ) )
-		wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
-}
+	if ( ! defined( 'MULTISITE' ) ) {
+			wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+	}
+	}
 
 // We need to create references to ms global tables to enable Network.
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
+foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
 	$wpdb->$table = $prefixed_table;
+}
 
 /**
  * Check for an existing network.
@@ -58,8 +61,9 @@ 
  */
 function allow_subdomain_install() {
 	$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
-	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )
-		return false;
+	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -81,15 +85,18 @@ 
          *
          * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false.
          */
-	if ( apply_filters( 'allow_subdirectory_install', false ) )
-		return true;
+	if ( apply_filters( 'allow_subdirectory_install', false ) ) {
+			return true;
+	}
 
-	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL )
-		return true;
+	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL ) {
+			return true;
+	}
 
 	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
-	if ( empty( $post ) )
-		return true;
+	if ( empty( $post ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -100,16 +107,19 @@ 
  * @return string Base domain.
  */
 function get_clean_basedomain() {
-	if ( $existing_domain = network_domain_check() )
-		return $existing_domain;
+	if ( $existing_domain = network_domain_check() ) {
+			return $existing_domain;
+	}
 	$domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
-	if ( $slash = strpos( $domain, '/' ) )
-		$domain = substr( $domain, 0, $slash );
+	if ( $slash = strpos( $domain, '/' ) ) {
+			$domain = substr( $domain, 0, $slash );
+	}
 	return $domain;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
+if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
 	wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
+}
 
 if ( is_network_admin() ) {
 	$title = __( 'Network Setup' );
@@ -196,8 +206,9 @@ 
 	$error_codes = array();
 	if ( is_wp_error( $errors ) ) {
 		echo '<div class="error"><p><strong>' . __( 'ERROR: The network could not be created.' ) . '</strong></p>';
-		foreach ( $errors->get_error_messages() as $error )
-			echo "<p>$error</p>";
+		foreach ( $errors->get_error_messages() as $error ) {
+					echo "<p>$error</p>";
+		}
 		echo '</div>';
 		$error_codes = $errors->get_error_codes();
 	}
@@ -217,12 +228,16 @@ 
 		$subdomain_install = true;
 	} else {
 		$subdomain_install = false;
-		if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions
+		if ( $got_mod_rewrite = got_mod_rewrite() ) {
+			// dangerous assumptions
 			echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
-		elseif ( $is_apache )
-			echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
-		if ( $got_mod_rewrite || $is_apache ) // Protect against mod_rewrite mimicry (but ! Apache)
+		} elseif ( $is_apache ) {
+					echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
+		}
+		if ( $got_mod_rewrite || $is_apache ) {
+			// Protect against mod_rewrite mimicry (but ! Apache)
 			echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
+		}
 	}
 
 	if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
@@ -252,8 +267,9 @@ 
 <?php
 	endif;
 
-		if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
-			echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+		if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
+					echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+		}
 
 		$is_www = ( 0 === strpos( $hostname, 'www.' ) );
 		if ( $is_www ) :
@@ -278,8 +294,9 @@ 
 				<td><?php
 					_e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					if ( !allow_subdirectory_install() ) {
+											echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					}
 				?></td>
 			</tr>
 		<?php elseif ( !allow_subdomain_install() ) : ?>
@@ -288,8 +305,9 @@ 
 				<td><?php
 					_e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					if ( !allow_subdirectory_install() ) {
+											echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+					}
 				?></td>
 			</tr>
 		<?php elseif ( !allow_subdirectory_install() ) : ?>
@@ -361,14 +379,16 @@ 
 	$location_of_wp_config = trailingslashit( $location_of_wp_config );
 
 	// Wildcard DNS message.
-	if ( is_wp_error( $errors ) )
-		echo '<div class="error">' . $errors->get_error_message() . '</div>';
+	if ( is_wp_error( $errors ) ) {
+			echo '<div class="error">' . $errors->get_error_message() . '</div>';
+	}
 
 	if ( $_POST ) {
-		if ( allow_subdomain_install() )
-			$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
-		else
-			$subdomain_install = false;
+		if ( allow_subdomain_install() ) {
+					$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
+		} else {
+					$subdomain_install = false;
+		}
 	} else {
 		if ( is_multisite() ) {
 			$subdomain_install = is_subdomain_install();
@@ -393,12 +413,13 @@ 
 		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
 		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
 		<div class="updated inline"><p><?php
-			if ( file_exists( $home_path . '.htaccess' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
-			elseif ( file_exists( $home_path . 'web.config' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
-			else
-				_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
+			if ( file_exists( $home_path . '.htaccess' ) ) {
+							printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
+			} elseif ( file_exists( $home_path . 'web.config' ) ) {
+							printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
+			} else {
+							_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
+			}
 		?></p></div>
 <?php
 	}
@@ -416,8 +437,9 @@ 
 <?php
 	$keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
 	foreach ( $keys_salts as $c => $v ) {
-		if ( defined( $c ) )
-			unset( $keys_salts[ $c ] );
+		if ( defined( $c ) ) {
+					unset( $keys_salts[ $c ] );
+		}
 	}
 
 	if ( ! empty( $keys_salts ) ) {
@@ -509,16 +531,19 @@ 
 		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
 			'<code>web.config</code>', '<code>' . $home_path . '</code>' );
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
+					echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		}
 		?>
 		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
 		</textarea></li>
 		</ol>
 
-	<?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
+	<?php else {
+	: // end iis7_supports_permalinks(). construct an htaccess file instead:
 
 		$ms_files_rewriting = '';
+}
 		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
 			$ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
 			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
@@ -546,8 +571,9 @@ 
 		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
 			'<code>.htaccess</code>', '<code>' . $home_path . '</code>' );
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
+					echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		}
 		?>
 		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
 <?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
@@ -573,10 +599,11 @@ 
 	if ( ! network_domain_check() ) {
 		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
 		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
-			else
-				network_step1( $result );
+			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) {
+							network_step2( $result );
+			} else {
+							network_step1( $result );
+			}
 		} else {
 			network_step2();
 		}

src/wp-admin/ms-users.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite users administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite users administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('users.php') );
+wp_redirect(network_admin_url('users.php'));
 exit;

src/wp-includes/post-thumbnail-template.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress Post Thumbnail Template Functions.
- *
- * Support for post thumbnails.
- * Theme's functions.php must call add_theme_support( 'post-thumbnails' ) to use these.
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * WordPress Post Thumbnail Template Functions.
+	 *
+	 * Support for post thumbnails.
+	 * Theme's functions.php must call add_theme_support( 'post-thumbnails' ) to use these.
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Check if post has an image attached.

Spacing +24 added lines, -24 removed lines

@@ -17,8 +17,8 @@ 
  * @param int $post_id Optional. Post ID.
  * @return bool Whether post has an image attached.
  */
-function has_post_thumbnail( $post_id = null ) {
-	return (bool) get_post_thumbnail_id( $post_id );
+function has_post_thumbnail($post_id = null) {
+	return (bool) get_post_thumbnail_id($post_id);
 }
 
 /**
@@ -29,9 +29,9 @@ 
  * @param int|null $post_id Optional. Post ID.
  * @return mixed
  */
-function get_post_thumbnail_id( $post_id = null ) {
-	$post_id = ( null === $post_id ) ? get_the_ID() : $post_id;
-	return get_post_meta( $post_id, '_thumbnail_id', true );
+function get_post_thumbnail_id($post_id = null) {
+	$post_id = (null === $post_id) ? get_the_ID() : $post_id;
+	return get_post_meta($post_id, '_thumbnail_id', true);
 }
 
 /**
@@ -52,8 +52,8 @@ 
  *                           and width values. Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  */
-function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
-	echo get_the_post_thumbnail( null, $size, $attr );
+function the_post_thumbnail($size = 'post-thumbnail', $attr = '') {
+	echo get_the_post_thumbnail(null, $size, $attr);
 }
 
 /**
@@ -65,21 +65,21 @@ 
  *
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
-function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
+function update_post_thumbnail_cache($wp_query = null) {
+	if ( ! $wp_query)
 		$wp_query = $GLOBALS['wp_query'];
 
-	if ( $wp_query->thumbnails_cached )
+	if ($wp_query->thumbnails_cached)
 		return;
 
 	$thumb_ids = array();
-	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
+	foreach ($wp_query->posts as $post) {
+		if ($id = get_post_thumbnail_id($post->ID))
 			$thumb_ids[] = $id;
 	}
 
-	if ( ! empty ( $thumb_ids ) ) {
-		_prime_post_caches( $thumb_ids, false, true );
+	if ( ! empty ($thumb_ids)) {
+		_prime_post_caches($thumb_ids, false, true);
 	}
 
 	$wp_query->thumbnails_cached = true;
@@ -103,9 +103,9 @@ 
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  * @return string
  */
-function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) {
-	$post_id = ( null === $post_id ) ? get_the_ID() : $post_id;
-	$post_thumbnail_id = get_post_thumbnail_id( $post_id );
+function get_the_post_thumbnail($post_id = null, $size = 'post-thumbnail', $attr = '') {
+	$post_id = (null === $post_id) ? get_the_ID() : $post_id;
+	$post_thumbnail_id = get_post_thumbnail_id($post_id);
 
 	/**
 	 * Filter the post thumbnail size.
@@ -114,9 +114,9 @@ 
 	 *
 	 * @param string $size The post thumbnail size.
 	 */
-	$size = apply_filters( 'post_thumbnail_size', $size );
+	$size = apply_filters('post_thumbnail_size', $size);
 
-	if ( $post_thumbnail_id ) {
+	if ($post_thumbnail_id) {
 
 		/**
 		 * Fires before fetching the post thumbnail HTML.
@@ -129,10 +129,10 @@ 
 		 * @param string $post_thumbnail_id The post thumbnail ID.
 		 * @param string $size              The post thumbnail size.
 		 */
-		do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
+		do_action('begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size);
+		if (in_the_loop())
 			update_post_thumbnail_cache();
-		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
+		$html = wp_get_attachment_image($post_thumbnail_id, $size, false, $attr);
 
 		/**
 		 * Fires after fetching the post thumbnail HTML.
@@ -143,7 +143,7 @@ 
 		 * @param string $post_thumbnail_id The post thumbnail ID.
 		 * @param string $size              The post thumbnail size.
 		 */
-		do_action( 'end_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
+		do_action('end_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size);
 
 	} else {
 		$html = '';
@@ -159,5 +159,5 @@ 
 	 * @param string $size              The post thumbnail size.
 	 * @param string $attr              Query string of attributes.
 	 */
-	return apply_filters( 'post_thumbnail_html', $html, $post_id, $post_thumbnail_id, $size, $attr );
+	return apply_filters('post_thumbnail_html', $html, $post_id, $post_thumbnail_id, $size, $attr);
 }

Braces +12 added lines, -8 removed lines

@@ -66,16 +66,19 @@ 
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
 function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
-		$wp_query = $GLOBALS['wp_query'];
+	if ( ! $wp_query ) {
+			$wp_query = $GLOBALS['wp_query'];
+	}
 
-	if ( $wp_query->thumbnails_cached )
-		return;
+	if ( $wp_query->thumbnails_cached ) {
+			return;
+	}
 
 	$thumb_ids = array();
 	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
-			$thumb_ids[] = $id;
+		if ( $id = get_post_thumbnail_id( $post->ID ) ) {
+					$thumb_ids[] = $id;
+		}
 	}
 
 	if ( ! empty ( $thumb_ids ) ) {
@@ -130,8 +133,9 @@ 
 		 * @param string $size              The post thumbnail size.
 		 */
 		do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
-			update_post_thumbnail_cache();
+		if ( in_the_loop() ) {
+					update_post_thumbnail_cache();
+		}
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**

src/wp-includes/version.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * The WordPress version string
- *
- * @global string $wp_version
- */
+	 * The WordPress version string
+	 *
+	 * @global string $wp_version
+	 */
 $wp_version = '4.4-alpha-33636-src';
 
 /**

src/wp-includes/vars.php

Spacing +26 added lines, -26 removed lines

@@ -20,27 +20,27 @@ 
 	$is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
-if ( is_admin() ) {
+if (is_admin()) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
+	if (is_network_admin())
 		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	else
 		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
-	if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
+	if ('' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow) {
 		$pagenow = 'index.php';
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
+		if ('.php' !== substr($pagenow, -4, 4))
 			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
+	if (preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches))
 		$pagenow = strtolower($self_matches[1]);
 	else
 		$pagenow = 'index.php';
@@ -50,11 +50,11 @@ 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false;
 
-if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
-	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
 		$is_lynx = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
-		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false) {
+		if (stripos($_SERVER['HTTP_USER_AGENT'], 'chromeframe') !== false) {
 			$is_admin = is_admin();
 			/**
 			 * Filter whether Google Chrome Frame should be used, if available.
@@ -63,31 +63,31 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ($is_chrome = apply_filters('use_google_chrome_frame', $is_admin))
+				header('X-UA-Compatible: chrome=1');
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) {
 		$is_safari = true;
-	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+	} elseif ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
 		$is_winIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
 		$is_gecko = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
 		$is_opera = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
 		$is_NS4 = true;
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ($is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false)
 	$is_iphone = true;
 
-$is_IE = ( $is_macIE || $is_winIE );
+$is_IE = ($is_macIE || $is_winIE);
 
 // Server detection
 
@@ -107,13 +107,13 @@ 
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */
-$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = ! $is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
  * Whether the server software is IIS 7.X or greater
  * @global bool $is_iis7
  */
-$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+$is_iis7 = $is_IIS && intval(substr($_SERVER['SERVER_SOFTWARE'], strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/') + 14)) >= 7;
 
 /**
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
@@ -125,19 +125,19 @@ 
 function wp_is_mobile() {
 	static $is_mobile = null;
 
-	if ( isset( $is_mobile ) ) {
+	if (isset($is_mobile)) {
 		return $is_mobile;
 	}
 
-	if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		$is_mobile = false;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;

Braces +22 added lines, -16 removed lines

@@ -22,12 +22,13 @@ 
 // On which page are we ?
 if ( is_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
-		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
-		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	else
-		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	if ( is_network_admin() ) {
+			preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} elseif ( is_user_admin() ) {
+			preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} else {
+			preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	}
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -36,15 +37,18 @@ 
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
-			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+		if ( '.php' !== substr($pagenow, -4, 4) ) {
+					$pagenow .= '.php';
+		}
+		// for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
-		$pagenow = strtolower($self_matches[1]);
-	else
-		$pagenow = 'index.php';
-}
+	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) ) {
+			$pagenow = strtolower($self_matches[1]);
+	} else {
+			$pagenow = 'index.php';
+	}
+	}
 unset($self_matches);
 
 // Simple browser detection
@@ -63,8 +67,9 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) ) {
+							header( 'X-UA-Compatible: chrome=1' );
+			}
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
@@ -84,8 +89,9 @@ 
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false ) {
 	$is_iphone = true;
+}
 
 $is_IE = ( $is_macIE || $is_winIE );
 

src/wp-includes/class-wp-xmlrpc-server.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * XML-RPC protocol support for WordPress
- *
- * @package WordPress
- * @subpackage Publishing
- */
+	 * XML-RPC protocol support for WordPress
+	 *
+	 * @package WordPress
+	 * @subpackage Publishing
+	 */
 
 /**
  * WordPress XMLRPC server implementation.

Spacing +1408 added lines, -1408 removed lines

@@ -81,13 +81,13 @@ 
 			'wp.editPage'			=> 'this:wp_editPage',
 			'wp.getPageList'		=> 'this:wp_getPageList',
 			'wp.getAuthors'			=> 'this:wp_getAuthors',
-			'wp.getCategories'		=> 'this:mw_getCategories',		// Alias
+			'wp.getCategories'		=> 'this:mw_getCategories', // Alias
 			'wp.getTags'			=> 'this:wp_getTags',
 			'wp.newCategory'		=> 'this:wp_newCategory',
 			'wp.deleteCategory'		=> 'this:wp_deleteCategory',
 			'wp.suggestCategories'	=> 'this:wp_suggestCategories',
-			'wp.uploadFile'			=> 'this:mw_newMediaObject',	// Alias
-			'wp.deleteFile'			=> 'this:wp_deletePost',		// Alias
+			'wp.uploadFile'			=> 'this:mw_newMediaObject', // Alias
+			'wp.deleteFile'			=> 'this:wp_deletePost', // Alias
 			'wp.getCommentCount'	=> 'this:wp_getCommentCount',
 			'wp.getPostStatusList'	=> 'this:wp_getPostStatusList',
 			'wp.getPageStatusList'	=> 'this:wp_getPageStatusList',
@@ -159,7 +159,7 @@ 
 		 *
 		 * @param array $methods An array of XML-RPC methods.
 		 */
-		$this->methods = apply_filters( 'xmlrpc_methods', $this->methods );
+		$this->methods = apply_filters('xmlrpc_methods', $this->methods);
 	}
 
 	/**
@@ -172,9 +172,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return array|IXR_Error|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( '_multisite_getUsersBlogs' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('_multisite_getUsersBlogs' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -210,7 +210,7 @@ 
 	 * }
 	 * @return int Sum of the two given numbers.
 	 */
-	public function addTwoNumbers( $args ) {
+	public function addTwoNumbers($args) {
 		$number1 = $args[0];
 		$number2 = $args[1];
 		return $number1 + $number2;
@@ -225,14 +225,14 @@ 
 	 * @param string $password User's password.
 	 * @return WP_User|bool WP_User object if authentication passed, false otherwise
 	 */
-	public function login( $username, $password ) {
+	public function login($username, $password) {
 		/*
 		 * Respect old get_option() filters left for back-compat when the 'enable_xmlrpc'
 		 * option was deprecated in 3.5.0. Use the 'xmlrpc_enabled' hook instead.
 		 */
-		$enabled = apply_filters( 'pre_option_enable_xmlrpc', false );
-		if ( false === $enabled ) {
-			$enabled = apply_filters( 'option_enable_xmlrpc', true );
+		$enabled = apply_filters('pre_option_enable_xmlrpc', false);
+		if (false === $enabled) {
+			$enabled = apply_filters('option_enable_xmlrpc', true);
 		}
 
 		/**
@@ -244,17 +244,17 @@ 
 		 *
 		 * @param bool $enabled Whether XML-RPC is enabled. Default true.
 		 */
-		$enabled = apply_filters( 'xmlrpc_enabled', $enabled );
+		$enabled = apply_filters('xmlrpc_enabled', $enabled);
 
-		if ( ! $enabled ) {
-			$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
+		if ( ! $enabled) {
+			$this->error = new IXR_Error(405, sprintf(__('XML-RPC services are disabled on this site.')));
 			return false;
 		}
 
 		$user = wp_authenticate($username, $password);
 
 		if (is_wp_error($user)) {
-			$this->error = new IXR_Error( 403, __( 'Incorrect username or password.' ) );
+			$this->error = new IXR_Error(403, __('Incorrect username or password.'));
 
 			/**
 			 * Filter the XML-RPC user login error message.
@@ -264,11 +264,11 @@ 
 			 * @param string  $error The XML-RPC error message.
 			 * @param WP_User $user  WP_User object.
 			 */
-			$this->error = apply_filters( 'xmlrpc_login_error', $this->error, $user );
+			$this->error = apply_filters('xmlrpc_login_error', $this->error, $user);
 			return false;
 		}
 
-		wp_set_current_user( $user->ID );
+		wp_set_current_user($user->ID);
 		return $user;
 	}
 
@@ -283,8 +283,8 @@ 
 	 * @param string $password User's password.
 	 * @return bool Whether authentication passed.
 	 */
-	public function login_pass_ok( $username, $password ) {
-		return (bool) $this->login( $username, $password );
+	public function login_pass_ok($username, $password) {
+		return (bool) $this->login($username, $password);
 	}
 
 	/**
@@ -296,15 +296,15 @@ 
 	 * @return string|void Returns with string is passed, alters by-reference
 	 *                     when array is passed.
 	 */
-	public function escape( &$data ) {
-		if ( ! is_array( $data ) )
-			return wp_slash( $data );
+	public function escape(&$data) {
+		if ( ! is_array($data))
+			return wp_slash($data);
 
-		foreach ( $data as &$v ) {
-			if ( is_array( $v ) )
-				$this->escape( $v );
-			elseif ( ! is_object( $v ) )
-				$v = wp_slash( $v );
+		foreach ($data as &$v) {
+			if (is_array($v))
+				$this->escape($v);
+			elseif ( ! is_object($v))
+				$v = wp_slash($v);
 		}
 	}
 
@@ -321,9 +321,9 @@ 
 
 		$custom_fields = array();
 
-		foreach ( (array) has_meta($post_id) as $meta ) {
+		foreach ((array) has_meta($post_id) as $meta) {
 			// Don't expose protected fields.
-			if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) )
+			if ( ! current_user_can('edit_post_meta', $post_id, $meta['meta_key']))
 				continue;
 
 			$custom_fields[] = array(
@@ -347,22 +347,22 @@ 
 	public function set_custom_fields($post_id, $fields) {
 		$post_id = (int) $post_id;
 
-		foreach ( (array) $fields as $meta ) {
-			if ( isset($meta['id']) ) {
+		foreach ((array) $fields as $meta) {
+			if (isset($meta['id'])) {
 				$meta['id'] = (int) $meta['id'];
-				$pmeta = get_metadata_by_mid( 'post', $meta['id'] );
-				if ( isset($meta['key']) ) {
-					$meta['key'] = wp_unslash( $meta['key'] );
-					if ( $meta['key'] !== $pmeta->meta_key )
+				$pmeta = get_metadata_by_mid('post', $meta['id']);
+				if (isset($meta['key'])) {
+					$meta['key'] = wp_unslash($meta['key']);
+					if ($meta['key'] !== $pmeta->meta_key)
 						continue;
-					$meta['value'] = wp_unslash( $meta['value'] );
-					if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) )
-						update_metadata_by_mid( 'post', $meta['id'], $meta['value'] );
-				} elseif ( current_user_can( 'delete_post_meta', $post_id, $pmeta->meta_key ) ) {
-					delete_metadata_by_mid( 'post', $meta['id'] );
+					$meta['value'] = wp_unslash($meta['value']);
+					if (current_user_can('edit_post_meta', $post_id, $meta['key']))
+						update_metadata_by_mid('post', $meta['id'], $meta['value']);
+				} elseif (current_user_can('delete_post_meta', $post_id, $pmeta->meta_key)) {
+					delete_metadata_by_mid('post', $meta['id']);
 				}
-			} elseif ( current_user_can( 'add_post_meta', $post_id, wp_unslash( $meta['key'] ) ) ) {
-				add_post_meta( $post_id, $meta['key'], $meta['value'] );
+			} elseif (current_user_can('add_post_meta', $post_id, wp_unslash($meta['key']))) {
+				add_post_meta($post_id, $meta['key'], $meta['value']);
 			}
 		}
 	}
@@ -382,139 +382,139 @@ 
 		$this->blog_options = array(
 			// Read only options
 			'software_name'     => array(
-				'desc'          => __( 'Software Name' ),
+				'desc'          => __('Software Name'),
 				'readonly'      => true,
 				'value'         => 'WordPress'
 			),
 			'software_version'  => array(
-				'desc'          => __( 'Software Version' ),
+				'desc'          => __('Software Version'),
 				'readonly'      => true,
 				'value'         => $wp_version
 			),
 			'blog_url'          => array(
-				'desc'          => __( 'WordPress Address (URL)' ),
+				'desc'          => __('WordPress Address (URL)'),
 				'readonly'      => true,
 				'option'        => 'siteurl'
 			),
 			'home_url'          => array(
-				'desc'          => __( 'Site Address (URL)' ),
+				'desc'          => __('Site Address (URL)'),
 				'readonly'      => true,
 				'option'        => 'home'
 			),
 			'login_url'          => array(
-				'desc'          => __( 'Login Address (URL)' ),
+				'desc'          => __('Login Address (URL)'),
 				'readonly'      => true,
 				'value'         => wp_login_url( )
 			),
 			'admin_url'          => array(
-				'desc'          => __( 'The URL to the admin area' ),
+				'desc'          => __('The URL to the admin area'),
 				'readonly'      => true,
 				'value'         => get_admin_url( )
 			),
 			'image_default_link_type' => array(
-				'desc'          => __( 'Image default link type' ),
+				'desc'          => __('Image default link type'),
 				'readonly'      => true,
 				'option'        => 'image_default_link_type'
 			),
 			'image_default_size' => array(
-				'desc'          => __( 'Image default size' ),
+				'desc'          => __('Image default size'),
 				'readonly'      => true,
 				'option'        => 'image_default_size'
 			),
 			'image_default_align' => array(
-				'desc'          => __( 'Image default align' ),
+				'desc'          => __('Image default align'),
 				'readonly'      => true,
 				'option'        => 'image_default_align'
 			),
 			'template'          => array(
-				'desc'          => __( 'Template' ),
+				'desc'          => __('Template'),
 				'readonly'      => true,
 				'option'        => 'template'
 			),
 			'stylesheet'        => array(
-				'desc'          => __( 'Stylesheet' ),
+				'desc'          => __('Stylesheet'),
 				'readonly'      => true,
 				'option'        => 'stylesheet'
 			),
 			'post_thumbnail'    => array(
 				'desc'          => __('Post Thumbnail'),
 				'readonly'      => true,
-				'value'         => current_theme_supports( 'post-thumbnails' )
+				'value'         => current_theme_supports('post-thumbnails')
 			),
 
 			// Updatable options
 			'time_zone'         => array(
-				'desc'          => __( 'Time Zone' ),
+				'desc'          => __('Time Zone'),
 				'readonly'      => false,
 				'option'        => 'gmt_offset'
 			),
 			'blog_title'        => array(
-				'desc'          => __( 'Site Title' ),
+				'desc'          => __('Site Title'),
 				'readonly'      => false,
 				'option'        => 'blogname'
 			),
 			'blog_tagline'      => array(
-				'desc'          => __( 'Site Tagline' ),
+				'desc'          => __('Site Tagline'),
 				'readonly'      => false,
 				'option'        => 'blogdescription'
 			),
 			'date_format'       => array(
-				'desc'          => __( 'Date Format' ),
+				'desc'          => __('Date Format'),
 				'readonly'      => false,
 				'option'        => 'date_format'
 			),
 			'time_format'       => array(
-				'desc'          => __( 'Time Format' ),
+				'desc'          => __('Time Format'),
 				'readonly'      => false,
 				'option'        => 'time_format'
 			),
 			'users_can_register' => array(
-				'desc'          => __( 'Allow new users to sign up' ),
+				'desc'          => __('Allow new users to sign up'),
 				'readonly'      => false,
 				'option'        => 'users_can_register'
 			),
 			'thumbnail_size_w'  => array(
-				'desc'          => __( 'Thumbnail Width' ),
+				'desc'          => __('Thumbnail Width'),
 				'readonly'      => false,
 				'option'        => 'thumbnail_size_w'
 			),
 			'thumbnail_size_h'  => array(
-				'desc'          => __( 'Thumbnail Height' ),
+				'desc'          => __('Thumbnail Height'),
 				'readonly'      => false,
 				'option'        => 'thumbnail_size_h'
 			),
 			'thumbnail_crop'    => array(
-				'desc'          => __( 'Crop thumbnail to exact dimensions' ),
+				'desc'          => __('Crop thumbnail to exact dimensions'),
 				'readonly'      => false,
 				'option'        => 'thumbnail_crop'
 			),
 			'medium_size_w'     => array(
-				'desc'          => __( 'Medium size image width' ),
+				'desc'          => __('Medium size image width'),
 				'readonly'      => false,
 				'option'        => 'medium_size_w'
 			),
 			'medium_size_h'     => array(
-				'desc'          => __( 'Medium size image height' ),
+				'desc'          => __('Medium size image height'),
 				'readonly'      => false,
 				'option'        => 'medium_size_h'
 			),
 			'large_size_w'      => array(
-				'desc'          => __( 'Large size image width' ),
+				'desc'          => __('Large size image width'),
 				'readonly'      => false,
 				'option'        => 'large_size_w'
 			),
 			'large_size_h'      => array(
-				'desc'          => __( 'Large size image height' ),
+				'desc'          => __('Large size image height'),
 				'readonly'      => false,
 				'option'        => 'large_size_h'
 			),
 			'default_comment_status' => array(
-				'desc'          => __( 'Allow people to post comments on new articles' ),
+				'desc'          => __('Allow people to post comments on new articles'),
 				'readonly'      => false,
 				'option'        => 'default_comment_status'
 			),
 			'default_ping_status' => array(
-				'desc'          => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
+				'desc'          => __('Allow link notifications from other blogs (pingbacks and trackbacks) on new articles'),
 				'readonly'      => false,
 				'option'        => 'default_ping_status'
 			)
@@ -527,7 +527,7 @@ 
 		 *
 		 * @param array $blog_options An array of XML-RPC blog options.
 		 */
-		$this->blog_options = apply_filters( 'xmlrpc_blog_options', $this->blog_options );
+		$this->blog_options = apply_filters('xmlrpc_blog_options', $this->blog_options);
 	}
 
 	/**
@@ -548,19 +548,19 @@ 
 	 *  - 'blogName'
 	 *  - 'xmlrpc' - url of xmlrpc endpoint
 	 */
-	public function wp_getUsersBlogs( $args ) {
+	public function wp_getUsersBlogs($args) {
 		// If this isn't on WPMU then just use blogger_getUsersBlogs
-		if ( !is_multisite() ) {
-			array_unshift( $args, 1 );
-			return $this->blogger_getUsersBlogs( $args );
+		if ( ! is_multisite()) {
+			array_unshift($args, 1);
+			return $this->blogger_getUsersBlogs($args);
 		}
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[0];
 		$password = $args[1];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/**
@@ -574,28 +574,28 @@ 
 		 *
 		 * @param string $name The method name.
 		 */
-		do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
+		do_action('xmlrpc_call', 'wp.getUsersBlogs');
 
-		$blogs = (array) get_blogs_of_user( $user->ID );
+		$blogs = (array) get_blogs_of_user($user->ID);
 		$struct = array();
 
-		foreach ( $blogs as $blog ) {
+		foreach ($blogs as $blog) {
 			// Don't include blogs that aren't hosted at this site.
-			if ( $blog->site_id != get_current_site()->id )
+			if ($blog->site_id != get_current_site()->id)
 				continue;
 
 			$blog_id = $blog->userblog_id;
 
-			switch_to_blog( $blog_id );
+			switch_to_blog($blog_id);
 
-			$is_admin = current_user_can( 'manage_options' );
+			$is_admin = current_user_can('manage_options');
 
 			$struct[] = array(
 				'isAdmin'		=> $is_admin,
-				'url'			=> home_url( '/' ),
+				'url'			=> home_url('/'),
 				'blogid'		=> (string) $blog_id,
-				'blogName'		=> get_option( 'blogname' ),
-				'xmlrpc'		=> site_url( 'xmlrpc.php', 'rpc' ),
+				'blogName'		=> get_option('blogname'),
+				'xmlrpc'		=> site_url('xmlrpc.php', 'rpc'),
 			);
 
 			restore_current_blog();
@@ -614,9 +614,9 @@ 
 	 * @param int $count         Minimum number of arguments.
 	 * @return bool if `$args` contains at least $count arguments.
 	 */
-	protected function minimum_args( $args, $count ) {
-		if ( count( $args ) < $count ) {
-			$this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) );
+	protected function minimum_args($args, $count) {
+		if (count($args) < $count) {
+			$this->error = new IXR_Error(400, __('Insufficient arguments passed to this XML-RPC method.'));
 			return false;
 		}
 
@@ -632,7 +632,7 @@ 
 	 * @param array $fields    The subset of taxonomy fields to return.
 	 * @return array The prepared taxonomy data.
 	 */
-	protected function _prepare_taxonomy( $taxonomy, $fields ) {
+	protected function _prepare_taxonomy($taxonomy, $fields) {
 		$_taxonomy = array(
 			'name' => $taxonomy->name,
 			'label' => $taxonomy->label,
@@ -642,17 +642,17 @@ 
 			'_builtin' => (bool) $taxonomy->_builtin,
 		);
 
-		if ( in_array( 'labels', $fields ) )
+		if (in_array('labels', $fields))
 			$_taxonomy['labels'] = (array) $taxonomy->labels;
 
-		if ( in_array( 'cap', $fields ) )
+		if (in_array('cap', $fields))
 			$_taxonomy['cap'] = (array) $taxonomy->cap;
 
-		if ( in_array( 'menu', $fields ) )
+		if (in_array('menu', $fields))
 			$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
 
-		if ( in_array( 'object_type', $fields ) )
-			$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+		if (in_array('object_type', $fields))
+			$_taxonomy['object_type'] = array_unique((array) $taxonomy->object_type);
 
 		/**
 		 * Filter XML-RPC-prepared data for the given taxonomy.
@@ -663,7 +663,7 @@ 
 		 * @param object $taxonomy  Taxonomy object.
 		 * @param array  $fields    The subset of taxonomy fields to return.
 		 */
-		return apply_filters( 'xmlrpc_prepare_taxonomy', $_taxonomy, $taxonomy, $fields );
+		return apply_filters('xmlrpc_prepare_taxonomy', $_taxonomy, $taxonomy, $fields);
 	}
 
 	/**
@@ -674,19 +674,19 @@ 
 	 * @param array|object $term The unprepared term data.
 	 * @return array The prepared term data.
 	 */
-	protected function _prepare_term( $term ) {
+	protected function _prepare_term($term) {
 		$_term = $term;
-		if ( ! is_array( $_term ) )
-			$_term = get_object_vars( $_term );
+		if ( ! is_array($_term))
+			$_term = get_object_vars($_term);
 
 		// For integers which may be larger than XML-RPC supports ensure we return strings.
-		$_term['term_id'] = strval( $_term['term_id'] );
-		$_term['term_group'] = strval( $_term['term_group'] );
-		$_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
-		$_term['parent'] = strval( $_term['parent'] );
+		$_term['term_id'] = strval($_term['term_id']);
+		$_term['term_group'] = strval($_term['term_group']);
+		$_term['term_taxonomy_id'] = strval($_term['term_taxonomy_id']);
+		$_term['parent'] = strval($_term['parent']);
 
 		// Count we are happy to return as an integer because people really shouldn't use terms that much.
-		$_term['count'] = intval( $_term['count'] );
+		$_term['count'] = intval($_term['count']);
 
 		/**
 		 * Filter XML-RPC-prepared data for the given term.
@@ -696,7 +696,7 @@ 
 		 * @param array        $_term An array of term data.
 		 * @param array|object $term  Term object or array.
 		 */
-		return apply_filters( 'xmlrpc_prepare_term', $_term, $term );
+		return apply_filters('xmlrpc_prepare_term', $_term, $term);
 	}
 
 	/**
@@ -707,11 +707,11 @@ 
 	 * @param string $date Date string to convert.
 	 * @return IXR_Date IXR_Date object.
 	 */
-	protected function _convert_date( $date ) {
-		if ( $date === '0000-00-00 00:00:00' ) {
-			return new IXR_Date( '00000000T00:00:00Z' );
+	protected function _convert_date($date) {
+		if ($date === '0000-00-00 00:00:00') {
+			return new IXR_Date('00000000T00:00:00Z');
 		}
-		return new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date, false ) );
+		return new IXR_Date(mysql2date('Ymd\TH:i:s', $date, false));
 	}
 
 	/**
@@ -723,11 +723,11 @@ 
 	 * @param string $date     Date string.
 	 * @return IXR_Date IXR_Date object.
 	 */
-	protected function _convert_date_gmt( $date_gmt, $date ) {
-		if ( $date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00' ) {
-			return new IXR_Date( get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $date, false ), 'Ymd\TH:i:s' ) );
+	protected function _convert_date_gmt($date_gmt, $date) {
+		if ($date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00') {
+			return new IXR_Date(get_gmt_from_date(mysql2date('Y-m-d H:i:s', $date, false), 'Ymd\TH:i:s'));
 		}
-		return $this->_convert_date( $date_gmt );
+		return $this->_convert_date($date_gmt);
 	}
 
 	/**
@@ -739,17 +739,17 @@ 
 	 * @param array $fields The subset of post type fields to return.
 	 * @return array The prepared post data.
 	 */
-	protected function _prepare_post( $post, $fields ) {
+	protected function _prepare_post($post, $fields) {
 		// Holds the data for this post. built up based on $fields.
-		$_post = array( 'post_id' => strval( $post['ID'] ) );
+		$_post = array('post_id' => strval($post['ID']));
 
 		// Prepare common post fields.
 		$post_fields = array(
 			'post_title'        => $post['post_title'],
-			'post_date'         => $this->_convert_date( $post['post_date'] ),
-			'post_date_gmt'     => $this->_convert_date_gmt( $post['post_date_gmt'], $post['post_date'] ),
-			'post_modified'     => $this->_convert_date( $post['post_modified'] ),
-			'post_modified_gmt' => $this->_convert_date_gmt( $post['post_modified_gmt'], $post['post_modified'] ),
+			'post_date'         => $this->_convert_date($post['post_date']),
+			'post_date_gmt'     => $this->_convert_date_gmt($post['post_date_gmt'], $post['post_date']),
+			'post_modified'     => $this->_convert_date($post['post_modified']),
+			'post_modified_gmt' => $this->_convert_date_gmt($post['post_modified_gmt'], $post['post_modified']),
 			'post_status'       => $post['post_status'],
 			'post_type'         => $post['post_type'],
 			'post_name'         => $post['post_name'],
@@ -757,63 +757,63 @@ 
 			'post_password'     => $post['post_password'],
 			'post_excerpt'      => $post['post_excerpt'],
 			'post_content'      => $post['post_content'],
-			'post_parent'       => strval( $post['post_parent'] ),
+			'post_parent'       => strval($post['post_parent']),
 			'post_mime_type'    => $post['post_mime_type'],
-			'link'              => get_permalink( $post['ID'] ),
+			'link'              => get_permalink($post['ID']),
 			'guid'              => $post['guid'],
-			'menu_order'        => intval( $post['menu_order'] ),
+			'menu_order'        => intval($post['menu_order']),
 			'comment_status'    => $post['comment_status'],
 			'ping_status'       => $post['ping_status'],
-			'sticky'            => ( $post['post_type'] === 'post' && is_sticky( $post['ID'] ) ),
+			'sticky'            => ($post['post_type'] === 'post' && is_sticky($post['ID'])),
 		);
 
 		// Thumbnail.
 		$post_fields['post_thumbnail'] = array();
-		$thumbnail_id = get_post_thumbnail_id( $post['ID'] );
-		if ( $thumbnail_id ) {
+		$thumbnail_id = get_post_thumbnail_id($post['ID']);
+		if ($thumbnail_id) {
 			$thumbnail_size = current_theme_supports('post-thumbnail') ? 'post-thumbnail' : 'thumbnail';
-			$post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
+			$post_fields['post_thumbnail'] = $this->_prepare_media_item(get_post($thumbnail_id), $thumbnail_size);
 		}
 
 		// Consider future posts as published.
-		if ( $post_fields['post_status'] === 'future' )
+		if ($post_fields['post_status'] === 'future')
 			$post_fields['post_status'] = 'publish';
 
 		// Fill in blank post format.
-		$post_fields['post_format'] = get_post_format( $post['ID'] );
-		if ( empty( $post_fields['post_format'] ) )
+		$post_fields['post_format'] = get_post_format($post['ID']);
+		if (empty($post_fields['post_format']))
 			$post_fields['post_format'] = 'standard';
 
 		// Merge requested $post_fields fields into $_post.
-		if ( in_array( 'post', $fields ) ) {
-			$_post = array_merge( $_post, $post_fields );
+		if (in_array('post', $fields)) {
+			$_post = array_merge($_post, $post_fields);
 		} else {
-			$requested_fields = array_intersect_key( $post_fields, array_flip( $fields ) );
-			$_post = array_merge( $_post, $requested_fields );
+			$requested_fields = array_intersect_key($post_fields, array_flip($fields));
+			$_post = array_merge($_post, $requested_fields);
 		}
 
-		$all_taxonomy_fields = in_array( 'taxonomies', $fields );
+		$all_taxonomy_fields = in_array('taxonomies', $fields);
 
-		if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
-			$post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
-			$terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
+		if ($all_taxonomy_fields || in_array('terms', $fields)) {
+			$post_type_taxonomies = get_object_taxonomies($post['post_type'], 'names');
+			$terms = wp_get_object_terms($post['ID'], $post_type_taxonomies);
 			$_post['terms'] = array();
-			foreach ( $terms as $term ) {
-				$_post['terms'][] = $this->_prepare_term( $term );
+			foreach ($terms as $term) {
+				$_post['terms'][] = $this->_prepare_term($term);
 			}
 		}
 
-		if ( in_array( 'custom_fields', $fields ) )
-			$_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+		if (in_array('custom_fields', $fields))
+			$_post['custom_fields'] = $this->get_custom_fields($post['ID']);
 
-		if ( in_array( 'enclosure', $fields ) ) {
+		if (in_array('enclosure', $fields)) {
 			$_post['enclosure'] = array();
-			$enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
-			if ( ! empty( $enclosures ) ) {
-				$encdata = explode( "\n", $enclosures[0] );
-				$_post['enclosure']['url'] = trim( htmlspecialchars( $encdata[0] ) );
-				$_post['enclosure']['length'] = (int) trim( $encdata[1] );
-				$_post['enclosure']['type'] = trim( $encdata[2] );
+			$enclosures = (array) get_post_meta($post['ID'], 'enclosure');
+			if ( ! empty($enclosures)) {
+				$encdata = explode("\n", $enclosures[0]);
+				$_post['enclosure']['url'] = trim(htmlspecialchars($encdata[0]));
+				$_post['enclosure']['length'] = (int) trim($encdata[1]);
+				$_post['enclosure']['type'] = trim($encdata[2]);
 			}
 		}
 
@@ -826,7 +826,7 @@ 
 		 * @param array $post   An array of post data.
 		 * @param array $fields An array of post fields.
 		 */
-		return apply_filters( 'xmlrpc_prepare_post', $_post, $post, $fields );
+		return apply_filters('xmlrpc_prepare_post', $_post, $post, $fields);
 	}
 
 	/**
@@ -838,7 +838,7 @@ 
 	 * @param array  $fields    The subset of post fields to return.
 	 * @return array The prepared post type data.
 	 */
-	protected function _prepare_post_type( $post_type, $fields ) {
+	protected function _prepare_post_type($post_type, $fields) {
 		$_post_type = array(
 			'name' => $post_type->name,
 			'label' => $post_type->label,
@@ -847,26 +847,26 @@ 
 			'show_ui' => (bool) $post_type->show_ui,
 			'_builtin' => (bool) $post_type->_builtin,
 			'has_archive' => (bool) $post_type->has_archive,
-			'supports' => get_all_post_type_supports( $post_type->name ),
+			'supports' => get_all_post_type_supports($post_type->name),
 		);
 
-		if ( in_array( 'labels', $fields ) ) {
+		if (in_array('labels', $fields)) {
 			$_post_type['labels'] = (array) $post_type->labels;
 		}
 
-		if ( in_array( 'cap', $fields ) ) {
+		if (in_array('cap', $fields)) {
 			$_post_type['cap'] = (array) $post_type->cap;
 			$_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
 		}
 
-		if ( in_array( 'menu', $fields ) ) {
+		if (in_array('menu', $fields)) {
 			$_post_type['menu_position'] = (int) $post_type->menu_position;
 			$_post_type['menu_icon'] = $post_type->menu_icon;
 			$_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
 		}
 
-		if ( in_array( 'taxonomies', $fields ) )
-			$_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+		if (in_array('taxonomies', $fields))
+			$_post_type['taxonomies'] = get_object_taxonomies($post_type->name, 'names');
 
 		/**
 		 * Filter XML-RPC-prepared date for the given post type.
@@ -876,7 +876,7 @@ 
 		 * @param array  $_post_type An array of post type data.
 		 * @param object $post_type  Post type object.
 		 */
-		return apply_filters( 'xmlrpc_prepare_post_type', $_post_type, $post_type );
+		return apply_filters('xmlrpc_prepare_post_type', $_post_type, $post_type);
 	}
 
 	/**
@@ -888,20 +888,20 @@ 
 	 * @param string $thumbnail_size The image size to use for the thumbnail URL.
 	 * @return array The prepared media item data.
 	 */
-	protected function _prepare_media_item( $media_item, $thumbnail_size = 'thumbnail' ) {
+	protected function _prepare_media_item($media_item, $thumbnail_size = 'thumbnail') {
 		$_media_item = array(
-			'attachment_id'    => strval( $media_item->ID ),
-			'date_created_gmt' => $this->_convert_date_gmt( $media_item->post_date_gmt, $media_item->post_date ),
+			'attachment_id'    => strval($media_item->ID),
+			'date_created_gmt' => $this->_convert_date_gmt($media_item->post_date_gmt, $media_item->post_date),
 			'parent'           => $media_item->post_parent,
-			'link'             => wp_get_attachment_url( $media_item->ID ),
+			'link'             => wp_get_attachment_url($media_item->ID),
 			'title'            => $media_item->post_title,
 			'caption'          => $media_item->post_excerpt,
 			'description'      => $media_item->post_content,
-			'metadata'         => wp_get_attachment_metadata( $media_item->ID ),
+			'metadata'         => wp_get_attachment_metadata($media_item->ID),
 		);
 
-		$thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
-		if ( $thumbnail_src )
+		$thumbnail_src = image_downsize($media_item->ID, $thumbnail_size);
+		if ($thumbnail_src)
 			$_media_item['thumbnail'] = $thumbnail_src[0];
 		else
 			$_media_item['thumbnail'] = $_media_item['link'];
@@ -915,7 +915,7 @@ 
 		 * @param object $media_item     Media item object.
 		 * @param string $thumbnail_size Image size.
 		 */
-		return apply_filters( 'xmlrpc_prepare_media_item', $_media_item, $media_item, $thumbnail_size );
+		return apply_filters('xmlrpc_prepare_media_item', $_media_item, $media_item, $thumbnail_size);
 	}
 
 	/**
@@ -926,39 +926,39 @@ 
 	 * @param object $page The unprepared page data.
 	 * @return array The prepared page data.
 	 */
-	protected function _prepare_page( $page ) {
+	protected function _prepare_page($page) {
 		// Get all of the page content and link.
-		$full_page = get_extended( $page->post_content );
-		$link = get_permalink( $page->ID );
+		$full_page = get_extended($page->post_content);
+		$link = get_permalink($page->ID);
 
 		// Get info the page parent if there is one.
 		$parent_title = "";
-		if ( ! empty( $page->post_parent ) ) {
-			$parent = get_post( $page->post_parent );
+		if ( ! empty($page->post_parent)) {
+			$parent = get_post($page->post_parent);
 			$parent_title = $parent->post_title;
 		}
 
 		// Determine comment and ping settings.
-		$allow_comments = comments_open( $page->ID ) ? 1 : 0;
-		$allow_pings = pings_open( $page->ID ) ? 1 : 0;
+		$allow_comments = comments_open($page->ID) ? 1 : 0;
+		$allow_pings = pings_open($page->ID) ? 1 : 0;
 
 		// Format page date.
-		$page_date = $this->_convert_date( $page->post_date );
-		$page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
+		$page_date = $this->_convert_date($page->post_date);
+		$page_date_gmt = $this->_convert_date_gmt($page->post_date_gmt, $page->post_date);
 
 		// Pull the categories info together.
 		$categories = array();
-		if ( is_object_in_taxonomy( 'page', 'category' ) ) {
-			foreach ( wp_get_post_categories( $page->ID ) as $cat_id ) {
-				$categories[] = get_cat_name( $cat_id );
+		if (is_object_in_taxonomy('page', 'category')) {
+			foreach (wp_get_post_categories($page->ID) as $cat_id) {
+				$categories[] = get_cat_name($cat_id);
 			}
 		}
 
 		// Get the author info.
-		$author = get_userdata( $page->post_author );
+		$author = get_userdata($page->post_author);
 
-		$page_template = get_page_template_slug( $page->ID );
-		if ( empty( $page_template ) )
+		$page_template = get_page_template_slug($page->ID);
+		if (empty($page_template))
 			$page_template = 'default';
 
 		$_page = array(
@@ -984,7 +984,7 @@ 
 			'wp_author_id'           => (string) $author->ID,
 			'wp_author_display_name' => $author->display_name,
 			'date_created_gmt'       => $page_date_gmt,
-			'custom_fields'          => $this->get_custom_fields( $page->ID ),
+			'custom_fields'          => $this->get_custom_fields($page->ID),
 			'wp_page_template'       => $page_template
 		);
 
@@ -996,7 +996,7 @@ 
 		 * @param array   $_page An array of page data.
 		 * @param WP_Post $page  Page object.
 		 */
-		return apply_filters( 'xmlrpc_prepare_page', $_page, $page );
+		return apply_filters('xmlrpc_prepare_page', $_page, $page);
 	}
 
 	/**
@@ -1007,15 +1007,15 @@ 
 	 * @param object $comment The unprepared comment data.
 	 * @return array The prepared comment data.
 	 */
-	protected function _prepare_comment( $comment ) {
+	protected function _prepare_comment($comment) {
 		// Format page date.
-		$comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
+		$comment_date_gmt = $this->_convert_date_gmt($comment->comment_date_gmt, $comment->comment_date);
 
-		if ( '0' == $comment->comment_approved ) {
+		if ('0' == $comment->comment_approved) {
 			$comment_status = 'hold';
-		} elseif ( 'spam' == $comment->comment_approved ) {
+		} elseif ('spam' == $comment->comment_approved) {
 			$comment_status = 'spam';
-		} elseif ( '1' == $comment->comment_approved ) {
+		} elseif ('1' == $comment->comment_approved) {
 			$comment_status = 'approve';
 		} else {
 			$comment_status = $comment->comment_approved;
@@ -1045,7 +1045,7 @@ 
 		 * @param array  $_comment An array of prepared comment data.
 		 * @param object $comment  Comment object.
 		 */
-		return apply_filters( 'xmlrpc_prepare_comment', $_comment, $comment );
+		return apply_filters('xmlrpc_prepare_comment', $_comment, $comment);
 	}
 
 	/**
@@ -1057,14 +1057,14 @@ 
 	 * @param array   $fields The subset of user fields to return.
 	 * @return array The prepared user data.
 	 */
-	protected function _prepare_user( $user, $fields ) {
-		$_user = array( 'user_id' => strval( $user->ID ) );
+	protected function _prepare_user($user, $fields) {
+		$_user = array('user_id' => strval($user->ID));
 
 		$user_fields = array(
 			'username'          => $user->user_login,
 			'first_name'        => $user->user_firstname,
 			'last_name'         => $user->user_lastname,
-			'registered'        => $this->_convert_date( $user->user_registered ),
+			'registered'        => $this->_convert_date($user->user_registered),
 			'bio'               => $user->user_description,
 			'email'             => $user->user_email,
 			'nickname'          => $user->nickname,
@@ -1074,15 +1074,15 @@ 
 			'roles'             => $user->roles,
 		);
 
-		if ( in_array( 'all', $fields ) ) {
-			$_user = array_merge( $_user, $user_fields );
+		if (in_array('all', $fields)) {
+			$_user = array_merge($_user, $user_fields);
 		} else {
-			if ( in_array( 'basic', $fields ) ) {
-				$basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
-				$fields = array_merge( $fields, $basic_fields );
+			if (in_array('basic', $fields)) {
+				$basic_fields = array('username', 'email', 'registered', 'display_name', 'nicename');
+				$fields = array_merge($fields, $basic_fields);
 			}
-			$requested_fields = array_intersect_key( $user_fields, array_flip( $fields ) );
-			$_user = array_merge( $_user, $requested_fields );
+			$requested_fields = array_intersect_key($user_fields, array_flip($fields));
+			$_user = array_merge($_user, $requested_fields);
 		}
 
 		/**
@@ -1094,7 +1094,7 @@ 
 		 * @param WP_User $user   User object.
 		 * @param array   $fields An array of user fields.
 		 */
-		return apply_filters( 'xmlrpc_prepare_user', $_user, $user, $fields );
+		return apply_filters('xmlrpc_prepare_user', $_user, $user, $fields);
 	}
 
 	/**
@@ -1144,40 +1144,40 @@ 
 	 * }
 	 * @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
 	 */
-	public function wp_newPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_newPost($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		// convert the date field back to IXR form
-		if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
-			$content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );
+		if (isset($content_struct['post_date']) && ! ($content_struct['post_date'] instanceof IXR_Date)) {
+			$content_struct['post_date'] = $this->_convert_date($content_struct['post_date']);
 		}
 
 		// ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
 		// since _insert_post will ignore the non-GMT date if the GMT date is set
-		if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {
-			if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
-				unset( $content_struct['post_date_gmt'] );
+		if (isset($content_struct['post_date_gmt']) && ! ($content_struct['post_date_gmt'] instanceof IXR_Date)) {
+			if ($content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset($content_struct['post_date'])) {
+				unset($content_struct['post_date_gmt']);
 			} else {
-				$content_struct['post_date_gmt'] = $this->_convert_date( $content_struct['post_date_gmt'] );
+				$content_struct['post_date_gmt'] = $this->_convert_date($content_struct['post_date_gmt']);
 			}
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newPost' );
+		do_action('xmlrpc_call', 'wp.newPost');
 
-		unset( $content_struct['ID'] );
+		unset($content_struct['ID']);
 
-		return $this->_insert_post( $user, $content_struct );
+		return $this->_insert_post($user, $content_struct);
 	}
 
 	/**
@@ -1187,7 +1187,7 @@ 
 	 *
 	 * @param int $count Number to compare to one.
 	 */
-	private function _is_greater_than_one( $count ) {
+	private function _is_greater_than_one($count) {
 		return $count > 1;
 	}
 
@@ -1202,29 +1202,29 @@ 
 	 * @param bool  $update
 	 * @return void|IXR_Error
 	 */
-	private function _toggle_sticky( $post_data, $update = false ) {
-		$post_type = get_post_type_object( $post_data['post_type'] );
+	private function _toggle_sticky($post_data, $update = false) {
+		$post_type = get_post_type_object($post_data['post_type']);
 
 		// Private and password-protected posts cannot be stickied.
-		if ( 'private' === $post_data['post_status'] || ! empty( $post_data['post_password'] ) ) {
+		if ('private' === $post_data['post_status'] || ! empty($post_data['post_password'])) {
 			// Error if the client tried to stick the post, otherwise, silently unstick.
-			if ( ! empty( $post_data['sticky'] ) ) {
-				return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
+			if ( ! empty($post_data['sticky'])) {
+				return new IXR_Error(401, __('Sorry, you cannot stick a private post.'));
 			}
 
-			if ( $update ) {
-				unstick_post( $post_data['ID'] );
+			if ($update) {
+				unstick_post($post_data['ID']);
 			}
-		} elseif ( isset( $post_data['sticky'] ) )  {
-			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
-				return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
+		} elseif (isset($post_data['sticky'])) {
+			if ( ! current_user_can($post_type->cap->edit_others_posts)) {
+				return new IXR_Error(401, __('Sorry, you are not allowed to stick this post.'));
 			}
 
-			$sticky = wp_validate_boolean( $post_data['sticky'] );
-			if ( $sticky ) {
-				stick_post( $post_data['ID'] );
+			$sticky = wp_validate_boolean($post_data['sticky']);
+			if ($sticky) {
+				stick_post($post_data['ID']);
 			} else {
-				unstick_post( $post_data['ID'] );
+				unstick_post($post_data['ID']);
 			}
 		}
 	}
@@ -1241,133 +1241,133 @@ 
 	 * @param array|IXR_Error $content_struct Post data to insert.
 	 * @return IXR_Error|string
 	 */
-	protected function _insert_post( $user, $content_struct ) {
-		$defaults = array( 'post_status' => 'draft', 'post_type' => 'post', 'post_author' => 0,
-			'post_password' => '', 'post_excerpt' => '', 'post_content' => '', 'post_title' => '' );
+	protected function _insert_post($user, $content_struct) {
+		$defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => 0,
+			'post_password' => '', 'post_excerpt' => '', 'post_content' => '', 'post_title' => '');
 
-		$post_data = wp_parse_args( $content_struct, $defaults );
+		$post_data = wp_parse_args($content_struct, $defaults);
 
-		$post_type = get_post_type_object( $post_data['post_type'] );
-		if ( ! $post_type )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+		$post_type = get_post_type_object($post_data['post_type']);
+		if ( ! $post_type)
+			return new IXR_Error(403, __('Invalid post type'));
 
-		$update = ! empty( $post_data['ID'] );
+		$update = ! empty($post_data['ID']);
 
-		if ( $update ) {
-			if ( ! get_post( $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'Invalid post ID.' ) );
-			if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
-			if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+		if ($update) {
+			if ( ! get_post($post_data['ID']))
+				return new IXR_Error(401, __('Invalid post ID.'));
+			if ( ! current_user_can('edit_post', $post_data['ID']))
+				return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
+			if ($post_data['post_type'] != get_post_type($post_data['ID']))
+				return new IXR_Error(401, __('The post type may not be changed.'));
 		} else {
-			if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
-				return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+			if ( ! current_user_can($post_type->cap->create_posts) || ! current_user_can($post_type->cap->edit_posts))
+				return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
 		}
 
-		switch ( $post_data['post_status'] ) {
+		switch ($post_data['post_status']) {
 			case 'draft':
 			case 'pending':
 				break;
 			case 'private':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type' ) );
+				if ( ! current_user_can($post_type->cap->publish_posts))
+					return new IXR_Error(401, __('Sorry, you are not allowed to create private posts in this post type'));
 				break;
 			case 'publish':
 			case 'future':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type' ) );
+				if ( ! current_user_can($post_type->cap->publish_posts))
+					return new IXR_Error(401, __('Sorry, you are not allowed to publish posts in this post type'));
 				break;
 			default:
-				if ( ! get_post_status_object( $post_data['post_status'] ) )
+				if ( ! get_post_status_object($post_data['post_status']))
 					$post_data['post_status'] = 'draft';
 			break;
 		}
 
-		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type' ) );
+		if ( ! empty($post_data['post_password']) && ! current_user_can($post_type->cap->publish_posts))
+			return new IXR_Error(401, __('Sorry, you are not allowed to create password protected posts in this post type'));
 
-		$post_data['post_author'] = absint( $post_data['post_author'] );
-		if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
-			if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
-				return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+		$post_data['post_author'] = absint($post_data['post_author']);
+		if ( ! empty($post_data['post_author']) && $post_data['post_author'] != $user->ID) {
+			if ( ! current_user_can($post_type->cap->edit_others_posts))
+				return new IXR_Error(401, __('You are not allowed to create posts as this user.'));
 
-			$author = get_userdata( $post_data['post_author'] );
+			$author = get_userdata($post_data['post_author']);
 
-			if ( ! $author )
-				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			if ( ! $author)
+				return new IXR_Error(404, __('Invalid author ID.'));
 		} else {
 			$post_data['post_author'] = $user->ID;
 		}
 
-		if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' )
-			unset( $post_data['comment_status'] );
+		if (isset($post_data['comment_status']) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed')
+			unset($post_data['comment_status']);
 
-		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
-			unset( $post_data['ping_status'] );
+		if (isset($post_data['ping_status']) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed')
+			unset($post_data['ping_status']);
 
 		// Do some timestamp voodoo.
-		if ( ! empty( $post_data['post_date_gmt'] ) ) {
+		if ( ! empty($post_data['post_date_gmt'])) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated = rtrim( $post_data['post_date_gmt']->getIso(), 'Z' ) . 'Z';
-		} elseif ( ! empty( $post_data['post_date'] ) ) {
+			$dateCreated = rtrim($post_data['post_date_gmt']->getIso(), 'Z').'Z';
+		} elseif ( ! empty($post_data['post_date'])) {
 			$dateCreated = $post_data['post_date']->getIso();
 		}
 
-		if ( ! empty( $dateCreated ) ) {
-			$post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
-			$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+		if ( ! empty($dateCreated)) {
+			$post_data['post_date'] = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+			$post_data['post_date_gmt'] = iso8601_to_datetime($dateCreated, 'GMT');
 		}
 
-		if ( ! isset( $post_data['ID'] ) )
-			$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+		if ( ! isset($post_data['ID']))
+			$post_data['ID'] = get_default_post_to_edit($post_data['post_type'], true)->ID;
 		$post_ID = $post_data['ID'];
 
-		if ( $post_data['post_type'] == 'post' ) {
-			$error = $this->_toggle_sticky( $post_data, $update );
-			if ( $error ) {
+		if ($post_data['post_type'] == 'post') {
+			$error = $this->_toggle_sticky($post_data, $update);
+			if ($error) {
 				return $error;
 			}
 		}
 
-		if ( isset( $post_data['post_thumbnail'] ) ) {
+		if (isset($post_data['post_thumbnail'])) {
 			// empty value deletes, non-empty value adds/updates.
-			if ( ! $post_data['post_thumbnail'] )
-				delete_post_thumbnail( $post_ID );
-			elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
-				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
-			set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
-			unset( $content_struct['post_thumbnail'] );
+			if ( ! $post_data['post_thumbnail'])
+				delete_post_thumbnail($post_ID);
+			elseif ( ! get_post(absint($post_data['post_thumbnail'])))
+				return new IXR_Error(404, __('Invalid attachment ID.'));
+			set_post_thumbnail($post_ID, $post_data['post_thumbnail']);
+			unset($content_struct['post_thumbnail']);
 		}
 
-		if ( isset( $post_data['custom_fields'] ) )
-			$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+		if (isset($post_data['custom_fields']))
+			$this->set_custom_fields($post_ID, $post_data['custom_fields']);
 
-		if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
-			$post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
+		if (isset($post_data['terms']) || isset($post_data['terms_names'])) {
+			$post_type_taxonomies = get_object_taxonomies($post_data['post_type'], 'objects');
 
 			// Accumulate term IDs from terms and terms_names.
 			$terms = array();
 
 			// First validate the terms specified by ID.
-			if ( isset( $post_data['terms'] ) && is_array( $post_data['terms'] ) ) {
-				$taxonomies = array_keys( $post_data['terms'] );
+			if (isset($post_data['terms']) && is_array($post_data['terms'])) {
+				$taxonomies = array_keys($post_data['terms']);
 
 				// Validating term ids.
-				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
-						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+				foreach ($taxonomies as $taxonomy) {
+					if ( ! array_key_exists($taxonomy, $post_type_taxonomies))
+						return new IXR_Error(401, __('Sorry, one of the given taxonomies is not supported by the post type.'));
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
-						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					if ( ! current_user_can($post_type_taxonomies[$taxonomy]->cap->assign_terms))
+						return new IXR_Error(401, __('Sorry, you are not allowed to assign a term to one of the given taxonomies.'));
 
 					$term_ids = $post_data['terms'][$taxonomy];
-					$terms[ $taxonomy ] = array();
-					foreach ( $term_ids as $term_id ) {
-						$term = get_term_by( 'id', $term_id, $taxonomy );
+					$terms[$taxonomy] = array();
+					foreach ($term_ids as $term_id) {
+						$term = get_term_by('id', $term_id, $taxonomy);
 
-						if ( ! $term )
-							return new IXR_Error( 403, __( 'Invalid term ID' ) );
+						if ( ! $term)
+							return new IXR_Error(403, __('Invalid term ID'));
 
 						$terms[$taxonomy][] = (int) $term_id;
 					}
@@ -1375,49 +1375,49 @@ 
 			}
 
 			// Now validate terms specified by name.
-			if ( isset( $post_data['terms_names'] ) && is_array( $post_data['terms_names'] ) ) {
-				$taxonomies = array_keys( $post_data['terms_names'] );
+			if (isset($post_data['terms_names']) && is_array($post_data['terms_names'])) {
+				$taxonomies = array_keys($post_data['terms_names']);
 
-				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
-						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+				foreach ($taxonomies as $taxonomy) {
+					if ( ! array_key_exists($taxonomy, $post_type_taxonomies))
+						return new IXR_Error(401, __('Sorry, one of the given taxonomies is not supported by the post type.'));
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
-						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					if ( ! current_user_can($post_type_taxonomies[$taxonomy]->cap->assign_terms))
+						return new IXR_Error(401, __('Sorry, you are not allowed to assign a term to one of the given taxonomies.'));
 
 					/*
 					 * For hierarchical taxonomies, we can't assign a term when multiple terms
 					 * in the hierarchy share the same name.
 					 */
 					$ambiguous_terms = array();
-					if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-						$tax_term_names = get_terms( $taxonomy, array( 'fields' => 'names', 'hide_empty' => false ) );
+					if (is_taxonomy_hierarchical($taxonomy)) {
+						$tax_term_names = get_terms($taxonomy, array('fields' => 'names', 'hide_empty' => false));
 
 						// Count the number of terms with the same name.
-						$tax_term_names_count = array_count_values( $tax_term_names );
+						$tax_term_names_count = array_count_values($tax_term_names);
 
 						// Filter out non-ambiguous term names.
-						$ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one') );
+						$ambiguous_tax_term_counts = array_filter($tax_term_names_count, array($this, '_is_greater_than_one'));
 
-						$ambiguous_terms = array_keys( $ambiguous_tax_term_counts );
+						$ambiguous_terms = array_keys($ambiguous_tax_term_counts);
 					}
 
 					$term_names = $post_data['terms_names'][$taxonomy];
-					foreach ( $term_names as $term_name ) {
-						if ( in_array( $term_name, $ambiguous_terms ) )
-							return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+					foreach ($term_names as $term_name) {
+						if (in_array($term_name, $ambiguous_terms))
+							return new IXR_Error(401, __('Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.'));
 
-						$term = get_term_by( 'name', $term_name, $taxonomy );
+						$term = get_term_by('name', $term_name, $taxonomy);
 
-						if ( ! $term ) {
+						if ( ! $term) {
 							// Term doesn't exist, so check that the user is allowed to create new terms.
-							if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
-								return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+							if ( ! current_user_can($post_type_taxonomies[$taxonomy]->cap->edit_terms))
+								return new IXR_Error(401, __('Sorry, you are not allowed to add a term to one of the given taxonomies.'));
 
 							// Create the new term.
-							$term_info = wp_insert_term( $term_name, $taxonomy );
-							if ( is_wp_error( $term_info ) )
-								return new IXR_Error( 500, $term_info->get_error_message() );
+							$term_info = wp_insert_term($term_name, $taxonomy);
+							if (is_wp_error($term_info))
+								return new IXR_Error(500, $term_info->get_error_message());
 
 							$terms[$taxonomy][] = (int) $term_info['term_id'];
 						} else {
@@ -1428,26 +1428,26 @@ 
 			}
 
 			$post_data['tax_input'] = $terms;
-			unset( $post_data['terms'], $post_data['terms_names'] );
+			unset($post_data['terms'], $post_data['terms_names']);
 		} else {
 			// Do not allow direct submission of 'tax_input', clients must use 'terms' and/or 'terms_names'.
-			unset( $post_data['tax_input'], $post_data['post_category'], $post_data['tags_input'] );
+			unset($post_data['tax_input'], $post_data['post_category'], $post_data['tags_input']);
 		}
 
-		if ( isset( $post_data['post_format'] ) ) {
-			$format = set_post_format( $post_ID, $post_data['post_format'] );
+		if (isset($post_data['post_format'])) {
+			$format = set_post_format($post_ID, $post_data['post_format']);
 
-			if ( is_wp_error( $format ) )
-				return new IXR_Error( 500, $format->get_error_message() );
+			if (is_wp_error($format))
+				return new IXR_Error(500, $format->get_error_message());
 
-			unset( $post_data['post_format'] );
+			unset($post_data['post_format']);
 		}
 
 		// Handle enclosures.
-		$enclosure = isset( $post_data['enclosure'] ) ? $post_data['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_ID, $enclosure );
+		$enclosure = isset($post_data['enclosure']) ? $post_data['enclosure'] : null;
+		$this->add_enclosure_if_new($post_ID, $enclosure);
 
-		$this->attach_uploads( $post_ID, $post_data['post_content'] );
+		$this->attach_uploads($post_ID, $post_data['post_content']);
 
 		/**
 		 * Filter post data array to be inserted via XML-RPC.
@@ -1457,16 +1457,16 @@ 
 		 * @param array $post_data      Parsed array of post data.
 		 * @param array $content_struct Post data array.
 		 */
-		$post_data = apply_filters( 'xmlrpc_wp_insert_post_data', $post_data, $content_struct );
+		$post_data = apply_filters('xmlrpc_wp_insert_post_data', $post_data, $content_struct);
 
-		$post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error( 500, $post_ID->get_error_message() );
+		$post_ID = $update ? wp_update_post($post_data, true) : wp_insert_post($post_data, true);
+		if (is_wp_error($post_ID))
+			return new IXR_Error(500, $post_ID->get_error_message());
 
-		if ( ! $post_ID )
-			return new IXR_Error( 401, __( 'Sorry, your entry could not be posted. Something wrong happened.' ) );
+		if ( ! $post_ID)
+			return new IXR_Error(401, __('Sorry, your entry could not be posted. Something wrong happened.'));
 
-		return strval( $post_ID );
+		return strval($post_ID);
 	}
 
 	/**
@@ -1488,52 +1488,52 @@ 
 	 * }
 	 * @return true|IXR_Error True on success, IXR_Error on failure.
 	 */
-	public function wp_editPost( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+	public function wp_editPost($args) {
+		if ( ! $this->minimum_args($args, 5))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$post_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editPost' );
+		do_action('xmlrpc_call', 'wp.editPost');
 
-		$post = get_post( $post_id, ARRAY_A );
+		$post = get_post($post_id, ARRAY_A);
 
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if (empty($post['ID']))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( isset( $content_struct['if_not_modified_since'] ) ) {
+		if (isset($content_struct['if_not_modified_since'])) {
 			// If the post has been modified since the date provided, return an error.
-			if ( mysql2date( 'U', $post['post_modified_gmt'] ) > $content_struct['if_not_modified_since']->getTimestamp() ) {
-				return new IXR_Error( 409, __( 'There is a revision of this post that is more recent.' ) );
+			if (mysql2date('U', $post['post_modified_gmt']) > $content_struct['if_not_modified_since']->getTimestamp()) {
+				return new IXR_Error(409, __('There is a revision of this post that is more recent.'));
 			}
 		}
 
 		// Convert the date field back to IXR form.
-		$post['post_date'] = $this->_convert_date( $post['post_date'] );
+		$post['post_date'] = $this->_convert_date($post['post_date']);
 
 		/*
 		 * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
 		 * since _insert_post() will ignore the non-GMT date if the GMT date is set.
 		 */
-		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
-			unset( $post['post_date_gmt'] );
+		if ($post['post_date_gmt'] == '0000-00-00 00:00:00' || isset($content_struct['post_date']))
+			unset($post['post_date_gmt']);
 		else
-			$post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+			$post['post_date_gmt'] = $this->_convert_date($post['post_date_gmt']);
 
-		$this->escape( $post );
-		$merged_content_struct = array_merge( $post, $content_struct );
+		$this->escape($post);
+		$merged_content_struct = array_merge($post, $content_struct);
 
-		$retval = $this->_insert_post( $user, $merged_content_struct );
-		if ( $retval instanceof IXR_Error )
+		$retval = $this->_insert_post($user, $merged_content_struct);
+		if ($retval instanceof IXR_Error)
 			return $retval;
 
 		return true;
@@ -1556,33 +1556,33 @@ 
 	 * }
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
-	public function wp_deletePost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_deletePost($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username   = $args[1];
 		$password   = $args[2];
 		$post_id    = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deletePost' );
+		do_action('xmlrpc_call', 'wp.deletePost');
 
-		$post = get_post( $post_id, ARRAY_A );
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		$post = get_post($post_id, ARRAY_A);
+		if (empty($post['ID']))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! current_user_can( 'delete_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
+		if ( ! current_user_can('delete_post', $post_id))
+			return new IXR_Error(401, __('Sorry, you are not allowed to delete this post.'));
 
-		$result = wp_delete_post( $post_id );
+		$result = wp_delete_post($post_id);
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+		if ( ! $result)
+			return new IXR_Error(500, __('The post cannot be deleted.'));
 
 		return true;
 	}
@@ -1636,17 +1636,17 @@ 
 	 *  - 'tags'
 	 *  - 'enclosure'
 	 */
-	public function wp_getPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getPost($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$post_id  = (int) $args[3];
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/**
@@ -1657,24 +1657,24 @@ 
 			 * @param array  $fields Array of post fields. Default array contains 'post', 'terms', and 'custom_fields'.
 			 * @param string $method Method name.
 			 */
-			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
+			$fields = apply_filters('xmlrpc_default_post_fields', array('post', 'terms', 'custom_fields'), 'wp.getPost');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPost' );
+		do_action('xmlrpc_call', 'wp.getPost');
 
-		$post = get_post( $post_id, ARRAY_A );
+		$post = get_post($post_id, ARRAY_A);
 
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if (empty($post['ID']))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_id))
+			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 
-		return $this->_prepare_post( $post, $fields );
+		return $this->_prepare_post($post, $fields);
 	}
 
 	/**
@@ -1699,77 +1699,77 @@ 
 	 * }
 	 * @return array|IXR_Error Array contains a collection of posts.
 	 */
-	public function wp_getPosts( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_getPosts($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		$filter   = isset( $args[3] ) ? $args[3] : array();
+		$filter   = isset($args[3]) ? $args[3] : array();
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPosts' );
+			$fields = apply_filters('xmlrpc_default_post_fields', array('post', 'terms', 'custom_fields'), 'wp.getPosts');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPosts' );
+		do_action('xmlrpc_call', 'wp.getPosts');
 
 		$query = array();
 
-		if ( isset( $filter['post_type'] ) ) {
-			$post_type = get_post_type_object( $filter['post_type'] );
-			if ( ! ( (bool) $post_type ) )
-				return new IXR_Error( 403, __( 'The post type specified is not valid' ) );
+		if (isset($filter['post_type'])) {
+			$post_type = get_post_type_object($filter['post_type']);
+			if ( ! ((bool) $post_type))
+				return new IXR_Error(403, __('The post type specified is not valid'));
 		} else {
-			$post_type = get_post_type_object( 'post' );
+			$post_type = get_post_type_object('post');
 		}
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type' ));
+		if ( ! current_user_can($post_type->cap->edit_posts))
+			return new IXR_Error(401, __('Sorry, you are not allowed to edit posts in this post type'));
 
 		$query['post_type'] = $post_type->name;
 
-		if ( isset( $filter['post_status'] ) )
+		if (isset($filter['post_status']))
 			$query['post_status'] = $filter['post_status'];
 
-		if ( isset( $filter['number'] ) )
-			$query['numberposts'] = absint( $filter['number'] );
+		if (isset($filter['number']))
+			$query['numberposts'] = absint($filter['number']);
 
-		if ( isset( $filter['offset'] ) )
-			$query['offset'] = absint( $filter['offset'] );
+		if (isset($filter['offset']))
+			$query['offset'] = absint($filter['offset']);
 
-		if ( isset( $filter['orderby'] ) ) {
+		if (isset($filter['orderby'])) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if (isset($filter['order']))
 				$query['order'] = $filter['order'];
 		}
 
-		if ( isset( $filter['s'] ) ) {
+		if (isset($filter['s'])) {
 			$query['s'] = $filter['s'];
 		}
 
-		$posts_list = wp_get_recent_posts( $query );
+		$posts_list = wp_get_recent_posts($query);
 
-		if ( ! $posts_list )
+		if ( ! $posts_list)
 			return array();
 
 		// Holds all the posts data.
 		$struct = array();
 
-		foreach ( $posts_list as $post ) {
-			if ( ! current_user_can( 'edit_post', $post['ID'] ) )
+		foreach ($posts_list as $post) {
+			if ( ! current_user_can('edit_post', $post['ID']))
 				continue;
 
-			$struct[] = $this->_prepare_post( $post, $fields );
+			$struct[] = $this->_prepare_post($post, $fields);
 		}
 
 		return $struct;
@@ -1794,70 +1794,70 @@ 
 	 * }
 	 * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
 	 */
-	public function wp_newTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_newTerm($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newTerm' );
+		do_action('xmlrpc_call', 'wp.newTerm');
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($content_struct['taxonomy']))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
+		$taxonomy = get_taxonomy($content_struct['taxonomy']);
 
-		if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->manage_terms))
+			return new IXR_Error(401, __('You are not allowed to create terms in this taxonomy.'));
 
 		$taxonomy = (array) $taxonomy;
 
 		// hold the data of the term
 		$term_data = array();
 
-		$term_data['name'] = trim( $content_struct['name'] );
-		if ( empty( $term_data['name'] ) )
-			return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+		$term_data['name'] = trim($content_struct['name']);
+		if (empty($term_data['name']))
+			return new IXR_Error(403, __('The term name cannot be empty.'));
 
-		if ( isset( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+		if (isset($content_struct['parent'])) {
+			if ( ! $taxonomy['hierarchical'])
+				return new IXR_Error(403, __('This taxonomy is not hierarchical.'));
 
 			$parent_term_id = (int) $content_struct['parent'];
-			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+			$parent_term = get_term($parent_term_id, $taxonomy['name']);
 
-			if ( is_wp_error( $parent_term ) )
-				return new IXR_Error( 500, $parent_term->get_error_message() );
+			if (is_wp_error($parent_term))
+				return new IXR_Error(500, $parent_term->get_error_message());
 
-			if ( ! $parent_term )
-				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			if ( ! $parent_term)
+				return new IXR_Error(403, __('Parent term does not exist.'));
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
+		if (isset($content_struct['description']))
 			$term_data['description'] = $content_struct['description'];
 
-		if ( isset( $content_struct['slug'] ) )
+		if (isset($content_struct['slug']))
 			$term_data['slug'] = $content_struct['slug'];
 
-		$term = wp_insert_term( $term_data['name'] , $taxonomy['name'] , $term_data );
+		$term = wp_insert_term($term_data['name'], $taxonomy['name'], $term_data);
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($term))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $term )
-			return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
+		if ( ! $term)
+			return new IXR_Error(500, __('Sorry, your term could not be created. Something wrong happened.'));
 
-		return strval( $term['term_id'] );
+		return strval($term['term_id']);
 	}
 
 	/**
@@ -1880,80 +1880,80 @@ 
 	 * }
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
-	public function wp_editTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+	public function wp_editTerm($args) {
+		if ( ! $this->minimum_args($args, 5))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$term_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editTerm' );
+		do_action('xmlrpc_call', 'wp.editTerm');
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($content_struct['taxonomy']))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
+		$taxonomy = get_taxonomy($content_struct['taxonomy']);
 
-		if ( ! current_user_can( $taxonomy->cap->edit_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->edit_terms))
+			return new IXR_Error(401, __('You are not allowed to edit terms in this taxonomy.'));
 
 		$taxonomy = (array) $taxonomy;
 
 		// hold the data of the term
 		$term_data = array();
 
-		$term = get_term( $term_id , $content_struct['taxonomy'] );
+		$term = get_term($term_id, $content_struct['taxonomy']);
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($term))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term)
+			return new IXR_Error(404, __('Invalid term ID'));
 
-		if ( isset( $content_struct['name'] ) ) {
-			$term_data['name'] = trim( $content_struct['name'] );
+		if (isset($content_struct['name'])) {
+			$term_data['name'] = trim($content_struct['name']);
 
-			if ( empty( $term_data['name'] ) )
-				return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+			if (empty($term_data['name']))
+				return new IXR_Error(403, __('The term name cannot be empty.'));
 		}
 
-		if ( isset( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+		if (isset($content_struct['parent'])) {
+			if ( ! $taxonomy['hierarchical'])
+				return new IXR_Error(403, __("This taxonomy is not hierarchical so you can't set a parent."));
 
 			$parent_term_id = (int) $content_struct['parent'];
-			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+			$parent_term = get_term($parent_term_id, $taxonomy['name']);
 
-			if ( is_wp_error( $parent_term ) )
-				return new IXR_Error( 500, $parent_term->get_error_message() );
+			if (is_wp_error($parent_term))
+				return new IXR_Error(500, $parent_term->get_error_message());
 
-			if ( ! $parent_term )
-				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			if ( ! $parent_term)
+				return new IXR_Error(403, __('Parent term does not exist.'));
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
+		if (isset($content_struct['description']))
 			$term_data['description'] = $content_struct['description'];
 
-		if ( isset( $content_struct['slug'] ) )
+		if (isset($content_struct['slug']))
 			$term_data['slug'] = $content_struct['slug'];
 
-		$term = wp_update_term( $term_id , $taxonomy['name'] , $term_data );
+		$term = wp_update_term($term_id, $taxonomy['name'], $term_data);
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($term))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $term )
-			return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+		if ( ! $term)
+			return new IXR_Error(500, __('Sorry, editing the term failed.'));
 
 		return true;
 	}
@@ -1976,46 +1976,46 @@ 
 	 * }
 	 * @return bool|IXR_Error True on success, IXR_Error instance on failure.
 	 */
-	public function wp_deleteTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+	public function wp_deleteTerm($args) {
+		if ( ! $this->minimum_args($args, 5))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username           = $args[1];
 		$password           = $args[2];
 		$taxonomy           = $args[3];
 		$term_id            = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deleteTerm' );
+		do_action('xmlrpc_call', 'wp.deleteTerm');
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $taxonomy );
+		$taxonomy = get_taxonomy($taxonomy);
 
-		if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->delete_terms))
+			return new IXR_Error(401, __('You are not allowed to delete terms in this taxonomy.'));
 
-		$term = get_term( $term_id, $taxonomy->name );
+		$term = get_term($term_id, $taxonomy->name);
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($term))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term)
+			return new IXR_Error(404, __('Invalid term ID'));
 
-		$result = wp_delete_term( $term_id, $taxonomy->name );
+		$result = wp_delete_term($term_id, $taxonomy->name);
 
-		if ( is_wp_error( $result ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($result))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+		if ( ! $result)
+			return new IXR_Error(500, __('Sorry, deleting the term failed.'));
 
 		return $result;
 	}
@@ -2047,40 +2047,40 @@ 
 	 *  - 'parent'
 	 *  - 'count'
 	 */
-	public function wp_getTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+	public function wp_getTerm($args) {
+		if ( ! $this->minimum_args($args, 5))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username           = $args[1];
 		$password           = $args[2];
 		$taxonomy           = $args[3];
 		$term_id            = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTerm' );
+		do_action('xmlrpc_call', 'wp.getTerm');
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $taxonomy );
+		$taxonomy = get_taxonomy($taxonomy);
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->assign_terms))
+			return new IXR_Error(401, __('You are not allowed to assign terms in this taxonomy.'));
 
-		$term = get_term( $term_id , $taxonomy->name, ARRAY_A );
+		$term = get_term($term_id, $taxonomy->name, ARRAY_A);
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if (is_wp_error($term))
+			return new IXR_Error(500, $term->get_error_message());
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term)
+			return new IXR_Error(404, __('Invalid term ID'));
 
-		return $this->_prepare_term( $term );
+		return $this->_prepare_term($term);
 	}
 
 	/**
@@ -2105,63 +2105,63 @@ 
 	 * }
 	 * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
 	 */
-	public function wp_getTerms( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getTerms($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$taxonomy       = $args[3];
-		$filter         = isset( $args[4] ) ? $args[4] : array();
+		$filter         = isset($args[4]) ? $args[4] : array();
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTerms' );
+		do_action('xmlrpc_call', 'wp.getTerms');
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $taxonomy );
+		$taxonomy = get_taxonomy($taxonomy);
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->assign_terms))
+			return new IXR_Error(401, __('You are not allowed to assign terms in this taxonomy.'));
 
 		$query = array();
 
-		if ( isset( $filter['number'] ) )
-			$query['number'] = absint( $filter['number'] );
+		if (isset($filter['number']))
+			$query['number'] = absint($filter['number']);
 
-		if ( isset( $filter['offset'] ) )
-			$query['offset'] = absint( $filter['offset'] );
+		if (isset($filter['offset']))
+			$query['offset'] = absint($filter['offset']);
 
-		if ( isset( $filter['orderby'] ) ) {
+		if (isset($filter['orderby'])) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if (isset($filter['order']))
 				$query['order'] = $filter['order'];
 		}
 
-		if ( isset( $filter['hide_empty'] ) )
+		if (isset($filter['hide_empty']))
 			$query['hide_empty'] = $filter['hide_empty'];
 		else
 			$query['get'] = 'all';
 
-		if ( isset( $filter['search'] ) )
+		if (isset($filter['search']))
 			$query['search'] = $filter['search'];
 
-		$terms = get_terms( $taxonomy->name, $query );
+		$terms = get_terms($taxonomy->name, $query);
 
-		if ( is_wp_error( $terms ) )
-			return new IXR_Error( 500, $terms->get_error_message() );
+		if (is_wp_error($terms))
+			return new IXR_Error(500, $terms->get_error_message());
 
 		$struct = array();
 
-		foreach ( $terms as $term ) {
-			$struct[] = $this->_prepare_term( $term );
+		foreach ($terms as $term) {
+			$struct[] = $this->_prepare_term($term);
 		}
 
 		return $struct;
@@ -2187,17 +2187,17 @@ 
 	 * }
 	 * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
 	 */
-	public function wp_getTaxonomy( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getTaxonomy($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$taxonomy = $args[3];
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/**
@@ -2208,24 +2208,24 @@ 
 			 * @param array  $fields An array of taxonomy fields to retrieve.
 			 * @param string $method The method name.
 			 */
-			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
+			$fields = apply_filters('xmlrpc_default_taxonomy_fields', array('labels', 'cap', 'object_type'), 'wp.getTaxonomy');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
+		do_action('xmlrpc_call', 'wp.getTaxonomy');
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			return new IXR_Error(403, __('Invalid taxonomy'));
 
-		$taxonomy = get_taxonomy( $taxonomy );
+		$taxonomy = get_taxonomy($taxonomy);
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can($taxonomy->cap->assign_terms))
+			return new IXR_Error(401, __('You are not allowed to assign terms in this taxonomy.'));
 
-		return $this->_prepare_taxonomy( $taxonomy, $fields );
+		return $this->_prepare_taxonomy($taxonomy, $fields);
 	}
 
 	/**
@@ -2247,40 +2247,40 @@ 
 	 * @return array|IXR_Error An associative array of taxonomy data with returned fields determined
 	 *                         by `$fields`, or an IXR_Error instance on failure.
 	 */
-	public function wp_getTaxonomies( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_getTaxonomies($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		$filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+		$filter   = isset($args[3]) ? $args[3] : array('public' => true);
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomies' );
+			$fields = apply_filters('xmlrpc_default_taxonomy_fields', array('labels', 'cap', 'object_type'), 'wp.getTaxonomies');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTaxonomies' );
+		do_action('xmlrpc_call', 'wp.getTaxonomies');
 
-		$taxonomies = get_taxonomies( $filter, 'objects' );
+		$taxonomies = get_taxonomies($filter, 'objects');
 
 		// holds all the taxonomy data
 		$struct = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
+		foreach ($taxonomies as $taxonomy) {
 			// capability check for post_types
-			if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+			if ( ! current_user_can($taxonomy->cap->assign_terms))
 				continue;
 
-			$struct[] = $this->_prepare_taxonomy( $taxonomy, $fields );
+			$struct[] = $this->_prepare_taxonomy($taxonomy, $fields);
 		}
 
 		return $struct;
@@ -2322,17 +2322,17 @@ 
 	 *  - 'display_name'
 	 *  - 'roles'
 	 */
-	public function wp_getUser( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getUser($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$user_id  = (int) $args[3];
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/**
@@ -2343,24 +2343,24 @@ 
 			 * @param array  $fields User query fields for given method. Default 'all'.
 			 * @param string $method The method name.
 			 */
-			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
+			$fields = apply_filters('xmlrpc_default_user_fields', array('all'), 'wp.getUser');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getUser' );
+		do_action('xmlrpc_call', 'wp.getUser');
 
-		if ( ! current_user_can( 'edit_user', $user_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit users.' ) );
+		if ( ! current_user_can('edit_user', $user_id))
+			return new IXR_Error(401, __('Sorry, you cannot edit users.'));
 
-		$user_data = get_userdata( $user_id );
+		$user_data = get_userdata($user_id);
 
-		if ( ! $user_data )
-			return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+		if ( ! $user_data)
+			return new IXR_Error(404, __('Invalid user ID.'));
 
-		return $this->_prepare_user( $user_data, $fields );
+		return $this->_prepare_user($user_data, $fields);
 	}
 
 	/**
@@ -2387,61 +2387,61 @@ 
 	 * }
 	 * @return array|IXR_Error users data
 	 */
-	public function wp_getUsers( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_getUsers($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		$filter   = isset( $args[3] ) ? $args[3] : array();
+		$filter   = isset($args[3]) ? $args[3] : array();
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUsers' );
+			$fields = apply_filters('xmlrpc_default_user_fields', array('all'), 'wp.getUsers');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getUsers' );
+		do_action('xmlrpc_call', 'wp.getUsers');
 
-		if ( ! current_user_can( 'list_users' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
+		if ( ! current_user_can('list_users'))
+			return new IXR_Error(401, __('Sorry, you cannot list users.'));
 
-		$query = array( 'fields' => 'all_with_meta' );
+		$query = array('fields' => 'all_with_meta');
 
-		$query['number'] = ( isset( $filter['number'] ) ) ? absint( $filter['number'] ) : 50;
-		$query['offset'] = ( isset( $filter['offset'] ) ) ? absint( $filter['offset'] ) : 0;
+		$query['number'] = (isset($filter['number'])) ? absint($filter['number']) : 50;
+		$query['offset'] = (isset($filter['offset'])) ? absint($filter['offset']) : 0;
 
-		if ( isset( $filter['orderby'] ) ) {
+		if (isset($filter['orderby'])) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if (isset($filter['order']))
 				$query['order'] = $filter['order'];
 		}
 
-		if ( isset( $filter['role'] ) ) {
-			if ( get_role( $filter['role'] ) === null )
-				return new IXR_Error( 403, __( 'The role specified is not valid' ) );
+		if (isset($filter['role'])) {
+			if (get_role($filter['role']) === null)
+				return new IXR_Error(403, __('The role specified is not valid'));
 
 			$query['role'] = $filter['role'];
 		}
 
-		if ( isset( $filter['who'] ) ) {
+		if (isset($filter['who'])) {
 			$query['who'] = $filter['who'];
 		}
 
-		$users = get_users( $query );
+		$users = get_users($query);
 
 		$_users = array();
-		foreach ( $users as $user_data ) {
-			if ( current_user_can( 'edit_user', $user_data->ID ) )
-				$_users[] = $this->_prepare_user( $user_data, $fields );
+		foreach ($users as $user_data) {
+			if (current_user_can('edit_user', $user_data->ID))
+				$_users[] = $this->_prepare_user($user_data, $fields);
 		}
 		return $_users;
 	}
@@ -2461,34 +2461,34 @@ 
 	 * }
 	 * @return array|IXR_Error (@see wp_getUser)
 	 */
-	public function wp_getProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_getProfile($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( isset( $args[3] ) ) {
+		if (isset($args[3])) {
 			$fields = $args[3];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getProfile' );
+			$fields = apply_filters('xmlrpc_default_user_fields', array('all'), 'wp.getProfile');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getProfile' );
+		do_action('xmlrpc_call', 'wp.getProfile');
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		if ( ! current_user_can('edit_user', $user->ID))
+			return new IXR_Error(401, __('Sorry, you cannot edit your profile.'));
 
-		$user_data = get_userdata( $user->ID );
+		$user_data = get_userdata($user->ID);
 
-		return $this->_prepare_user( $user_data, $fields );
+		return $this->_prepare_user($user_data, $fields);
 	}
 
 	/**
@@ -2513,58 +2513,58 @@ 
 	 * }
 	 * @return true|IXR_Error True, on success.
 	 */
-	public function wp_editProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_editProfile($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editProfile' );
+		do_action('xmlrpc_call', 'wp.editProfile');
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		if ( ! current_user_can('edit_user', $user->ID))
+			return new IXR_Error(401, __('Sorry, you cannot edit your profile.'));
 
 		// holds data of the user
 		$user_data = array();
 		$user_data['ID'] = $user->ID;
 
 		// only set the user details if it was given
-		if ( isset( $content_struct['first_name'] ) )
+		if (isset($content_struct['first_name']))
 			$user_data['first_name'] = $content_struct['first_name'];
 
-		if ( isset( $content_struct['last_name'] ) )
+		if (isset($content_struct['last_name']))
 			$user_data['last_name'] = $content_struct['last_name'];
 
-		if ( isset( $content_struct['url'] ) )
+		if (isset($content_struct['url']))
 			$user_data['user_url'] = $content_struct['url'];
 
-		if ( isset( $content_struct['display_name'] ) )
+		if (isset($content_struct['display_name']))
 			$user_data['display_name'] = $content_struct['display_name'];
 
-		if ( isset( $content_struct['nickname'] ) )
+		if (isset($content_struct['nickname']))
 			$user_data['nickname'] = $content_struct['nickname'];
 
-		if ( isset( $content_struct['nicename'] ) )
+		if (isset($content_struct['nicename']))
 			$user_data['user_nicename'] = $content_struct['nicename'];
 
-		if ( isset( $content_struct['bio'] ) )
+		if (isset($content_struct['bio']))
 			$user_data['description'] = $content_struct['bio'];
 
-		$result = wp_update_user( $user_data );
+		$result = wp_update_user($user_data);
 
-		if ( is_wp_error( $result ) )
-			return new IXR_Error( 500, $result->get_error_message() );
+		if (is_wp_error($result))
+			return new IXR_Error(500, $result->get_error_message());
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+		if ( ! $result)
+			return new IXR_Error(500, __('Sorry, the user cannot be updated.'));
 
 		return true;
 	}
@@ -2584,34 +2584,34 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPage( $args ) {
-		$this->escape( $args );
+	public function wp_getPage($args) {
+		$this->escape($args);
 
 		$page_id  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) ) {
+		if ( ! $user = $this->login($username, $password)) {
 			return $this->error;
 		}
 
 		$page = get_post($page_id);
-		if ( ! $page )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $page)
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can( 'edit_page', $page_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this page.' ) );
+		if ( ! current_user_can('edit_page', $page_id))
+			return new IXR_Error(401, __('Sorry, you cannot edit this page.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPage' );
+		do_action('xmlrpc_call', 'wp.getPage');
 
 		// If we found the page then format the data.
-		if ( $page->ID && ($page->post_type == 'page') ) {
-			return $this->_prepare_page( $page );
+		if ($page->ID && ($page->post_type == 'page')) {
+			return $this->_prepare_page($page);
 		}
 		// If the page doesn't exist indicate that.
 		else {
-			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+			return new IXR_Error(404, __('Sorry, no such page.'));
 		}
 	}
 
@@ -2630,32 +2630,32 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPages( $args ) {
-		$this->escape( $args );
+	public function wp_getPages($args) {
+		$this->escape($args);
 
 		$username  = $args[1];
 		$password  = $args[2];
 		$num_pages = isset($args[3]) ? (int) $args[3] : 10;
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		if ( ! current_user_can('edit_pages'))
+			return new IXR_Error(401, __('Sorry, you cannot edit pages.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPages' );
+		do_action('xmlrpc_call', 'wp.getPages');
 
-		$pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
+		$pages = get_posts(array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages));
 		$num_pages = count($pages);
 
 		// If we have pages, put together their info.
-		if ( $num_pages >= 1 ) {
+		if ($num_pages >= 1) {
 			$pages_struct = array();
 
 			foreach ($pages as $page) {
-				if ( current_user_can( 'edit_page', $page->ID ) )
-					$pages_struct[] = $this->_prepare_page( $page );
+				if (current_user_can('edit_page', $page->ID))
+					$pages_struct[] = $this->_prepare_page($page);
 			}
 
 			return $pages_struct;
@@ -2681,22 +2681,22 @@ 
 	 * }
 	 * @return int|IXR_Error
 	 */
-	public function wp_newPage( $args ) {
+	public function wp_newPage($args) {
 		// Items not escaped here will be escaped in newPost.
-		$username = $this->escape( $args[1] );
-		$password = $this->escape( $args[2] );
+		$username = $this->escape($args[1]);
+		$password = $this->escape($args[2]);
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newPage' );
+		do_action('xmlrpc_call', 'wp.newPage');
 
 		// Mark this as content for a page.
 		$args[3]["post_type"] = 'page';
 
 		// Let mw_newPost do all of the heavy lifting.
-		return $this->mw_newPost( $args );
+		return $this->mw_newPost($args);
 	}
 
 	/**
@@ -2714,33 +2714,33 @@ 
 	 * }
 	 * @return true|IXR_Error True, if success.
 	 */
-	public function wp_deletePage( $args ) {
-		$this->escape( $args );
+	public function wp_deletePage($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$page_id  = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deletePage' );
+		do_action('xmlrpc_call', 'wp.deletePage');
 
 		// Get the current page based on the page_id and
 		// make sure it is a page and not a post.
 		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		if ( ! $actual_page || ($actual_page['post_type'] != 'page'))
+			return new IXR_Error(404, __('Sorry, no such page.'));
 
 		// Make sure the user can delete pages.
-		if ( !current_user_can('delete_page', $page_id) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
+		if ( ! current_user_can('delete_page', $page_id))
+			return new IXR_Error(401, __('Sorry, you do not have the right to delete this page.'));
 
 		// Attempt to delete the page.
 		$result = wp_delete_post($page_id);
-		if ( !$result )
-			return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+		if ( ! $result)
+			return new IXR_Error(500, __('Failed to delete the page.'));
 
 		/**
 		 * Fires after a page has been successfully deleted via XML-RPC.
@@ -2750,7 +2750,7 @@ 
 		 * @param int   $page_id ID of the deleted page.
 		 * @param array $args    An array of arguments to delete the page.
 		 */
-		do_action( 'xmlrpc_call_success_wp_deletePage', $page_id, $args );
+		do_action('xmlrpc_call_success_wp_deletePage', $page_id, $args);
 
 		return true;
 	}
@@ -2772,7 +2772,7 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_editPage( $args ) {
+	public function wp_editPage($args) {
 		// Items will be escaped in mw_editPost.
 		$page_id  = (int) $args[1];
 		$username = $args[2];
@@ -2780,24 +2780,24 @@ 
 		$content  = $args[4];
 		$publish  = $args[5];
 
-		$escaped_username = $this->escape( $username );
-		$escaped_password = $this->escape( $password );
+		$escaped_username = $this->escape($username);
+		$escaped_password = $this->escape($password);
 
-		if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
+		if ( ! $user = $this->login($escaped_username, $escaped_password)) {
 			return $this->error;
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editPage' );
+		do_action('xmlrpc_call', 'wp.editPage');
 
 		// Get the page data and make sure it is a page.
 		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		if ( ! $actual_page || ($actual_page['post_type'] != 'page'))
+			return new IXR_Error(404, __('Sorry, no such page.'));
 
 		// Make sure the user is allowed to edit pages.
-		if ( !current_user_can('edit_page', $page_id) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
+		if ( ! current_user_can('edit_page', $page_id))
+			return new IXR_Error(401, __('Sorry, you do not have the right to edit this page.'));
 
 		// Mark this as content for a page.
 		$content['post_type'] = 'page';
@@ -2812,7 +2812,7 @@ 
 		);
 
 		// Let mw_editPost do all of the heavy lifting.
-		return $this->mw_editPost( $args );
+		return $this->mw_editPost($args);
 	}
 
 	/**
@@ -2831,22 +2831,22 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPageList( $args ) {
+	public function wp_getPageList($args) {
 		global $wpdb;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		if ( ! current_user_can('edit_pages'))
+			return new IXR_Error(401, __('Sorry, you cannot edit pages.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPageList' );
+		do_action('xmlrpc_call', 'wp.getPageList');
 
 		// Get list of pages ids and titles
 		$page_list = $wpdb->get_results("
@@ -2863,9 +2863,9 @@ 
 
 		// The date needs to be formatted properly.
 		$num_pages = count($page_list);
-		for ( $i = 0; $i < $num_pages; $i++ ) {
-			$page_list[$i]->dateCreated = $this->_convert_date(  $page_list[$i]->post_date );
-			$page_list[$i]->date_created_gmt = $this->_convert_date_gmt( $page_list[$i]->post_date_gmt, $page_list[$i]->post_date );
+		for ($i = 0; $i < $num_pages; $i++) {
+			$page_list[$i]->dateCreated = $this->_convert_date($page_list[$i]->post_date);
+			$page_list[$i]->date_created_gmt = $this->_convert_date_gmt($page_list[$i]->post_date_gmt, $page_list[$i]->post_date);
 
 			unset($page_list[$i]->post_date_gmt);
 			unset($page_list[$i]->post_date);
@@ -2889,23 +2889,23 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getAuthors( $args ) {
-		$this->escape( $args );
+	public function wp_getAuthors($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can('edit_posts') )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you cannot edit posts on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getAuthors' );
+		do_action('xmlrpc_call', 'wp.getAuthors');
 
 		$authors = array();
-		foreach ( get_users( array( 'fields' => array('ID','user_login','display_name') ) ) as $user ) {
+		foreach (get_users(array('fields' => array('ID', 'user_login', 'display_name'))) as $user) {
 			$authors[] = array(
 				'user_id'       => $user->ID,
 				'user_login'    => $user->user_login,
@@ -2930,32 +2930,32 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getTags( $args ) {
-		$this->escape( $args );
+	public function wp_getTags($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view tags.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getKeywords' );
+		do_action('xmlrpc_call', 'wp.getKeywords');
 
 		$tags = array();
 
-		if ( $all_tags = get_tags() ) {
-			foreach( (array) $all_tags as $tag ) {
+		if ($all_tags = get_tags()) {
+			foreach ((array) $all_tags as $tag) {
 				$struct = array();
-				$struct['tag_id']			= $tag->term_id;
+				$struct['tag_id'] = $tag->term_id;
 				$struct['name']				= $tag->name;
 				$struct['count']			= $tag->count;
 				$struct['slug']				= $tag->slug;
-				$struct['html_url']			= esc_html( get_tag_link( $tag->term_id ) );
-				$struct['rss_url']			= esc_html( get_tag_feed_link( $tag->term_id ) );
+				$struct['html_url'] = esc_html(get_tag_link($tag->term_id));
+				$struct['rss_url'] = esc_html(get_tag_feed_link($tag->term_id));
 
 				$tags[] = $struct;
 			}
@@ -2979,35 +2979,35 @@ 
 	 * }
 	 * @return int|IXR_Error Category ID.
 	 */
-	public function wp_newCategory( $args ) {
-		$this->escape( $args );
+	public function wp_newCategory($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$category = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newCategory' );
+		do_action('xmlrpc_call', 'wp.newCategory');
 
 		// Make sure the user is allowed to add a category.
-		if ( !current_user_can('manage_categories') )
+		if ( ! current_user_can('manage_categories'))
 			return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
 
 		// If no slug was provided make it empty so that
 		// WordPress will generate one.
-		if ( empty($category['slug']) )
+		if (empty($category['slug']))
 			$category['slug'] = '';
 
 		// If no parent_id was provided make it empty
 		// so that it will be a top level page (no parent).
-		if ( !isset($category['parent_id']) )
+		if ( ! isset($category['parent_id']))
 			$category['parent_id'] = '';
 
 		// If no description was provided make it empty.
-		if ( empty($category["description"]) )
+		if (empty($category["description"]))
 			$category["description"] = "";
 
 		$new_category = array(
@@ -3018,12 +3018,12 @@ 
 		);
 
 		$cat_id = wp_insert_category($new_category, true);
-		if ( is_wp_error( $cat_id ) ) {
-			if ( 'term_exists' == $cat_id->get_error_code() )
+		if (is_wp_error($cat_id)) {
+			if ('term_exists' == $cat_id->get_error_code())
 				return (int) $cat_id->get_error_data();
 			else
 				return new IXR_Error(500, __('Sorry, the new category failed.'));
-		} elseif ( ! $cat_id ) {
+		} elseif ( ! $cat_id) {
 			return new IXR_Error(500, __('Sorry, the new category failed.'));
 		}
 
@@ -3035,7 +3035,7 @@ 
 		 * @param int   $cat_id ID of the new category.
 		 * @param array $args   An array of new category arguments.
 		 */
-		do_action( 'xmlrpc_call_success_wp_newCategory', $cat_id, $args );
+		do_action('xmlrpc_call_success_wp_newCategory', $cat_id, $args);
 
 		return $cat_id;
 	}
@@ -3055,25 +3055,25 @@ 
 	 * }
 	 * @return bool|IXR_Error See {@link wp_delete_term()} for return info.
 	 */
-	public function wp_deleteCategory( $args ) {
-		$this->escape( $args );
+	public function wp_deleteCategory($args) {
+		$this->escape($args);
 
 		$username    = $args[1];
 		$password    = $args[2];
 		$category_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deleteCategory' );
+		do_action('xmlrpc_call', 'wp.deleteCategory');
 
-		if ( !current_user_can('manage_categories') )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
+		if ( ! current_user_can('manage_categories'))
+			return new IXR_Error(401, __('Sorry, you do not have the right to delete a category.'));
 
-		$status = wp_delete_term( $category_id, 'category' );
+		$status = wp_delete_term($category_id, 'category');
 
-		if ( true == $status ) {
+		if (true == $status) {
 			/**
 			 * Fires after a category has been successfully deleted via XML-RPC.
 			 *
@@ -3082,7 +3082,7 @@ 
 			 * @param int   $category_id ID of the deleted category.
 			 * @param array $args        An array of arguments to delete the category.
 			 */
-			do_action( 'xmlrpc_call_success_wp_deleteCategory', $category_id, $args );
+			do_action('xmlrpc_call_success_wp_deleteCategory', $category_id, $args);
 		}
 
 		return $status;
@@ -3104,26 +3104,26 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_suggestCategories( $args ) {
-		$this->escape( $args );
+	public function wp_suggestCategories($args) {
+		$this->escape($args);
 
 		$username    = $args[1];
 		$password    = $args[2];
 		$category    = $args[3];
 		$max_results = (int) $args[4];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view categories.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.suggestCategories' );
+		do_action('xmlrpc_call', 'wp.suggestCategories');
 
 		$category_suggestions = array();
 		$args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
-		foreach ( (array) get_categories($args) as $cat ) {
+		foreach ((array) get_categories($args) as $cat) {
 			$category_suggestions[] = array(
 				'category_id'	=> $cat->term_id,
 				'category_name'	=> $cat->name
@@ -3155,19 +3155,19 @@ 
 		$password	= $args[2];
 		$comment_id	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( ! current_user_can('moderate_comments'))
+			return new IXR_Error(403, __('You are not allowed to moderate comments on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getComment' );
+		do_action('xmlrpc_call', 'wp.getComment');
 
-		if ( ! $comment = get_comment($comment_id) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! $comment = get_comment($comment_id))
+			return new IXR_Error(404, __('Invalid comment ID.'));
 
-		return $this->_prepare_comment( $comment );
+		return $this->_prepare_comment($comment);
 	}
 
 	/**
@@ -3196,45 +3196,45 @@ 
 	 * }
 	 * @return array|IXR_Error Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
 	 */
-	public function wp_getComments( $args ) {
-		$this->escape( $args );
+	public function wp_getComments($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		$struct	  = isset( $args[3] ) ? $args[3] : array();
+		$struct	  = isset($args[3]) ? $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
+		if ( ! current_user_can('moderate_comments'))
+			return new IXR_Error(401, __('Sorry, you cannot edit comments.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getComments' );
+		do_action('xmlrpc_call', 'wp.getComments');
 
-		if ( isset($struct['status']) )
+		if (isset($struct['status']))
 			$status = $struct['status'];
 		else
 			$status = '';
 
 		$post_id = '';
-		if ( isset($struct['post_id']) )
+		if (isset($struct['post_id']))
 			$post_id = absint($struct['post_id']);
 
 		$offset = 0;
-		if ( isset($struct['offset']) )
+		if (isset($struct['offset']))
 			$offset = absint($struct['offset']);
 
 		$number = 10;
-		if ( isset($struct['number']) )
+		if (isset($struct['number']))
 			$number = absint($struct['number']);
 
-		$comments = get_comments( array( 'status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
+		$comments = get_comments(array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number));
 
 		$comments_struct = array();
-		if ( is_array( $comments ) ) {
-			foreach ( $comments as $comment ) {
-				$comments_struct[] = $this->_prepare_comment( $comment );
+		if (is_array($comments)) {
+			foreach ($comments as $comment) {
+				$comments_struct[] = $this->_prepare_comment($comment);
 			}
 		}
 
@@ -3267,24 +3267,24 @@ 
 		$password	= $args[2];
 		$comment_ID	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( ! current_user_can('moderate_comments'))
+			return new IXR_Error(403, __('You are not allowed to moderate comments on this site.'));
 
-		if ( ! get_comment($comment_ID) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! get_comment($comment_ID))
+			return new IXR_Error(404, __('Invalid comment ID.'));
 
-		if ( !current_user_can( 'edit_comment', $comment_ID ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( ! current_user_can('edit_comment', $comment_ID))
+			return new IXR_Error(403, __('You are not allowed to moderate comments on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deleteComment' );
+		do_action('xmlrpc_call', 'wp.deleteComment');
 
-		$status = wp_delete_comment( $comment_ID );
+		$status = wp_delete_comment($comment_ID);
 
-		if ( $status ) {
+		if ($status) {
 			/**
 			 * Fires after a comment has been successfully deleted via XML-RPC.
 			 *
@@ -3293,7 +3293,7 @@ 
 			 * @param int   $comment_ID ID of the deleted comment.
 			 * @param array $args       An array of arguments to delete the comment.
 			 */
-			do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_ID, $args );
+			do_action('xmlrpc_call_success_wp_deleteComment', $comment_ID, $args);
 		}
 
 		return $status;
@@ -3326,66 +3326,66 @@ 
 	 * }
 	 * @return true|IXR_Error True, on success.
 	 */
-	public function wp_editComment( $args ) {
-		$this->escape( $args );
+	public function wp_editComment($args) {
+		$this->escape($args);
 
 		$username	= $args[1];
 		$password	= $args[2];
 		$comment_ID	= (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( ! current_user_can('moderate_comments'))
+			return new IXR_Error(403, __('You are not allowed to moderate comments on this site.'));
 
-		if ( ! get_comment($comment_ID) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! get_comment($comment_ID))
+			return new IXR_Error(404, __('Invalid comment ID.'));
 
-		if ( !current_user_can( 'edit_comment', $comment_ID ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( ! current_user_can('edit_comment', $comment_ID))
+			return new IXR_Error(403, __('You are not allowed to moderate comments on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editComment' );
+		do_action('xmlrpc_call', 'wp.editComment');
 
-		if ( isset($content_struct['status']) ) {
+		if (isset($content_struct['status'])) {
 			$statuses = get_comment_statuses();
 			$statuses = array_keys($statuses);
 
-			if ( ! in_array($content_struct['status'], $statuses) )
-				return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+			if ( ! in_array($content_struct['status'], $statuses))
+				return new IXR_Error(401, __('Invalid comment status.'));
 			$comment_approved = $content_struct['status'];
 		}
 
 		// Do some timestamp voodoo
-		if ( !empty( $content_struct['date_created_gmt'] ) ) {
+		if ( ! empty($content_struct['date_created_gmt'])) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+			$dateCreated = rtrim($content_struct['date_created_gmt']->getIso(), 'Z').'Z';
 			$comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
 			$comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
 		}
 
-		if ( isset($content_struct['content']) )
+		if (isset($content_struct['content']))
 			$comment_content = $content_struct['content'];
 
-		if ( isset($content_struct['author']) )
+		if (isset($content_struct['author']))
 			$comment_author = $content_struct['author'];
 
-		if ( isset($content_struct['author_url']) )
+		if (isset($content_struct['author_url']))
 			$comment_author_url = $content_struct['author_url'];
 
-		if ( isset($content_struct['author_email']) )
+		if (isset($content_struct['author_email']))
 			$comment_author_email = $content_struct['author_email'];
 
 		// We've got all the data -- post it:
 		$comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
 
 		$result = wp_update_comment($comment);
-		if ( is_wp_error( $result ) )
+		if (is_wp_error($result))
 			return new IXR_Error(500, $result->get_error_message());
 
-		if ( !$result )
+		if ( ! $result)
 			return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
 
 		/**
@@ -3396,7 +3396,7 @@ 
 		 * @param int   $comment_ID ID of the updated comment.
 		 * @param array $args       An array of arguments to update the comment.
 		 */
-		do_action( 'xmlrpc_call_success_wp_editComment', $comment_ID, $args );
+		do_action('xmlrpc_call_success_wp_editComment', $comment_ID, $args);
 
 		return true;
 	}
@@ -3433,71 +3433,71 @@ 
 		 * @param bool $allow Whether to allow anonymous commenting via XML-RPC.
 		 *                    Default false.
 		 */
-		$allow_anon = apply_filters( 'xmlrpc_allow_anonymous_comments', false );
+		$allow_anon = apply_filters('xmlrpc_allow_anonymous_comments', false);
 
 		$user = $this->login($username, $password);
 
-		if ( !$user ) {
+		if ( ! $user) {
 			$logged_in = false;
-			if ( $allow_anon && get_option('comment_registration') ) {
-				return new IXR_Error( 403, __( 'You must be registered to comment' ) );
-			} elseif ( ! $allow_anon ) {
+			if ($allow_anon && get_option('comment_registration')) {
+				return new IXR_Error(403, __('You must be registered to comment'));
+			} elseif ( ! $allow_anon) {
 				return $this->error;
 			}
 		} else {
 			$logged_in = true;
 		}
 
-		if ( is_numeric($post) )
+		if (is_numeric($post))
 			$post_id = absint($post);
 		else
 			$post_id = url_to_postid($post);
 
-		if ( ! $post_id )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post_id)
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! get_post($post_id) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post($post_id))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
 		$comment = array();
 		$comment['comment_post_ID'] = $post_id;
 
-		if ( $logged_in ) {
-			$comment['comment_author'] = $this->escape( $user->display_name );
-			$comment['comment_author_email'] = $this->escape( $user->user_email );
-			$comment['comment_author_url'] = $this->escape( $user->user_url );
+		if ($logged_in) {
+			$comment['comment_author'] = $this->escape($user->display_name);
+			$comment['comment_author_email'] = $this->escape($user->user_email);
+			$comment['comment_author_url'] = $this->escape($user->user_url);
 			$comment['user_ID'] = $user->ID;
 		} else {
 			$comment['comment_author'] = '';
-			if ( isset($content_struct['author']) )
+			if (isset($content_struct['author']))
 				$comment['comment_author'] = $content_struct['author'];
 
 			$comment['comment_author_email'] = '';
-			if ( isset($content_struct['author_email']) )
+			if (isset($content_struct['author_email']))
 				$comment['comment_author_email'] = $content_struct['author_email'];
 
 			$comment['comment_author_url'] = '';
-			if ( isset($content_struct['author_url']) )
+			if (isset($content_struct['author_url']))
 				$comment['comment_author_url'] = $content_struct['author_url'];
 
 			$comment['user_ID'] = 0;
 
-			if ( get_option('require_name_email') ) {
-				if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
-					return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
-				elseif ( !is_email($comment['comment_author_email']) )
-					return new IXR_Error( 403, __( 'A valid email address is required' ) );
+			if (get_option('require_name_email')) {
+				if (6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'])
+					return new IXR_Error(403, __('Comment author name and email are required'));
+				elseif ( ! is_email($comment['comment_author_email']))
+					return new IXR_Error(403, __('A valid email address is required'));
 			}
 		}
 
 		$comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
 
-		$comment['comment_content'] =  isset($content_struct['content']) ? $content_struct['content'] : null;
+		$comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newComment' );
+		do_action('xmlrpc_call', 'wp.newComment');
 
-		$comment_ID = wp_new_comment( $comment );
+		$comment_ID = wp_new_comment($comment);
 
 		/**
 		 * Fires after a new comment has been successfully created via XML-RPC.
@@ -3507,7 +3507,7 @@ 
 		 * @param int   $comment_ID ID of the new comment.
 		 * @param array $args       An array of new comment arguments.
 		 */
-		do_action( 'xmlrpc_call_success_wp_newComment', $comment_ID, $args );
+		do_action('xmlrpc_call_success_wp_newComment', $comment_ID, $args);
 
 		return $comment_ID;
 	}
@@ -3527,19 +3527,19 @@ 
 	 * @return array|IXR_Error
 	 */
 	public function wp_getCommentStatusList($args) {
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can('moderate_comments'))
+			return new IXR_Error(403, __('You are not allowed access to details about this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getCommentStatusList' );
+		do_action('xmlrpc_call', 'wp.getCommentStatusList');
 
 		return get_comment_statuses();
 	}
@@ -3559,23 +3559,23 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getCommentCount( $args ) {
-		$this->escape( $args );
+	public function wp_getCommentCount($args) {
+		$this->escape($args);
 
 		$username	= $args[1];
 		$password	= $args[2];
-		$post_id	= (int) $args[3];
+		$post_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(403, __('You are not allowed access to details about comments.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getCommentCount' );
+		do_action('xmlrpc_call', 'wp.getCommentCount');
 
-		$count = wp_count_comments( $post_id );
+		$count = wp_count_comments($post_id);
 		return array(
 			'approved' => $count->approved,
 			'awaiting_moderation' => $count->moderated,
@@ -3598,20 +3598,20 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPostStatusList( $args ) {
-		$this->escape( $args );
+	public function wp_getPostStatusList($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(403, __('You are not allowed access to details about this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
+		do_action('xmlrpc_call', 'wp.getPostStatusList');
 
 		return get_post_statuses();
 	}
@@ -3630,20 +3630,20 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPageStatusList( $args ) {
-		$this->escape( $args );
+	public function wp_getPageStatusList($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can('edit_pages'))
+			return new IXR_Error(403, __('You are not allowed access to details about this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
+		do_action('xmlrpc_call', 'wp.getPageStatusList');
 
 		return get_page_statuses();
 	}
@@ -3662,17 +3662,17 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPageTemplates( $args ) {
-		$this->escape( $args );
+	public function wp_getPageTemplates($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can('edit_pages'))
+			return new IXR_Error(403, __('You are not allowed access to details about this site.'));
 
 		$templates = get_page_templates();
 		$templates['Default'] = 'default';
@@ -3695,18 +3695,18 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getOptions( $args ) {
-		$this->escape( $args );
+	public function wp_getOptions($args) {
+		$this->escape($args);
 
 		$username	= $args[1];
 		$password	= $args[2];
-		$options	= isset( $args[3] ) ? (array) $args[3] : array();
+		$options = isset($args[3]) ? (array) $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		// If no specific options where asked for, return all of them
-		if ( count( $options ) == 0 )
+		if (count($options) == 0)
 			$options = array_keys($this->blog_options);
 
 		return $this->_getOptions($options);
@@ -3722,17 +3722,17 @@ 
 	 */
 	public function _getOptions($options) {
 		$data = array();
-		$can_manage = current_user_can( 'manage_options' );
-		foreach ( $options as $option ) {
-			if ( array_key_exists( $option, $this->blog_options ) ) {
+		$can_manage = current_user_can('manage_options');
+		foreach ($options as $option) {
+			if (array_key_exists($option, $this->blog_options)) {
 				$data[$option] = $this->blog_options[$option];
 				//Is the value static or dynamic?
-				if ( isset( $data[$option]['option'] ) ) {
-					$data[$option]['value'] = get_option( $data[$option]['option'] );
+				if (isset($data[$option]['option'])) {
+					$data[$option]['value'] = get_option($data[$option]['option']);
 					unset($data[$option]['option']);
 				}
 
-				if ( ! $can_manage )
+				if ( ! $can_manage)
 					$data[$option]['readonly'] = true;
 			}
 		}
@@ -3755,29 +3755,29 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_setOptions( $args ) {
-		$this->escape( $args );
+	public function wp_setOptions($args) {
+		$this->escape($args);
 
 		$username	= $args[1];
 		$password	= $args[2];
-		$options	= (array) $args[3];
+		$options = (array) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'manage_options' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
+		if ( ! current_user_can('manage_options'))
+			return new IXR_Error(403, __('You are not allowed to update options.'));
 
 		$option_names = array();
-		foreach ( $options as $o_name => $o_value ) {
+		foreach ($options as $o_name => $o_value) {
 			$option_names[] = $o_name;
-			if ( !array_key_exists( $o_name, $this->blog_options ) )
+			if ( ! array_key_exists($o_name, $this->blog_options))
 				continue;
 
-			if ( $this->blog_options[$o_name]['readonly'] == true )
+			if ($this->blog_options[$o_name]['readonly'] == true)
 				continue;
 
-			update_option( $this->blog_options[$o_name]['option'], wp_unslash( $o_value ) );
+			update_option($this->blog_options[$o_name]['option'], wp_unslash($o_value));
 		}
 
 		//Now return the updated values
@@ -3807,26 +3807,26 @@ 
 	 *  - 'description'
 	 *  - 'metadata'
 	 */
-	public function wp_getMediaItem( $args ) {
-		$this->escape( $args );
+	public function wp_getMediaItem($args) {
+		$this->escape($args);
 
 		$username		= $args[1];
 		$password		= $args[2];
-		$attachment_id	= (int) $args[3];
+		$attachment_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
+		if ( ! current_user_can('upload_files'))
+			return new IXR_Error(403, __('You do not have permission to upload files.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getMediaItem' );
+		do_action('xmlrpc_call', 'wp.getMediaItem');
 
-		if ( ! $attachment = get_post($attachment_id) )
-			return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+		if ( ! $attachment = get_post($attachment_id))
+			return new IXR_Error(404, __('Invalid attachment ID.'));
 
-		return $this->_prepare_media_item( $attachment );
+		return $this->_prepare_media_item($attachment);
 	}
 
 	/**
@@ -3860,28 +3860,28 @@ 
 
 		$username	= $args[1];
 		$password	= $args[2];
-		$struct		= isset( $args[3] ) ? $args[3] : array() ;
+		$struct = isset($args[3]) ? $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+		if ( ! current_user_can('upload_files'))
+			return new IXR_Error(401, __('You do not have permission to upload files.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getMediaLibrary' );
+		do_action('xmlrpc_call', 'wp.getMediaLibrary');
 
-		$parent_id = ( isset($struct['parent_id']) ) ? absint($struct['parent_id']) : '' ;
-		$mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : '' ;
-		$offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ;
-		$number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
+		$parent_id = (isset($struct['parent_id'])) ? absint($struct['parent_id']) : '';
+		$mime_type = (isset($struct['mime_type'])) ? $struct['mime_type'] : '';
+		$offset = (isset($struct['offset'])) ? absint($struct['offset']) : 0;
+		$number = (isset($struct['number'])) ? absint($struct['number']) : -1;
 
-		$attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
+		$attachments = get_posts(array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type));
 
 		$attachments_struct = array();
 
-		foreach ($attachments as $attachment )
-			$attachments_struct[] = $this->_prepare_media_item( $attachment );
+		foreach ($attachments as $attachment)
+			$attachments_struct[] = $this->_prepare_media_item($attachment);
 
 		return $attachments_struct;
 	}
@@ -3900,28 +3900,28 @@ 
 	 * }
 	 * @return array|IXR_Error List of post formats, otherwise IXR_Error object.
 	 */
-	public function wp_getPostFormats( $args ) {
-		$this->escape( $args );
+	public function wp_getPostFormats($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(403, __('You are not allowed access to details about this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostFormats' );
+		do_action('xmlrpc_call', 'wp.getPostFormats');
 
 		$formats = get_post_format_strings();
 
 		// find out if they want a list of currently supports formats
-		if ( isset( $args[3] ) && is_array( $args[3] ) ) {
-			if ( $args[3]['show-supported'] ) {
-				if ( current_theme_supports( 'post-formats' ) ) {
-					$supported = get_theme_support( 'post-formats' );
+		if (isset($args[3]) && is_array($args[3])) {
+			if ($args[3]['show-supported']) {
+				if (current_theme_supports('post-formats')) {
+					$supported = get_theme_support('post-formats');
 
 					$data = array();
 					$data['all'] = $formats;
@@ -3962,17 +3962,17 @@ 
 	 *  - 'taxonomies'
 	 *  - 'supports'
 	 */
-	public function wp_getPostType( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getPostType($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$post_type_name = $args[3];
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/**
@@ -3983,24 +3983,24 @@ 
 			 * @param array  $fields An array of post type query fields for the given method.
 			 * @param string $method The method name.
 			 */
-			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
+			$fields = apply_filters('xmlrpc_default_posttype_fields', array('labels', 'cap', 'taxonomies'), 'wp.getPostType');
 		}
 
-		if ( !$user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostType' );
+		do_action('xmlrpc_call', 'wp.getPostType');
 
-		if ( ! post_type_exists( $post_type_name ) )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+		if ( ! post_type_exists($post_type_name))
+			return new IXR_Error(403, __('Invalid post type'));
 
-		$post_type = get_post_type_object( $post_type_name );
+		$post_type = get_post_type_object($post_type_name);
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
+		if ( ! current_user_can($post_type->cap->edit_posts))
+			return new IXR_Error(401, __('Sorry, you are not allowed to edit this post type.'));
 
-		return $this->_prepare_post_type( $post_type, $fields );
+		return $this->_prepare_post_type($post_type, $fields);
 	}
 
 	/**
@@ -4021,38 +4021,38 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPostTypes( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_getPostTypes($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		$filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+		$filter   = isset($args[3]) ? $args[3] : array('public' => true);
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostTypes' );
+			$fields = apply_filters('xmlrpc_default_posttype_fields', array('labels', 'cap', 'taxonomies'), 'wp.getPostTypes');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostTypes' );
+		do_action('xmlrpc_call', 'wp.getPostTypes');
 
-		$post_types = get_post_types( $filter, 'objects' );
+		$post_types = get_post_types($filter, 'objects');
 
 		$struct = array();
 
-		foreach( $post_types as $post_type ) {
-			if ( ! current_user_can( $post_type->cap->edit_posts ) )
+		foreach ($post_types as $post_type) {
+			if ( ! current_user_can($post_type->cap->edit_posts))
 				continue;
 
-			$struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
+			$struct[$post_type->name] = $this->_prepare_post_type($post_type, $fields);
 		}
 
 		return $struct;
@@ -4080,17 +4080,17 @@ 
 	 * }
 	 * @return array|IXR_Error contains a collection of posts.
 	 */
-	public function wp_getRevisions( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+	public function wp_getRevisions($args) {
+		if ( ! $this->minimum_args($args, 4))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 		$post_id  = (int) $args[3];
 
-		if ( isset( $args[4] ) ) {
+		if (isset($args[4])) {
 			$fields = $args[4];
 		} else {
 			/**
@@ -4101,41 +4101,41 @@ 
 			 * @param array  $field  An array of revision query fields.
 			 * @param string $method The method name.
 			 */
-			$fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
+			$fields = apply_filters('xmlrpc_default_revision_fields', array('post_date', 'post_date_gmt'), 'wp.getRevisions');
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getRevisions' );
+		do_action('xmlrpc_call', 'wp.getRevisions');
 
-		if ( ! $post = get_post( $post_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post = get_post($post_id))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		if ( ! current_user_can('edit_post', $post_id))
+			return new IXR_Error(401, __('Sorry, you are not allowed to edit posts.'));
 
 		// Check if revisions are enabled.
-		if ( ! wp_revisions_enabled( $post ) )
-			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		if ( ! wp_revisions_enabled($post))
+			return new IXR_Error(401, __('Sorry, revisions are disabled.'));
 
-		$revisions = wp_get_post_revisions( $post_id );
+		$revisions = wp_get_post_revisions($post_id);
 
-		if ( ! $revisions )
+		if ( ! $revisions)
 			return array();
 
 		$struct = array();
 
-		foreach ( $revisions as $revision ) {
-			if ( ! current_user_can( 'read_post', $revision->ID ) )
+		foreach ($revisions as $revision) {
+			if ( ! current_user_can('read_post', $revision->ID))
 				continue;
 
 			// Skip autosaves
-			if ( wp_is_post_autosave( $revision ) )
+			if (wp_is_post_autosave($revision))
 				continue;
 
-			$struct[] = $this->_prepare_post( get_object_vars( $revision ), $fields );
+			$struct[] = $this->_prepare_post(get_object_vars($revision), $fields);
 		}
 
 		return $struct;
@@ -4158,39 +4158,39 @@ 
 	 * }
 	 * @return bool|IXR_Error false if there was an error restoring, true if success.
 	 */
-	public function wp_restoreRevision( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+	public function wp_restoreRevision($args) {
+		if ( ! $this->minimum_args($args, 3))
 			return $this->error;
 
-		$this->escape( $args );
+		$this->escape($args);
 
 		$username    = $args[1];
 		$password    = $args[2];
 		$revision_id = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.restoreRevision' );
+		do_action('xmlrpc_call', 'wp.restoreRevision');
 
-		if ( ! $revision = wp_get_post_revision( $revision_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $revision = wp_get_post_revision($revision_id))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( wp_is_post_autosave( $revision ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if (wp_is_post_autosave($revision))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! $post = get_post( $revision->post_parent ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post = get_post($revision->post_parent))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can('edit_post', $revision->post_parent))
+			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 
 		// Check if revisions are disabled.
-		if ( ! wp_revisions_enabled( $post ) )
-			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		if ( ! wp_revisions_enabled($post))
+			return new IXR_Error(401, __('Sorry, revisions are disabled.'));
 
-		$post = wp_restore_post_revision( $revision_id );
+		$post = wp_restore_post_revision($revision_id);
 
 		return (bool) $post;
 	}
@@ -4216,7 +4216,7 @@ 
 	 * @return array|IXR_Error
 	 */
 	public function blogger_getUsersBlogs($args) {
-		if ( is_multisite() )
+		if (is_multisite())
 			return $this->_multisite_getUsersBlogs($args);
 
 		$this->escape($args);
@@ -4224,20 +4224,20 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
+		do_action('xmlrpc_call', 'blogger.getUsersBlogs');
 
 		$is_admin = current_user_can('manage_options');
 
 		$struct = array(
 			'isAdmin'  => $is_admin,
-			'url'      => get_option('home') . '/',
+			'url'      => get_option('home').'/',
 			'blogid'   => '1',
 			'blogName' => get_option('blogname'),
-			'xmlrpc'   => site_url( 'xmlrpc.php', 'rpc' ),
+			'xmlrpc'   => site_url('xmlrpc.php', 'rpc'),
 		);
 
 		return array($struct);
@@ -4254,20 +4254,20 @@ 
 		$current_blog = get_blog_details();
 
 		$domain = $current_blog->domain;
-		$path = $current_blog->path . 'xmlrpc.php';
+		$path = $current_blog->path.'xmlrpc.php';
 
-		$rpc = new IXR_Client( set_url_scheme( "http://{$domain}{$path}" ) );
+		$rpc = new IXR_Client(set_url_scheme("http://{$domain}{$path}"));
 		$rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
 		$blogs = $rpc->getResponse();
 
-		if ( isset($blogs['faultCode']) )
+		if (isset($blogs['faultCode']))
 			return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
 
-		if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
+		if ($_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path) {
 			return $blogs;
 		} else {
-			foreach ( (array) $blogs as $blog ) {
-				if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) )
+			foreach ((array) $blogs as $blog) {
+				if (strpos($blog['url'], $_SERVER['HTTP_HOST']))
 					return array($blog);
 			}
 			return array();
@@ -4290,20 +4290,20 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function blogger_getUserInfo( $args ) {
-		$this->escape( $args );
+	public function blogger_getUserInfo($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you do not have access to user data on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
+		do_action('xmlrpc_call', 'blogger.getUserInfo');
 
 		$struct = array(
 			'nickname'  => $user->nickname,
@@ -4331,25 +4331,25 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function blogger_getPost( $args ) {
-		$this->escape( $args );
+	public function blogger_getPost($args) {
+		$this->escape($args);
 
 		$post_ID  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		$post_data = get_post($post_ID, ARRAY_A);
-		if ( ! $post_data )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post_data)
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_ID))
+			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.getPost' );
+		do_action('xmlrpc_call', 'blogger.getPost');
 
 		$categories = implode(',', wp_get_post_categories($post_ID));
 
@@ -4359,7 +4359,7 @@ 
 
 		$struct = array(
 			'userid'    => $post_data['post_author'],
-			'dateCreated' => $this->_convert_date( $post_data['post_date'] ),
+			'dateCreated' => $this->_convert_date($post_data['post_date']),
 			'content'     => $content,
 			'postid'  => (string) $post_data['ID']
 		);
@@ -4383,40 +4383,40 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function blogger_getRecentPosts( $args ) {
+	public function blogger_getRecentPosts($args) {
 
 		$this->escape($args);
 
 		// $args[0] = appkey - ignored
 		$username = $args[2];
 		$password = $args[3];
-		if ( isset( $args[4] ) )
-			$query = array( 'numberposts' => absint( $args[4] ) );
+		if (isset($args[4]))
+			$query = array('numberposts' => absint($args[4]));
 		else
 			$query = array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( ! current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you cannot edit posts on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.getRecentPosts' );
+		do_action('xmlrpc_call', 'blogger.getRecentPosts');
 
-		$posts_list = wp_get_recent_posts( $query );
+		$posts_list = wp_get_recent_posts($query);
 
-		if ( !$posts_list ) {
+		if ( ! $posts_list) {
 			$this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
 			return $this->error;
 		}
 
 		$recent_posts = array();
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+			if ( ! current_user_can('edit_post', $entry['ID']))
 				continue;
 
-			$post_date  = $this->_convert_date( $entry['post_date'] );
+			$post_date  = $this->_convert_date($entry['post_date']);
 			$categories = implode(',', wp_get_post_categories($entry['ID']));
 
 			$content  = '<title>'.wp_unslash($entry['post_title']).'</title>';
@@ -4442,7 +4442,7 @@ 
 	 * @return IXR_Error
 	 */
 	public function blogger_getTemplate($args) {
-		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+		return new IXR_Error(403, __('Sorry, that file cannot be edited.'));
 	}
 
 	/**
@@ -4453,7 +4453,7 @@ 
 	 * @return IXR_Error
 	 */
 	public function blogger_setTemplate($args) {
-		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+		return new IXR_Error(403, __('Sorry, that file cannot be edited.'));
 	}
 
 	/**
@@ -4473,22 +4473,22 @@ 
 	 * }
 	 * @return int|IXR_Error
 	 */
-	public function blogger_newPost( $args ) {
-		$this->escape( $args );
+	public function blogger_newPost($args) {
+		$this->escape($args);
 
 		$username = $args[2];
 		$password = $args[3];
 		$content  = $args[4];
 		$publish  = $args[5];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.newPost' );
+		do_action('xmlrpc_call', 'blogger.newPost');
 
 		$cap = ($publish) ? 'publish_posts' : 'edit_posts';
-		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
+		if ( ! current_user_can(get_post_type_object('post')->cap->create_posts) || ! current_user_can($cap))
 			return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
 
 		$post_status = ($publish) ? 'publish' : 'draft';
@@ -4505,13 +4505,13 @@ 
 		$post_data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
 
 		$post_ID = wp_insert_post($post_data);
-		if ( is_wp_error( $post_ID ) )
+		if (is_wp_error($post_ID))
 			return new IXR_Error(500, $post_ID->get_error_message());
 
-		if ( !$post_ID )
+		if ( ! $post_ID)
 			return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
 
-		$this->attach_uploads( $post_ID, $post_content );
+		$this->attach_uploads($post_ID, $post_content);
 
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC Blogger API.
@@ -4521,7 +4521,7 @@ 
 		 * @param int   $post_ID ID of the new post.
 		 * @param array $args    An array of new post arguments.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_newPost', $post_ID, $args );
+		do_action('xmlrpc_call_success_blogger_newPost', $post_ID, $args);
 
 		return $post_ID;
 	}
@@ -4542,7 +4542,7 @@ 
 	 * }
 	 * @return true|IXR_Error true when done.
 	 */
-	public function blogger_editPost( $args ) {
+	public function blogger_editPost($args) {
 
 		$this->escape($args);
 
@@ -4551,42 +4551,42 @@ 
 		$password = $args[3];
 		$content  = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) ) {
+		if ( ! $user = $this->login($username, $password)) {
 			return $this->error;
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.editPost' );
+		do_action('xmlrpc_call', 'blogger.editPost');
 
-		$actual_post = get_post( $post_ID, ARRAY_A );
+		$actual_post = get_post($post_ID, ARRAY_A);
 
-		if ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
-			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
+		if ( ! $actual_post || $actual_post['post_type'] != 'post') {
+			return new IXR_Error(404, __('Sorry, no such post.'));
 		}
 
 		$this->escape($actual_post);
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can('edit_post', $post_ID)) {
 			return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
 		}
-		if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+		if ('publish' == $actual_post['post_status'] && ! current_user_can('publish_posts')) {
+			return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
 		}
 
 		$postdata = array();
 		$postdata['ID'] = $actual_post['ID'];
-		$postdata['post_content'] = xmlrpc_removepostdata( $content );
-		$postdata['post_title'] = xmlrpc_getposttitle( $content );
-		$postdata['post_category'] = xmlrpc_getpostcategory( $content );
+		$postdata['post_content'] = xmlrpc_removepostdata($content);
+		$postdata['post_title'] = xmlrpc_getposttitle($content);
+		$postdata['post_category'] = xmlrpc_getpostcategory($content);
 		$postdata['post_status'] = $actual_post['post_status'];
 		$postdata['post_excerpt'] = $actual_post['post_excerpt'];
 
-		$result = wp_update_post( $postdata );
+		$result = wp_update_post($postdata);
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
 		}
-		$this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
+		$this->attach_uploads($actual_post['ID'], $postdata['post_content']);
 
 		/**
 		 * Fires after a post has been successfully updated via the XML-RPC Blogger API.
@@ -4596,7 +4596,7 @@ 
 		 * @param int   $post_ID ID of the updated post.
 		 * @param array $args    An array of arguments for the post to edit.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_editPost', $post_ID, $args );
+		do_action('xmlrpc_call_success_blogger_editPost', $post_ID, $args);
 
 		return true;
 	}
@@ -4616,30 +4616,30 @@ 
 	 * }
 	 * @return true|IXR_Error True when post is deleted.
 	 */
-	public function blogger_deletePost( $args ) {
-		$this->escape( $args );
+	public function blogger_deletePost($args) {
+		$this->escape($args);
 
 		$post_ID  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.deletePost' );
+		do_action('xmlrpc_call', 'blogger.deletePost');
 
-		$actual_post = get_post($post_ID,ARRAY_A);
+		$actual_post = get_post($post_ID, ARRAY_A);
 
-		if ( !$actual_post || $actual_post['post_type'] != 'post' )
+		if ( ! $actual_post || $actual_post['post_type'] != 'post')
 			return new IXR_Error(404, __('Sorry, no such post.'));
 
-		if ( !current_user_can('delete_post', $post_ID) )
+		if ( ! current_user_can('delete_post', $post_ID))
 			return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
 
 		$result = wp_delete_post($post_ID);
 
-		if ( !$result )
+		if ( ! $result)
 			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
 
 		/**
@@ -4650,7 +4650,7 @@ 
 		 * @param int   $post_ID ID of the deleted post.
 		 * @param array $args    An array of arguments to delete the post.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_deletePost', $post_ID, $args );
+		do_action('xmlrpc_call_success_blogger_deletePost', $post_ID, $args);
 
 		return true;
 	}
@@ -4703,111 +4703,111 @@ 
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
-		$publish        = isset( $args[4] ) ? $args[4] : 0;
+		$publish        = isset($args[4]) ? $args[4] : 0;
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
+		do_action('xmlrpc_call', 'metaWeblog.newPost');
 
 		$page_template = '';
-		if ( !empty( $content_struct['post_type'] ) ) {
-			if ( $content_struct['post_type'] == 'page' ) {
-				if ( $publish )
+		if ( ! empty($content_struct['post_type'])) {
+			if ($content_struct['post_type'] == 'page') {
+				if ($publish)
 					$cap  = 'publish_pages';
-				elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] )
+				elseif (isset($content_struct['page_status']) && 'publish' == $content_struct['page_status'])
 					$cap  = 'publish_pages';
 				else
 					$cap = 'edit_pages';
-				$error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
+				$error_message = __('Sorry, you are not allowed to publish pages on this site.');
 				$post_type = 'page';
-				if ( !empty( $content_struct['wp_page_template'] ) )
+				if ( ! empty($content_struct['wp_page_template']))
 					$page_template = $content_struct['wp_page_template'];
-			} elseif ( $content_struct['post_type'] == 'post' ) {
-				if ( $publish )
+			} elseif ($content_struct['post_type'] == 'post') {
+				if ($publish)
 					$cap  = 'publish_posts';
-				elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] )
+				elseif (isset($content_struct['post_status']) && 'publish' == $content_struct['post_status'])
 					$cap  = 'publish_posts';
 				else
 					$cap = 'edit_posts';
-				$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+				$error_message = __('Sorry, you are not allowed to publish posts on this site.');
 				$post_type = 'post';
 			} else {
 				// No other post_type values are allowed here
-				return new IXR_Error( 401, __( 'Invalid post type' ) );
+				return new IXR_Error(401, __('Invalid post type'));
 			}
 		} else {
-			if ( $publish )
+			if ($publish)
 				$cap  = 'publish_posts';
-			elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
+			elseif (isset($content_struct['post_status']) && 'publish' == $content_struct['post_status'])
 				$cap  = 'publish_posts';
 			else
 				$cap = 'edit_posts';
-			$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+			$error_message = __('Sorry, you are not allowed to publish posts on this site.');
 			$post_type = 'post';
 		}
 
-		if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
-		if ( !current_user_can( $cap ) )
-			return new IXR_Error( 401, $error_message );
+		if ( ! current_user_can(get_post_type_object($post_type)->cap->create_posts))
+			return new IXR_Error(401, __('Sorry, you are not allowed to publish posts on this site.'));
+		if ( ! current_user_can($cap))
+			return new IXR_Error(401, $error_message);
 
 		// Check for a valid post format if one was given
-		if ( isset( $content_struct['wp_post_format'] ) ) {
-			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
-			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-				return new IXR_Error( 404, __( 'Invalid post format' ) );
+		if (isset($content_struct['wp_post_format'])) {
+			$content_struct['wp_post_format'] = sanitize_key($content_struct['wp_post_format']);
+			if ( ! array_key_exists($content_struct['wp_post_format'], get_post_format_strings())) {
+				return new IXR_Error(404, __('Invalid post format'));
 			}
 		}
 
 		// Let WordPress generate the post_name (slug) unless
 		// one has been provided.
 		$post_name = "";
-		if ( isset($content_struct['wp_slug']) )
+		if (isset($content_struct['wp_slug']))
 			$post_name = $content_struct['wp_slug'];
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
+		if (isset($content_struct['wp_password']))
 			$post_password = $content_struct['wp_password'];
 
 		// Only set a post parent if one was provided.
-		if ( isset($content_struct['wp_page_parent_id']) )
+		if (isset($content_struct['wp_page_parent_id']))
 			$post_parent = $content_struct['wp_page_parent_id'];
 
 		// Only set the menu_order if it was provided.
-		if ( isset($content_struct['wp_page_order']) )
+		if (isset($content_struct['wp_page_order']))
 			$menu_order = $content_struct['wp_page_order'];
 
 		$post_author = $user->ID;
 
 		// If an author id was provided then use it instead.
-		if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
-			switch ( $post_type ) {
+		if (isset($content_struct['wp_author_id']) && ($user->ID != $content_struct['wp_author_id'])) {
+			switch ($post_type) {
 				case "post":
-					if ( !current_user_can( 'edit_others_posts' ) )
-						return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+					if ( ! current_user_can('edit_others_posts'))
+						return new IXR_Error(401, __('You are not allowed to create posts as this user.'));
 					break;
 				case "page":
-					if ( !current_user_can( 'edit_others_pages' ) )
-						return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
+					if ( ! current_user_can('edit_others_pages'))
+						return new IXR_Error(401, __('You are not allowed to create pages as this user.'));
 					break;
 				default:
-					return new IXR_Error( 401, __( 'Invalid post type' ) );
+					return new IXR_Error(401, __('Invalid post type'));
 			}
-			$author = get_userdata( $content_struct['wp_author_id'] );
-			if ( ! $author )
-				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			$author = get_userdata($content_struct['wp_author_id']);
+			if ( ! $author)
+				return new IXR_Error(404, __('Invalid author ID.'));
 			$post_author = $content_struct['wp_author_id'];
 		}
 
-		$post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
-		$post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
+		$post_title = isset($content_struct['title']) ? $content_struct['title'] : null;
+		$post_content = isset($content_struct['description']) ? $content_struct['description'] : null;
 
 		$post_status = $publish ? 'publish' : 'draft';
 
-		if ( isset( $content_struct["{$post_type}_status"] ) ) {
-			switch ( $content_struct["{$post_type}_status"] ) {
+		if (isset($content_struct["{$post_type}_status"])) {
+			switch ($content_struct["{$post_type}_status"]) {
 				case 'draft':
 				case 'pending':
 				case 'private':
@@ -4825,9 +4825,9 @@ 
 
 		$tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null;
 
-		if ( isset($content_struct['mt_allow_comments']) ) {
-			if ( !is_numeric($content_struct['mt_allow_comments']) ) {
-				switch ( $content_struct['mt_allow_comments'] ) {
+		if (isset($content_struct['mt_allow_comments'])) {
+			if ( ! is_numeric($content_struct['mt_allow_comments'])) {
+				switch ($content_struct['mt_allow_comments']) {
 					case 'closed':
 						$comment_status = 'closed';
 						break;
@@ -4835,11 +4835,11 @@ 
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_default_comment_status( $post_type );
+						$comment_status = get_default_comment_status($post_type);
 						break;
 				}
 			} else {
-				switch ( (int) $content_struct['mt_allow_comments'] ) {
+				switch ((int) $content_struct['mt_allow_comments']) {
 					case 0:
 					case 2:
 						$comment_status = 'closed';
@@ -4848,17 +4848,17 @@ 
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_default_comment_status( $post_type );
+						$comment_status = get_default_comment_status($post_type);
 						break;
 				}
 			}
 		} else {
-			$comment_status = get_default_comment_status( $post_type );
+			$comment_status = get_default_comment_status($post_type);
 		}
 
-		if ( isset($content_struct['mt_allow_pings']) ) {
-			if ( !is_numeric($content_struct['mt_allow_pings']) ) {
-				switch ( $content_struct['mt_allow_pings'] ) {
+		if (isset($content_struct['mt_allow_pings'])) {
+			if ( ! is_numeric($content_struct['mt_allow_pings'])) {
+				switch ($content_struct['mt_allow_pings']) {
 					case 'closed':
 						$ping_status = 'closed';
 						break;
@@ -4866,11 +4866,11 @@ 
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_default_comment_status( $post_type, 'pingback' );
+						$ping_status = get_default_comment_status($post_type, 'pingback');
 						break;
 				}
 			} else {
-				switch ( (int) $content_struct['mt_allow_pings'] ) {
+				switch ((int) $content_struct['mt_allow_pings']) {
 					case 0:
 						$ping_status = 'closed';
 						break;
@@ -4878,32 +4878,32 @@ 
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_default_comment_status( $post_type, 'pingback' );
+						$ping_status = get_default_comment_status($post_type, 'pingback');
 						break;
 				}
 			}
 		} else {
-			$ping_status = get_default_comment_status( $post_type, 'pingback' );
+			$ping_status = get_default_comment_status($post_type, 'pingback');
 		}
 
-		if ( $post_more )
-			$post_content = $post_content . '<!--more-->' . $post_more;
+		if ($post_more)
+			$post_content = $post_content.'<!--more-->'.$post_more;
 
 		$to_ping = null;
-		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+		if (isset($content_struct['mt_tb_ping_urls'])) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
+			if (is_array($to_ping))
 				$to_ping = implode(' ', $to_ping);
 		}
 
 		// Do some timestamp voodoo
-		if ( !empty( $content_struct['date_created_gmt'] ) )
+		if ( ! empty($content_struct['date_created_gmt']))
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
+			$dateCreated = rtrim($content_struct['date_created_gmt']->getIso(), 'Z').'Z';
+		elseif ( ! empty($content_struct['dateCreated']))
 			$dateCreated = $content_struct['dateCreated']->getIso();
 
-		if ( !empty( $dateCreated ) ) {
+		if ( ! empty($dateCreated)) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
 			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
 		} else {
@@ -4912,10 +4912,10 @@ 
 		}
 
 		$post_category = array();
-		if ( isset( $content_struct['categories'] ) ) {
+		if (isset($content_struct['categories'])) {
 			$catnames = $content_struct['categories'];
 
-			if ( is_array($catnames) ) {
+			if (is_array($catnames)) {
 				foreach ($catnames as $cat) {
 					$post_category[] = get_cat_ID($cat);
 				}
@@ -4924,44 +4924,44 @@ 
 
 		$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template');
 
-		$post_ID = $postdata['ID'] = get_default_post_to_edit( $post_type, true )->ID;
+		$post_ID = $postdata['ID'] = get_default_post_to_edit($post_type, true)->ID;
 
 		// Only posts can be sticky
-		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
+		if ($post_type == 'post' && isset($content_struct['sticky'])) {
 			$data = $postdata;
 			$data['sticky'] = $content_struct['sticky'];
-			$error = $this->_toggle_sticky( $data );
-			if ( $error ) {
+			$error = $this->_toggle_sticky($data);
+			if ($error) {
 				return $error;
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
+		if (isset($content_struct['custom_fields']))
 			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 
-		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
-			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
-				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+		if (isset ($content_struct['wp_post_thumbnail'])) {
+			if (set_post_thumbnail($post_ID, $content_struct['wp_post_thumbnail']) === false)
+				return new IXR_Error(404, __('Invalid attachment ID.'));
 
-			unset( $content_struct['wp_post_thumbnail'] );
+			unset($content_struct['wp_post_thumbnail']);
 		}
 
 		// Handle enclosures
 		$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
 		$this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
-		$this->attach_uploads( $post_ID, $post_content );
+		$this->attach_uploads($post_ID, $post_content);
 
 		// Handle post formats if assigned, value is validated earlier
 		// in this function
-		if ( isset( $content_struct['wp_post_format'] ) )
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		if (isset($content_struct['wp_post_format']))
+			set_post_format($post_ID, $content_struct['wp_post_format']);
 
-		$post_ID = wp_insert_post( $postdata, true );
-		if ( is_wp_error( $post_ID ) )
+		$post_ID = wp_insert_post($postdata, true);
+		if (is_wp_error($post_ID))
 			return new IXR_Error(500, $post_ID->get_error_message());
 
-		if ( !$post_ID )
+		if ( ! $post_ID)
 			return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
 
 		/**
@@ -4972,7 +4972,7 @@ 
 		 * @param int   $post_ID ID of the new post.
 		 * @param array $args    An array of arguments to create the new post.
 		 */
-		do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args );
+		do_action('xmlrpc_call_success_mw_newPost', $post_ID, $args);
 
 		return strval($post_ID);
 	}
@@ -4981,21 +4981,21 @@ 
 	 * @param integer $post_ID
 	 * @param array   $enclosure
 	 */
-	public function add_enclosure_if_new( $post_ID, $enclosure ) {
-		if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
-			$encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
+	public function add_enclosure_if_new($post_ID, $enclosure) {
+		if (is_array($enclosure) && isset($enclosure['url']) && isset($enclosure['length']) && isset($enclosure['type'])) {
+			$encstring = $enclosure['url']."\n".$enclosure['length']."\n".$enclosure['type']."\n";
 			$found = false;
-			if ( $enclosures = get_post_meta( $post_ID, 'enclosure' ) ) {
-				foreach ( $enclosures as $enc ) {
+			if ($enclosures = get_post_meta($post_ID, 'enclosure')) {
+				foreach ($enclosures as $enc) {
 					// This method used to omit the trailing new line. #23219
-					if ( rtrim( $enc, "\n" ) == rtrim( $encstring, "\n" ) ) {
+					if (rtrim($enc, "\n") == rtrim($encstring, "\n")) {
 						$found = true;
 						break;
 					}
 				}
 			}
-			if ( ! $found )
-				add_post_meta( $post_ID, 'enclosure', $encstring );
+			if ( ! $found)
+				add_post_meta($post_ID, 'enclosure', $encstring);
 		}
 	}
 
@@ -5009,15 +5009,15 @@ 
 	 * @param int $post_ID Post ID.
 	 * @param string $post_content Post Content for attachment.
 	 */
-	public function attach_uploads( $post_ID, $post_content ) {
+	public function attach_uploads($post_ID, $post_content) {
 		global $wpdb;
 
 		// find any unattached files
-		$attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
-		if ( is_array( $attachments ) ) {
-			foreach ( $attachments as $file ) {
-				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
-					$wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+		$attachments = $wpdb->get_results("SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'");
+		if (is_array($attachments)) {
+			foreach ($attachments as $file) {
+				if ( ! empty($file->guid) && strpos($post_content, $file->guid) !== false)
+					$wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID));
 			}
 		}
 	}
@@ -5038,46 +5038,46 @@ 
 	 * }
 	 * @return bool|IXR_Error True on success.
 	 */
-	public function mw_editPost( $args ) {
-		$this->escape( $args );
+	public function mw_editPost($args) {
+		$this->escape($args);
 
 		$post_ID        = (int) $args[0];
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
-		$publish        = isset( $args[4] ) ? $args[4] : 0;
+		$publish        = isset($args[4]) ? $args[4] : 0;
 
-		if ( ! $user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
+		do_action('xmlrpc_call', 'metaWeblog.editPost');
 
-		$postdata = get_post( $post_ID, ARRAY_A );
+		$postdata = get_post($post_ID, ARRAY_A);
 
 		/*
 		 * If there is no post data for the give post id, stop now and return an error.
 		 * Otherwise a new post will be created (which was the old behavior).
 		 */
-		if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata || empty($postdata['ID']))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_ID))
+			return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
 
 		// Use wp.editPost to edit post types other than post and page.
-		if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
-			return new IXR_Error( 401, __( 'Invalid post type' ) );
+		if ( ! in_array($postdata['post_type'], array('post', 'page')))
+			return new IXR_Error(401, __('Invalid post type'));
 
 		// Thwart attempt to change the post type.
-		if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) )
-			return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+		if ( ! empty($content_struct['post_type']) && ($content_struct['post_type'] != $postdata['post_type']))
+			return new IXR_Error(401, __('The post type may not be changed.'));
 
 		// Check for a valid post format if one was given
-		if ( isset( $content_struct['wp_post_format'] ) ) {
-			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
-			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-				return new IXR_Error( 404, __( 'Invalid post format' ) );
+		if (isset($content_struct['wp_post_format'])) {
+			$content_struct['wp_post_format'] = sanitize_key($content_struct['wp_post_format']);
+			if ( ! array_key_exists($content_struct['wp_post_format'], get_post_format_strings())) {
+				return new IXR_Error(404, __('Invalid post format'));
 			}
 		}
 
@@ -5094,53 +5094,53 @@ 
 
 		// Let WordPress manage slug if none was provided.
 		$post_name = $postdata['post_name'];
-		if ( isset($content_struct['wp_slug']) )
+		if (isset($content_struct['wp_slug']))
 			$post_name = $content_struct['wp_slug'];
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
+		if (isset($content_struct['wp_password']))
 			$post_password = $content_struct['wp_password'];
 
 		// Only set a post parent if one was given.
-		if ( isset($content_struct['wp_page_parent_id']) )
+		if (isset($content_struct['wp_page_parent_id']))
 			$post_parent = $content_struct['wp_page_parent_id'];
 
 		// Only set the menu_order if it was given.
-		if ( isset($content_struct['wp_page_order']) )
+		if (isset($content_struct['wp_page_order']))
 			$menu_order = $content_struct['wp_page_order'];
 
 		$page_template = null;
-		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
+		if ( ! empty($content_struct['wp_page_template']) && 'page' == $post_type)
 			$page_template = $content_struct['wp_page_template'];
 
 		$post_author = $postdata['post_author'];
 
 		// Only set the post_author if one is set.
-		if ( isset( $content_struct['wp_author_id'] ) ) {
+		if (isset($content_struct['wp_author_id'])) {
 			// Check permissions if attempting to switch author to or from another user.
-			if ( $user->ID != $content_struct['wp_author_id'] || $user->ID != $post_author ) {
-				switch ( $post_type ) {
+			if ($user->ID != $content_struct['wp_author_id'] || $user->ID != $post_author) {
+				switch ($post_type) {
 					case 'post':
-						if ( ! current_user_can( 'edit_others_posts' ) ) {
-							return new IXR_Error( 401, __( 'You are not allowed to change the post author as this user.' ) );
+						if ( ! current_user_can('edit_others_posts')) {
+							return new IXR_Error(401, __('You are not allowed to change the post author as this user.'));
 						}
 						break;
 					case 'page':
-						if ( ! current_user_can( 'edit_others_pages' ) ) {
-							return new IXR_Error( 401, __( 'You are not allowed to change the page author as this user.' ) );
+						if ( ! current_user_can('edit_others_pages')) {
+							return new IXR_Error(401, __('You are not allowed to change the page author as this user.'));
 						}
 						break;
 					default:
-						return new IXR_Error( 401, __( 'Invalid post type' ) );
+						return new IXR_Error(401, __('Invalid post type'));
 						break;
 				}
 				$post_author = $content_struct['wp_author_id'];
 			}
 		}
 
-		if ( isset($content_struct['mt_allow_comments']) ) {
-			if ( !is_numeric($content_struct['mt_allow_comments']) ) {
-				switch ( $content_struct['mt_allow_comments'] ) {
+		if (isset($content_struct['mt_allow_comments'])) {
+			if ( ! is_numeric($content_struct['mt_allow_comments'])) {
+				switch ($content_struct['mt_allow_comments']) {
 					case 'closed':
 						$comment_status = 'closed';
 						break;
@@ -5148,11 +5148,11 @@ 
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_default_comment_status( $post_type );
+						$comment_status = get_default_comment_status($post_type);
 						break;
 				}
 			} else {
-				switch ( (int) $content_struct['mt_allow_comments'] ) {
+				switch ((int) $content_struct['mt_allow_comments']) {
 					case 0:
 					case 2:
 						$comment_status = 'closed';
@@ -5161,15 +5161,15 @@ 
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_default_comment_status( $post_type );
+						$comment_status = get_default_comment_status($post_type);
 						break;
 				}
 			}
 		}
 
-		if ( isset($content_struct['mt_allow_pings']) ) {
-			if ( !is_numeric($content_struct['mt_allow_pings']) ) {
-				switch ( $content_struct['mt_allow_pings'] ) {
+		if (isset($content_struct['mt_allow_pings'])) {
+			if ( ! is_numeric($content_struct['mt_allow_pings'])) {
+				switch ($content_struct['mt_allow_pings']) {
 					case 'closed':
 						$ping_status = 'closed';
 						break;
@@ -5177,11 +5177,11 @@ 
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_default_comment_status( $post_type, 'pingback' );
+						$ping_status = get_default_comment_status($post_type, 'pingback');
 						break;
 				}
 			} else {
-				switch ( (int) $content_struct["mt_allow_pings"] ) {
+				switch ((int) $content_struct["mt_allow_pings"]) {
 					case 0:
 						$ping_status = 'closed';
 						break;
@@ -5189,36 +5189,36 @@ 
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_default_comment_status( $post_type, 'pingback' );
+						$ping_status = get_default_comment_status($post_type, 'pingback');
 						break;
 				}
 			}
 		}
 
-		if ( isset( $content_struct['title'] ) )
-			$post_title =  $content_struct['title'];
+		if (isset($content_struct['title']))
+			$post_title = $content_struct['title'];
 
-		if ( isset( $content_struct['description'] ) )
+		if (isset($content_struct['description']))
 			$post_content = $content_struct['description'];
 
 		$post_category = array();
-		if ( isset( $content_struct['categories'] ) ) {
+		if (isset($content_struct['categories'])) {
 			$catnames = $content_struct['categories'];
-			if ( is_array($catnames) ) {
+			if (is_array($catnames)) {
 				foreach ($catnames as $cat) {
 					$post_category[] = get_cat_ID($cat);
 				}
 			}
 		}
 
-		if ( isset( $content_struct['mt_excerpt'] ) )
-			$post_excerpt =  $content_struct['mt_excerpt'];
+		if (isset($content_struct['mt_excerpt']))
+			$post_excerpt = $content_struct['mt_excerpt'];
 
-		$post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
+		$post_more = isset($content_struct['mt_text_more']) ? $content_struct['mt_text_more'] : null;
 
 		$post_status = $publish ? 'publish' : 'draft';
-		if ( isset( $content_struct["{$post_type}_status"] ) ) {
-			switch( $content_struct["{$post_type}_status"] ) {
+		if (isset($content_struct["{$post_type}_status"])) {
+			switch ($content_struct["{$post_type}_status"]) {
 				case 'draft':
 				case 'pending':
 				case 'private':
@@ -5231,34 +5231,34 @@ 
 			}
 		}
 
-		$tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
+		$tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null;
 
-		if ( ('publish' == $post_status) ) {
-			if ( ( 'page' == $post_type ) && ! current_user_can( 'publish_pages' ) ) {
-				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
-			} elseif ( ! current_user_can( 'publish_posts' ) ) {
-				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+		if (('publish' == $post_status)) {
+			if (('page' == $post_type) && ! current_user_can('publish_pages')) {
+				return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
+			} elseif ( ! current_user_can('publish_posts')) {
+				return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
 			}
 		}
 
-		if ( $post_more )
-			$post_content = $post_content . "<!--more-->" . $post_more;
+		if ($post_more)
+			$post_content = $post_content."<!--more-->".$post_more;
 
 		$to_ping = null;
-		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+		if (isset($content_struct['mt_tb_ping_urls'])) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
+			if (is_array($to_ping))
 				$to_ping = implode(' ', $to_ping);
 		}
 
 		// Do some timestamp voodoo.
-		if ( !empty( $content_struct['date_created_gmt'] ) )
+		if ( ! empty($content_struct['date_created_gmt']))
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
+			$dateCreated = rtrim($content_struct['date_created_gmt']->getIso(), 'Z').'Z';
+		elseif ( ! empty($content_struct['dateCreated']))
 			$dateCreated = $content_struct['dateCreated']->getIso();
 
-		if ( !empty( $dateCreated ) ) {
+		if ( ! empty($dateCreated)) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
 			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
 		} else {
@@ -5270,47 +5270,47 @@ 
 		$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
 
 		$result = wp_update_post($newpost, true);
-		if ( is_wp_error( $result ) )
+		if (is_wp_error($result))
 			return new IXR_Error(500, $result->get_error_message());
 
-		if ( !$result )
+		if ( ! $result)
 			return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
 
 		// Only posts can be sticky
-		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
+		if ($post_type == 'post' && isset($content_struct['sticky'])) {
 			$data = $newpost;
 			$data['sticky'] = $content_struct['sticky'];
 			$data['post_type'] = 'post';
-			$error = $this->_toggle_sticky( $data, true );
-			if ( $error ) {
+			$error = $this->_toggle_sticky($data, true);
+			if ($error) {
 				return $error;
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
+		if (isset($content_struct['custom_fields']))
 			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 
-		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
+		if (isset ($content_struct['wp_post_thumbnail'])) {
 
 			// Empty value deletes, non-empty value adds/updates.
-			if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
-				delete_post_thumbnail( $post_ID );
+			if (empty($content_struct['wp_post_thumbnail'])) {
+				delete_post_thumbnail($post_ID);
 			} else {
-				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
-					return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+				if (set_post_thumbnail($post_ID, $content_struct['wp_post_thumbnail']) === false)
+					return new IXR_Error(404, __('Invalid attachment ID.'));
 			}
-			unset( $content_struct['wp_post_thumbnail'] );
+			unset($content_struct['wp_post_thumbnail']);
 		}
 
 		// Handle enclosures.
 		$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
 		$this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
-		$this->attach_uploads( $ID, $post_content );
+		$this->attach_uploads($ID, $post_content);
 
 		// Handle post formats if assigned, validation is handled earlier in this function.
-		if ( isset( $content_struct['wp_post_format'] ) )
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		if (isset($content_struct['wp_post_format']))
+			set_post_format($post_ID, $content_struct['wp_post_format']);
 
 		/**
 		 * Fires after a post has been successfully updated via the XML-RPC MovableType API.
@@ -5320,7 +5320,7 @@ 
 		 * @param int   $post_ID ID of the updated post.
 		 * @param array $args    An array of arguments to update the post.
 		 */
-		do_action( 'xmlrpc_call_success_mw_editPost', $post_ID, $args );
+		do_action('xmlrpc_call_success_mw_editPost', $post_ID, $args);
 
 		return true;
 	}
@@ -5340,43 +5340,43 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_getPost( $args ) {
-		$this->escape( $args );
+	public function mw_getPost($args) {
+		$this->escape($args);
 
 		$post_ID  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata)
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_ID))
+			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
+		do_action('xmlrpc_call', 'metaWeblog.getPost');
 
 		if ($postdata['post_date'] != '') {
-			$post_date = $this->_convert_date( $postdata['post_date'] );
-			$post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'],  $postdata['post_date'] );
-			$post_modified = $this->_convert_date( $postdata['post_modified'] );
-			$post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
+			$post_date = $this->_convert_date($postdata['post_date']);
+			$post_date_gmt = $this->_convert_date_gmt($postdata['post_date_gmt'], $postdata['post_date']);
+			$post_modified = $this->_convert_date($postdata['post_modified']);
+			$post_modified_gmt = $this->_convert_date_gmt($postdata['post_modified_gmt'], $postdata['post_modified']);
 
 			$categories = array();
 			$catids = wp_get_post_categories($post_ID);
-			foreach($catids as $catid)
+			foreach ($catids as $catid)
 				$categories[] = get_cat_name($catid);
 
 			$tagnames = array();
-			$tags = wp_get_post_tags( $post_ID );
-			if ( !empty( $tags ) ) {
-				foreach ( $tags as $tag )
+			$tags = wp_get_post_tags($post_ID);
+			if ( ! empty($tags)) {
+				foreach ($tags as $tag)
 					$tagnames[] = $tag->name;
-				$tagnames = implode( ', ', $tagnames );
+				$tagnames = implode(', ', $tagnames);
 			} else {
 				$tagnames = '';
 			}
@@ -5391,22 +5391,22 @@ 
 			$allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $postdata['post_status'] === 'future' )
+			if ($postdata['post_status'] === 'future')
 				$postdata['post_status'] = 'publish';
 
 			// Get post format
-			$post_format = get_post_format( $post_ID );
-			if ( empty( $post_format ) )
+			$post_format = get_post_format($post_ID);
+			if (empty($post_format))
 				$post_format = 'standard';
 
 			$sticky = false;
-			if ( is_sticky( $post_ID ) )
+			if (is_sticky($post_ID))
 				$sticky = true;
 
 			$enclosure = array();
-			foreach ( (array) get_post_custom($post_ID) as $key => $val) {
+			foreach ((array) get_post_custom($post_ID) as $key => $val) {
 				if ($key == 'enclosure') {
-					foreach ( (array) $val as $enc ) {
+					foreach ((array) $val as $enc) {
 						$encdata = explode("\n", $enc);
 						$enclosure['url'] = trim(htmlspecialchars($encdata[0]));
 						$enclosure['length'] = (int) trim($encdata[1]);
@@ -5446,9 +5446,9 @@ 
 				'date_modified_gmt' => $post_modified_gmt
 			);
 
-			if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure;
+			if ( ! empty($enclosure)) $resp['enclosure'] = $enclosure;
 
-			$resp['wp_post_thumbnail'] = get_post_thumbnail_id( $postdata['ID'] );
+			$resp['wp_post_thumbnail'] = get_post_thumbnail_id($postdata['ID']);
 
 			return $resp;
 		} else {
@@ -5471,52 +5471,52 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_getRecentPosts( $args ) {
-		$this->escape( $args );
+	public function mw_getRecentPosts($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
-			$query = array( 'numberposts' => absint( $args[3] ) );
+		if (isset($args[3]))
+			$query = array('numberposts' => absint($args[3]));
 		else
 			$query = array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( ! current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you cannot edit posts on this site.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts' );
+		do_action('xmlrpc_call', 'metaWeblog.getRecentPosts');
 
-		$posts_list = wp_get_recent_posts( $query );
+		$posts_list = wp_get_recent_posts($query);
 
-		if ( !$posts_list )
+		if ( ! $posts_list)
 			return array();
 
 		$recent_posts = array();
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+			if ( ! current_user_can('edit_post', $entry['ID']))
 				continue;
 
-			$post_date = $this->_convert_date( $entry['post_date'] );
-			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
-			$post_modified = $this->_convert_date( $entry['post_modified'] );
-			$post_modified_gmt = $this->_convert_date_gmt( $entry['post_modified_gmt'], $entry['post_modified'] );
+			$post_date = $this->_convert_date($entry['post_date']);
+			$post_date_gmt = $this->_convert_date_gmt($entry['post_date_gmt'], $entry['post_date']);
+			$post_modified = $this->_convert_date($entry['post_modified']);
+			$post_modified_gmt = $this->_convert_date_gmt($entry['post_modified_gmt'], $entry['post_modified']);
 
 			$categories = array();
 			$catids = wp_get_post_categories($entry['ID']);
-			foreach( $catids as $catid )
+			foreach ($catids as $catid)
 				$categories[] = get_cat_name($catid);
 
 			$tagnames = array();
-			$tags = wp_get_post_tags( $entry['ID'] );
-			if ( !empty( $tags ) ) {
-				foreach ( $tags as $tag ) {
+			$tags = wp_get_post_tags($entry['ID']);
+			if ( ! empty($tags)) {
+				foreach ($tags as $tag) {
 					$tagnames[] = $tag->name;
 				}
-				$tagnames = implode( ', ', $tagnames );
+				$tagnames = implode(', ', $tagnames);
 			} else {
 				$tagnames = '';
 			}
@@ -5531,12 +5531,12 @@ 
 			$allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $entry['post_status'] === 'future' )
+			if ($entry['post_status'] === 'future')
 				$entry['post_status'] = 'publish';
 
 			// Get post format
-			$post_format = get_post_format( $entry['ID'] );
-			if ( empty( $post_format ) )
+			$post_format = get_post_format($entry['ID']);
+			if (empty($post_format))
 				$post_format = 'standard';
 
 			$recent_posts[] = array(
@@ -5566,8 +5566,8 @@ 
 				'wp_post_format' => $post_format,
 				'date_modified' => $post_modified,
 				'date_modified_gmt' => $post_modified_gmt,
-				'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
-				'wp_post_thumbnail' => get_post_thumbnail_id( $entry['ID'] )
+				'sticky' => ($entry['post_type'] === 'post' && is_sticky($entry['ID'])),
+				'wp_post_thumbnail' => get_post_thumbnail_id($entry['ID'])
 			);
 		}
 
@@ -5588,25 +5588,25 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_getCategories( $args ) {
-		$this->escape( $args );
+	public function mw_getCategories($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view categories.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.getCategories' );
+		do_action('xmlrpc_call', 'metaWeblog.getCategories');
 
 		$categories_struct = array();
 
-		if ( $cats = get_categories(array('get' => 'all')) ) {
-			foreach ( $cats as $cat ) {
+		if ($cats = get_categories(array('get' => 'all'))) {
+			foreach ($cats as $cat) {
 				$struct = array();
 				$struct['categoryId'] = $cat->term_id;
 				$struct['parentId'] = $cat->parent;
@@ -5644,25 +5644,25 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_newMediaObject( $args ) {
+	public function mw_newMediaObject($args) {
 		global $wpdb;
 
-		$username = $this->escape( $args[1] );
-		$password = $this->escape( $args[2] );
+		$username = $this->escape($args[1]);
+		$password = $this->escape($args[2]);
 		$data     = $args[3];
 
-		$name = sanitize_file_name( $data['name'] );
+		$name = sanitize_file_name($data['name']);
 		$type = $data['type'];
 		$bits = $data['bits'];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
+		do_action('xmlrpc_call', 'metaWeblog.newMediaObject');
 
-		if ( !current_user_can('upload_files') ) {
-			$this->error = new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+		if ( ! current_user_can('upload_files')) {
+			$this->error = new IXR_Error(401, __('You do not have permission to upload files.'));
 			return $this->error;
 		}
 
@@ -5676,11 +5676,11 @@ 
 		 *
 		 * @param bool $error Whether to pre-empt the media upload. Default false.
 		 */
-		if ( $upload_err = apply_filters( 'pre_upload_error', false ) ) {
-			return new IXR_Error( 500, $upload_err );
+		if ($upload_err = apply_filters('pre_upload_error', false)) {
+			return new IXR_Error(500, $upload_err);
 		}
 
-		if ( !empty($data['overwrite']) && ($data['overwrite'] == true) ) {
+		if ( ! empty($data['overwrite']) && ($data['overwrite'] == true)) {
 			// Get postmeta info on the object.
 			$old_file = $wpdb->get_row("
 				SELECT ID
@@ -5699,17 +5699,17 @@ 
 		}
 
 		$upload = wp_upload_bits($name, null, $bits);
-		if ( ! empty($upload['error']) ) {
+		if ( ! empty($upload['error'])) {
 			$errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
 			return new IXR_Error(500, $errorString);
 		}
 		// Construct the attachment array
 		$post_id = 0;
-		if ( ! empty( $data['post_id'] ) ) {
+		if ( ! empty($data['post_id'])) {
 			$post_id = (int) $data['post_id'];
 
-			if ( ! current_user_can( 'edit_post', $post_id ) )
-				return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+			if ( ! current_user_can('edit_post', $post_id))
+				return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 		}
 		$attachment = array(
 			'post_title' => $name,
@@ -5717,12 +5717,12 @@ 
 			'post_type' => 'attachment',
 			'post_parent' => $post_id,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ]
+			'guid' => $upload['url']
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $post_id);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 
 		/**
 		 * Fires after a new attachment has been added via the XML-RPC MovableType API.
@@ -5732,17 +5732,17 @@ 
 		 * @param int   $id   ID of the new attachment.
 		 * @param array $args An array of arguments to add the attachment.
 		 */
-		do_action( 'xmlrpc_call_success_mw_newMediaObject', $id, $args );
+		do_action('xmlrpc_call_success_mw_newMediaObject', $id, $args);
 
 		$struct = array(
-			'id'   => strval( $id ),
+			'id'   => strval($id),
 			'file' => $name,
-			'url'  => $upload[ 'url' ],
+			'url'  => $upload['url'],
 			'type' => $type
 		);
 
 		/** This filter is documented in wp-admin/includes/file.php */
-		return apply_filters( 'wp_handle_upload', $struct, 'upload' );
+		return apply_filters('wp_handle_upload', $struct, 'upload');
 	}
 
 	/* MovableType API functions
@@ -5764,25 +5764,25 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mt_getRecentPostTitles( $args ) {
-		$this->escape( $args );
+	public function mt_getRecentPostTitles($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
-			$query = array( 'numberposts' => absint( $args[3] ) );
+		if (isset($args[3]))
+			$query = array('numberposts' => absint($args[3]));
 		else
 			$query = array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles' );
+		do_action('xmlrpc_call', 'mt.getRecentPostTitles');
 
-		$posts_list = wp_get_recent_posts( $query );
+		$posts_list = wp_get_recent_posts($query);
 
-		if ( !$posts_list ) {
+		if ( ! $posts_list) {
 			$this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
 			return $this->error;
 		}
@@ -5790,11 +5790,11 @@ 
 		$recent_posts = array();
 
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+			if ( ! current_user_can('edit_post', $entry['ID']))
 				continue;
 
-			$post_date = $this->_convert_date( $entry['post_date'] );
-			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
+			$post_date = $this->_convert_date($entry['post_date']);
+			$post_date_gmt = $this->_convert_date_gmt($entry['post_date_gmt'], $entry['post_date']);
 
 			$recent_posts[] = array(
 				'dateCreated' => $post_date,
@@ -5823,25 +5823,25 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mt_getCategoryList( $args ) {
-		$this->escape( $args );
+	public function mt_getCategoryList($args) {
+		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( ! current_user_can('edit_posts'))
+			return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view categories.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getCategoryList' );
+		do_action('xmlrpc_call', 'mt.getCategoryList');
 
 		$categories_struct = array();
 
-		if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
-			foreach ( $cats as $cat ) {
+		if ($cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0))) {
+			foreach ($cats as $cat) {
 				$struct = array();
 				$struct['categoryId'] = $cat->term_id;
 				$struct['categoryName'] = $cat->name;
@@ -5867,30 +5867,30 @@ 
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mt_getPostCategories( $args ) {
-		$this->escape( $args );
+	public function mt_getPostCategories($args) {
+		$this->escape($args);
 
 		$post_ID  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
-		if ( ! get_post( $post_ID ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post($post_ID))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_ID))
+			return new IXR_Error(401, __('Sorry, you can not edit this post.'));
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getPostCategories' );
+		do_action('xmlrpc_call', 'mt.getPostCategories');
 
 		$categories = array();
 		$catids = wp_get_post_categories(intval($post_ID));
 		// first listed category will be the primary category
 		$isPrimary = true;
-		foreach ( $catids as $catid ) {
+		foreach ($catids as $catid) {
 			$categories[] = array(
 				'categoryName' => get_cat_name($catid),
 				'categoryId' => (string) $catid,
@@ -5917,28 +5917,28 @@ 
 	 * }
 	 * @return true|IXR_Error True on success.
 	 */
-	public function mt_setPostCategories( $args ) {
-		$this->escape( $args );
+	public function mt_setPostCategories($args) {
+		$this->escape($args);
 
 		$post_ID    = (int) $args[0];
 		$username   = $args[1];
 		$password   = $args[2];
 		$categories = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.setPostCategories' );
+		do_action('xmlrpc_call', 'mt.setPostCategories');
 
-		if ( ! get_post( $post_ID ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post($post_ID))
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can('edit_post', $post_ID) )
+		if ( ! current_user_can('edit_post', $post_ID))
 			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 
 		$catids = array();
-		foreach ( $categories as $cat ) {
+		foreach ($categories as $cat) {
 			$catids[] = $cat['categoryId'];
 		}
 
@@ -5956,9 +5956,9 @@ 
 	 */
 	public function mt_supportedMethods() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.supportedMethods' );
+		do_action('xmlrpc_call', 'mt.supportedMethods');
 
-		return array_keys( $this->methods );
+		return array_keys($this->methods);
 	}
 
 	/**
@@ -5968,7 +5968,7 @@ 
 	 */
 	public function mt_supportedTextFilters() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.supportedTextFilters' );
+		do_action('xmlrpc_call', 'mt.supportedTextFilters');
 
 		/**
 		 * Filter the MoveableType text filters list for XML-RPC.
@@ -5977,7 +5977,7 @@ 
 		 *
 		 * @param array $filters An array of text filters.
 		 */
-		return apply_filters( 'xmlrpc_text_filters', array() );
+		return apply_filters('xmlrpc_text_filters', array());
 	}
 
 	/**
@@ -5990,25 +5990,25 @@ 
 	 * @param int $post_ID
 	 * @return array|IXR_Error
 	 */
-	public function mt_getTrackbackPings( $post_ID ) {
+	public function mt_getTrackbackPings($post_ID) {
 		global $wpdb;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
+		do_action('xmlrpc_call', 'mt.getTrackbackPings');
 
 		$actual_post = get_post($post_ID, ARRAY_A);
 
-		if ( !$actual_post )
+		if ( ! $actual_post)
 			return new IXR_Error(404, __('Sorry, no such post.'));
 
-		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+		$comments = $wpdb->get_results($wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID));
 
-		if ( !$comments )
+		if ( ! $comments)
 			return array();
 
 		$trackback_pings = array();
-		foreach ( $comments as $comment ) {
-			if ( 'trackback' == $comment->comment_type ) {
+		foreach ($comments as $comment) {
+			if ('trackback' == $comment->comment_type) {
 				$content = $comment->comment_content;
 				$title = substr($content, 8, (strpos($content, '</strong>') - 8));
 				$trackback_pings[] = array(
@@ -6036,24 +6036,24 @@ 
 	 * }
 	 * @return int|IXR_Error
 	 */
-	public function mt_publishPost( $args ) {
-		$this->escape( $args );
+	public function mt_publishPost($args) {
+		$this->escape($args);
 
 		$post_ID  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login($username, $password))
 			return $this->error;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.publishPost' );
+		do_action('xmlrpc_call', 'mt.publishPost');
 
 		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata)
+			return new IXR_Error(404, __('Invalid post ID.'));
 
-		if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
+		if ( ! current_user_can('publish_posts') || ! current_user_can('edit_post', $post_ID))
 			return new IXR_Error(401, __('Sorry, you cannot publish this post.'));
 
 		$postdata['post_status'] = 'publish';
@@ -6063,7 +6063,7 @@ 
 		$postdata['post_category'] = $cats;
 		$this->escape($postdata);
 
-		return wp_update_post( $postdata );
+		return wp_update_post($postdata);
 	}
 
 	/* PingBack functions
@@ -6086,17 +6086,17 @@ 
 	 * }
 	 * @return string|IXR_Error
 	 */
-	public function pingback_ping( $args ) {
+	public function pingback_ping($args) {
 		global $wpdb, $wp_version;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'pingback.ping' );
+		do_action('xmlrpc_call', 'pingback.ping');
 
-		$this->escape( $args );
+		$this->escape($args);
 
-		$pagelinkedfrom = str_replace( '&amp;', '&', $args[0] );
-		$pagelinkedto = str_replace( '&amp;', '&', $args[1] );
-		$pagelinkedto = str_replace( '&', '&amp;', $pagelinkedto );
+		$pagelinkedfrom = str_replace('&amp;', '&', $args[0]);
+		$pagelinkedto = str_replace('&amp;', '&', $args[1]);
+		$pagelinkedto = str_replace('&', '&amp;', $pagelinkedto);
 
 		/**
 		 * Filter the pingback source URI.
@@ -6106,76 +6106,76 @@ 
 		 * @param string $pagelinkedfrom URI of the page linked from.
 		 * @param string $pagelinkedto   URI of the page linked to.
 		 */
-		$pagelinkedfrom = apply_filters( 'pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto );
+		$pagelinkedfrom = apply_filters('pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto);
 
-		if ( ! $pagelinkedfrom )
-			return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
+		if ( ! $pagelinkedfrom)
+			return $this->pingback_error(0, __('A valid URL was not provided.'));
 
 		// Check if the page linked to is in our site
-		$pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
-		if ( !$pos1 )
-			return $this->pingback_error( 0, __( 'Is there no link to us?' ) );
+		$pos1 = strpos($pagelinkedto, str_replace(array('http://www.', 'http://', 'https://www.', 'https://'), '', get_option('home')));
+		if ( ! $pos1)
+			return $this->pingback_error(0, __('Is there no link to us?'));
 
 		// let's find which post is linked to
 		// FIXME: does url_to_postid() cover all these cases already?
 		//        if so, then let's use it and drop the old code.
 		$urltest = parse_url($pagelinkedto);
-		if ( $post_ID = url_to_postid($pagelinkedto) ) {
+		if ($post_ID = url_to_postid($pagelinkedto)) {
 			// $way
-		} elseif ( isset( $urltest['path'] ) && preg_match('#p/[0-9]{1,}#', $urltest['path'], $match) ) {
+		} elseif (isset($urltest['path']) && preg_match('#p/[0-9]{1,}#', $urltest['path'], $match)) {
 			// the path defines the post_ID (archives/p/XXXX)
 			$blah = explode('/', $match[0]);
 			$post_ID = (int) $blah[1];
-		} elseif ( isset( $urltest['query'] ) && preg_match('#p=[0-9]{1,}#', $urltest['query'], $match) ) {
+		} elseif (isset($urltest['query']) && preg_match('#p=[0-9]{1,}#', $urltest['query'], $match)) {
 			// the querystring defines the post_ID (?p=XXXX)
 			$blah = explode('=', $match[0]);
 			$post_ID = (int) $blah[1];
-		} elseif ( isset($urltest['fragment']) ) {
+		} elseif (isset($urltest['fragment'])) {
 			// an #anchor is there, it's either...
-			if ( intval($urltest['fragment']) ) {
+			if (intval($urltest['fragment'])) {
 				// ...an integer #XXXX (simplest case)
 				$post_ID = (int) $urltest['fragment'];
-			} elseif ( preg_match('/post-[0-9]+/',$urltest['fragment']) ) {
+			} elseif (preg_match('/post-[0-9]+/', $urltest['fragment'])) {
 				// ...a post id in the form 'post-###'
 				$post_ID = preg_replace('/[^0-9]+/', '', $urltest['fragment']);
-			} elseif ( is_string($urltest['fragment']) ) {
+			} elseif (is_string($urltest['fragment'])) {
 				// ...or a string #title, a little more complicated
 				$title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
-				$sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
-				if (! ($post_ID = $wpdb->get_var($sql)) ) {
+				$sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title);
+				if ( ! ($post_ID = $wpdb->get_var($sql))) {
 					// returning unknown error '0' is better than die()ing
-			  		return $this->pingback_error( 0, '' );
+			  		return $this->pingback_error(0, '');
 				}
 			}
 		} else {
 			// TODO: Attempt to extract a post ID from the given URL
-	  		return $this->pingback_error( 33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+	  		return $this->pingback_error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
 		}
 		$post_ID = (int) $post_ID;
 
 		$post = get_post($post_ID);
 
-		if ( !$post ) // Post_ID not found
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		if ( ! $post) // Post_ID not found
+	  		return $this->pingback_error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
 
-		if ( $post_ID == url_to_postid($pagelinkedfrom) )
-			return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
+		if ($post_ID == url_to_postid($pagelinkedfrom))
+			return $this->pingback_error(0, __('The source URL and the target URL cannot both point to the same resource.'));
 
 		// Check if pings are on
-		if ( !pings_open($post) )
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		if ( ! pings_open($post))
+	  		return $this->pingback_error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
 
 		// Let's check that the remote site didn't already pingback this entry
-		if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
-			return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+		if ($wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom)))
+			return $this->pingback_error(48, __('The pingback has already been registered.'));
 
 		// very stupid, but gives time to the 'from' server to publish !
 		sleep(1);
 
-		$remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
+		$remote_ip = preg_replace('/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR']);
 
 		/** This filter is documented in wp-includes/class-http.php */
-		$user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) );
+		$user_agent = apply_filters('http_headers_useragent', 'WordPress/'.$wp_version.'; '.get_bloginfo('url'));
 
 		// Let's check the remote site
 		$http_api_args = array(
@@ -6187,11 +6187,11 @@ 
 				'X-Pingback-Forwarded-For' => $remote_ip,
 			),
 		);
-		$request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
-		$linea = wp_remote_retrieve_body( $request );
+		$request = wp_safe_remote_get($pagelinkedfrom, $http_api_args);
+		$linea = wp_remote_retrieve_body($request);
 
-		if ( !$linea )
-			return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+		if ( ! $linea)
+			return $this->pingback_error(16, __('The source URL does not exist.'));
 
 		/**
 		 * Filter the pingback remote source.
@@ -6201,30 +6201,30 @@ 
 		 * @param string $linea        Response object for the page linked from.
 		 * @param string $pagelinkedto URL of the page linked to.
 		 */
-		$linea = apply_filters( 'pre_remote_source', $linea, $pagelinkedto );
+		$linea = apply_filters('pre_remote_source', $linea, $pagelinkedto);
 
 		// Work around bug in strip_tags():
 		$linea = str_replace('<!DOC', '<DOC', $linea);
-		$linea = preg_replace( '/[\r\n\t ]+/', ' ', $linea ); // normalize spaces
-		$linea = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $linea );
+		$linea = preg_replace('/[\r\n\t ]+/', ' ', $linea); // normalize spaces
+		$linea = preg_replace("/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $linea);
 
 		preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
 		$title = $matchtitle[1];
-		if ( empty( $title ) )
-			return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
+		if (empty($title))
+			return $this->pingback_error(32, __('We cannot find a title on that page.'));
 
-		$linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
+		$linea = strip_tags($linea, '<a>'); // just keep the tag we need
 
-		$p = explode( "\n\n", $linea );
+		$p = explode("\n\n", $linea);
 
 		$preg_target = preg_quote($pagelinkedto, '|');
 
-		foreach ( $p as $para ) {
-			if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
+		foreach ($p as $para) {
+			if (strpos($para, $pagelinkedto) !== false) { // it exists, but is it a link?
 				preg_match("|<a[^>]+?".$preg_target."[^>]*>([^>]+?)</a>|", $para, $context);
 
 				// If the URL isn't in a link context, keep looking
-				if ( empty($context) )
+				if (empty($context))
 					continue;
 
 				// We're going to use this fake tag to mark the context in a bit
@@ -6232,12 +6232,12 @@ 
 				$excerpt = preg_replace('|\</?wpcontext\>|', '', $para);
 
 				// prevent really long link text
-				if ( strlen($context[1]) > 100 )
-					$context[1] = substr($context[1], 0, 100) . '&#8230;';
+				if (strlen($context[1]) > 100)
+					$context[1] = substr($context[1], 0, 100).'&#8230;';
 
-				$marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
-				$excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
-				$excerpt = strip_tags($excerpt, '<wpcontext>');        // strip all tags but our context marker
+				$marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker
+				$excerpt = str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
+				$excerpt = strip_tags($excerpt, '<wpcontext>'); // strip all tags but our context marker
 				$excerpt = trim($excerpt);
 				$preg_marker = preg_quote($marker, '|');
 				$excerpt = preg_replace("|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt);
@@ -6246,13 +6246,13 @@ 
 			}
 		}
 
-		if ( empty($context) ) // Link to target not found
-			return $this->pingback_error( 17, __( 'The source URL does not contain a link to the target URL, and so cannot be used as a source.' ) );
+		if (empty($context)) // Link to target not found
+			return $this->pingback_error(17, __('The source URL does not contain a link to the target URL, and so cannot be used as a source.'));
 
 		$pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
 
-		$context = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
-		$pagelinkedfrom = $this->escape( $pagelinkedfrom );
+		$context = '[&#8230;] '.esc_html($excerpt).' [&#8230;]';
+		$pagelinkedfrom = $this->escape($pagelinkedfrom);
 
 		$comment_post_ID = (int) $post_ID;
 		$comment_author = $title;
@@ -6274,7 +6274,7 @@ 
 		 *
 		 * @param int $comment_ID Comment ID.
 		 */
-		do_action( 'pingback_post', $comment_ID );
+		do_action('pingback_post', $comment_ID);
 
 		return sprintf(__('Pingback from %1$s to %2$s registered. Keep the web talking! :-)'), $pagelinkedfrom, $pagelinkedto);
 	}
@@ -6291,35 +6291,35 @@ 
 	 * @param string $url
 	 * @return array|IXR_Error
 	 */
-	public function pingback_extensions_getPingbacks( $url ) {
+	public function pingback_extensions_getPingbacks($url) {
 		global $wpdb;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
+		do_action('xmlrpc_call', 'pingback.extensions.getPingbacks');
 
-		$url = $this->escape( $url );
+		$url = $this->escape($url);
 
 		$post_ID = url_to_postid($url);
-		if ( !$post_ID ) {
+		if ( ! $post_ID) {
 			// We aren't sure that the resource is available and/or pingback enabled
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+	  		return $this->pingback_error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
 		}
 
 		$actual_post = get_post($post_ID, ARRAY_A);
 
-		if ( !$actual_post ) {
+		if ( ! $actual_post) {
 			// No such post = resource not found
-	  		return $this->pingback_error( 32, __('The specified target URL does not exist.' ) );
+	  		return $this->pingback_error(32, __('The specified target URL does not exist.'));
 		}
 
-		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+		$comments = $wpdb->get_results($wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID));
 
-		if ( !$comments )
+		if ( ! $comments)
 			return array();
 
 		$pingbacks = array();
-		foreach ( $comments as $comment ) {
-			if ( 'pingback' == $comment->comment_type )
+		foreach ($comments as $comment) {
+			if ('pingback' == $comment->comment_type)
 				$pingbacks[] = $comment->comment_author_url;
 		}
 
@@ -6331,7 +6331,7 @@ 
 	 * @param string $message
 	 * @return IXR_Error
 	 */
-	protected function pingback_error( $code, $message ) {
+	protected function pingback_error($code, $message) {
 		/**
 		 * Filter the XML-RPC pingback error return.
 		 *
@@ -6339,6 +6339,6 @@ 
 		 *
 		 * @param IXR_Error $error An IXR_Error object containing the error code and message.
 		 */
-		return apply_filters( 'xmlrpc_pingback_error', new IXR_Error( $code, $message ) );
+		return apply_filters('xmlrpc_pingback_error', new IXR_Error($code, $message));
 	}
 }

Braces +1165 added lines, -787 removed lines

@@ -297,14 +297,16 @@ 
 	 *                     when array is passed.
 	 */
 	public function escape( &$data ) {
-		if ( ! is_array( $data ) )
-			return wp_slash( $data );
+		if ( ! is_array( $data ) ) {
+					return wp_slash( $data );
+		}
 
 		foreach ( $data as &$v ) {
-			if ( is_array( $v ) )
-				$this->escape( $v );
-			elseif ( ! is_object( $v ) )
-				$v = wp_slash( $v );
+			if ( is_array( $v ) ) {
+							$this->escape( $v );
+			} elseif ( ! is_object( $v ) ) {
+							$v = wp_slash( $v );
+			}
 		}
 	}
 
@@ -323,8 +325,9 @@ 
 
 		foreach ( (array) has_meta($post_id) as $meta ) {
 			// Don't expose protected fields.
-			if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) )
-				continue;
+			if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) ) {
+							continue;
+			}
 
 			$custom_fields[] = array(
 				"id"    => $meta['meta_id'],
@@ -353,11 +356,13 @@ 
 				$pmeta = get_metadata_by_mid( 'post', $meta['id'] );
 				if ( isset($meta['key']) ) {
 					$meta['key'] = wp_unslash( $meta['key'] );
-					if ( $meta['key'] !== $pmeta->meta_key )
-						continue;
+					if ( $meta['key'] !== $pmeta->meta_key ) {
+											continue;
+					}
 					$meta['value'] = wp_unslash( $meta['value'] );
-					if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) )
-						update_metadata_by_mid( 'post', $meta['id'], $meta['value'] );
+					if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) ) {
+											update_metadata_by_mid( 'post', $meta['id'], $meta['value'] );
+					}
 				} elseif ( current_user_can( 'delete_post_meta', $post_id, $pmeta->meta_key ) ) {
 					delete_metadata_by_mid( 'post', $meta['id'] );
 				}
@@ -560,8 +565,9 @@ 
 		$username = $args[0];
 		$password = $args[1];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/**
 		 * Fires after the XML-RPC user has been authenticated but before the rest of
@@ -581,8 +587,9 @@ 
 
 		foreach ( $blogs as $blog ) {
 			// Don't include blogs that aren't hosted at this site.
-			if ( $blog->site_id != get_current_site()->id )
-				continue;
+			if ( $blog->site_id != get_current_site()->id ) {
+							continue;
+			}
 
 			$blog_id = $blog->userblog_id;
 
@@ -642,17 +649,21 @@ 
 			'_builtin' => (bool) $taxonomy->_builtin,
 		);
 
-		if ( in_array( 'labels', $fields ) )
-			$_taxonomy['labels'] = (array) $taxonomy->labels;
+		if ( in_array( 'labels', $fields ) ) {
+					$_taxonomy['labels'] = (array) $taxonomy->labels;
+		}
 
-		if ( in_array( 'cap', $fields ) )
-			$_taxonomy['cap'] = (array) $taxonomy->cap;
+		if ( in_array( 'cap', $fields ) ) {
+					$_taxonomy['cap'] = (array) $taxonomy->cap;
+		}
 
-		if ( in_array( 'menu', $fields ) )
-			$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+		if ( in_array( 'menu', $fields ) ) {
+					$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+		}
 
-		if ( in_array( 'object_type', $fields ) )
-			$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+		if ( in_array( 'object_type', $fields ) ) {
+					$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+		}
 
 		/**
 		 * Filter XML-RPC-prepared data for the given taxonomy.
@@ -676,8 +687,9 @@ 
 	 */
 	protected function _prepare_term( $term ) {
 		$_term = $term;
-		if ( ! is_array( $_term ) )
-			$_term = get_object_vars( $_term );
+		if ( ! is_array( $_term ) ) {
+					$_term = get_object_vars( $_term );
+		}
 
 		// For integers which may be larger than XML-RPC supports ensure we return strings.
 		$_term['term_id'] = strval( $_term['term_id'] );
@@ -776,13 +788,15 @@ 
 		}
 
 		// Consider future posts as published.
-		if ( $post_fields['post_status'] === 'future' )
-			$post_fields['post_status'] = 'publish';
+		if ( $post_fields['post_status'] === 'future' ) {
+					$post_fields['post_status'] = 'publish';
+		}
 
 		// Fill in blank post format.
 		$post_fields['post_format'] = get_post_format( $post['ID'] );
-		if ( empty( $post_fields['post_format'] ) )
-			$post_fields['post_format'] = 'standard';
+		if ( empty( $post_fields['post_format'] ) ) {
+					$post_fields['post_format'] = 'standard';
+		}
 
 		// Merge requested $post_fields fields into $_post.
 		if ( in_array( 'post', $fields ) ) {
@@ -803,8 +817,9 @@ 
 			}
 		}
 
-		if ( in_array( 'custom_fields', $fields ) )
-			$_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+		if ( in_array( 'custom_fields', $fields ) ) {
+					$_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+		}
 
 		if ( in_array( 'enclosure', $fields ) ) {
 			$_post['enclosure'] = array();
@@ -865,8 +880,9 @@ 
 			$_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
 		}
 
-		if ( in_array( 'taxonomies', $fields ) )
-			$_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+		if ( in_array( 'taxonomies', $fields ) ) {
+					$_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+		}
 
 		/**
 		 * Filter XML-RPC-prepared date for the given post type.
@@ -901,10 +917,11 @@ 
 		);
 
 		$thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
-		if ( $thumbnail_src )
-			$_media_item['thumbnail'] = $thumbnail_src[0];
-		else
-			$_media_item['thumbnail'] = $_media_item['link'];
+		if ( $thumbnail_src ) {
+					$_media_item['thumbnail'] = $thumbnail_src[0];
+		} else {
+					$_media_item['thumbnail'] = $_media_item['link'];
+		}
 
 		/**
 		 * Filter XML-RPC-prepared data for the given media item.
@@ -958,8 +975,9 @@ 
 		$author = get_userdata( $page->post_author );
 
 		$page_template = get_page_template_slug( $page->ID );
-		if ( empty( $page_template ) )
-			$page_template = 'default';
+		if ( empty( $page_template ) ) {
+					$page_template = 'default';
+		}
 
 		$_page = array(
 			'dateCreated'            => $page_date,
@@ -1145,8 +1163,9 @@ 
 	 * @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
 	 */
 	public function wp_newPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1154,8 +1173,9 @@ 
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		// convert the date field back to IXR form
 		if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
@@ -1248,21 +1268,26 @@ 
 		$post_data = wp_parse_args( $content_struct, $defaults );
 
 		$post_type = get_post_type_object( $post_data['post_type'] );
-		if ( ! $post_type )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+		if ( ! $post_type ) {
+					return new IXR_Error( 403, __( 'Invalid post type' ) );
+		}
 
 		$update = ! empty( $post_data['ID'] );
 
 		if ( $update ) {
-			if ( ! get_post( $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'Invalid post ID.' ) );
-			if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
-			if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
-				return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+			if ( ! get_post( $post_data['ID'] ) ) {
+							return new IXR_Error( 401, __( 'Invalid post ID.' ) );
+			}
+			if ( ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
+							return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+			}
+			if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) ) {
+							return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+			}
 		} else {
-			if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
-				return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+			if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) ) {
+							return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+			}
 		}
 
 		switch ( $post_data['post_status'] ) {
@@ -1270,41 +1295,49 @@ 
 			case 'pending':
 				break;
 			case 'private':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type' ) );
+				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
+									return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type' ) );
+				}
 				break;
 			case 'publish':
 			case 'future':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type' ) );
+				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
+									return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type' ) );
+				}
 				break;
 			default:
-				if ( ! get_post_status_object( $post_data['post_status'] ) )
-					$post_data['post_status'] = 'draft';
+				if ( ! get_post_status_object( $post_data['post_status'] ) ) {
+									$post_data['post_status'] = 'draft';
+				}
 			break;
 		}
 
-		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type' ) );
+		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type' ) );
+		}
 
 		$post_data['post_author'] = absint( $post_data['post_author'] );
 		if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
-			if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
-				return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
+							return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+			}
 
 			$author = get_userdata( $post_data['post_author'] );
 
-			if ( ! $author )
-				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			if ( ! $author ) {
+							return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			}
 		} else {
 			$post_data['post_author'] = $user->ID;
 		}
 
-		if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' )
-			unset( $post_data['comment_status'] );
+		if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' ) {
+					unset( $post_data['comment_status'] );
+		}
 
-		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
-			unset( $post_data['ping_status'] );
+		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' ) {
+					unset( $post_data['ping_status'] );
+		}
 
 		// Do some timestamp voodoo.
 		if ( ! empty( $post_data['post_date_gmt'] ) ) {
@@ -1319,8 +1352,9 @@ 
 			$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
 		}
 
-		if ( ! isset( $post_data['ID'] ) )
-			$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+		if ( ! isset( $post_data['ID'] ) ) {
+					$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+		}
 		$post_ID = $post_data['ID'];
 
 		if ( $post_data['post_type'] == 'post' ) {
@@ -1332,16 +1366,18 @@ 
 
 		if ( isset( $post_data['post_thumbnail'] ) ) {
 			// empty value deletes, non-empty value adds/updates.
-			if ( ! $post_data['post_thumbnail'] )
-				delete_post_thumbnail( $post_ID );
-			elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
-				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			if ( ! $post_data['post_thumbnail'] ) {
+							delete_post_thumbnail( $post_ID );
+			} elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) ) {
+							return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			}
 			set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
 			unset( $content_struct['post_thumbnail'] );
 		}
 
-		if ( isset( $post_data['custom_fields'] ) )
-			$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+		if ( isset( $post_data['custom_fields'] ) ) {
+					$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+		}
 
 		if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
 			$post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
@@ -1355,19 +1391,22 @@ 
 
 				// Validating term ids.
 				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
-						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) ) {
+											return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					}
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
-						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) ) {
+											return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					}
 
 					$term_ids = $post_data['terms'][$taxonomy];
 					$terms[ $taxonomy ] = array();
 					foreach ( $term_ids as $term_id ) {
 						$term = get_term_by( 'id', $term_id, $taxonomy );
 
-						if ( ! $term )
-							return new IXR_Error( 403, __( 'Invalid term ID' ) );
+						if ( ! $term ) {
+													return new IXR_Error( 403, __( 'Invalid term ID' ) );
+						}
 
 						$terms[$taxonomy][] = (int) $term_id;
 					}
@@ -1379,11 +1418,13 @@ 
 				$taxonomies = array_keys( $post_data['terms_names'] );
 
 				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
-						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) ) {
+											return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					}
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
-						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) ) {
+											return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					}
 
 					/*
 					 * For hierarchical taxonomies, we can't assign a term when multiple terms
@@ -1404,20 +1445,23 @@ 
 
 					$term_names = $post_data['terms_names'][$taxonomy];
 					foreach ( $term_names as $term_name ) {
-						if ( in_array( $term_name, $ambiguous_terms ) )
-							return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+						if ( in_array( $term_name, $ambiguous_terms ) ) {
+													return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+						}
 
 						$term = get_term_by( 'name', $term_name, $taxonomy );
 
 						if ( ! $term ) {
 							// Term doesn't exist, so check that the user is allowed to create new terms.
-							if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
-								return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+							if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) ) {
+															return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+							}
 
 							// Create the new term.
 							$term_info = wp_insert_term( $term_name, $taxonomy );
-							if ( is_wp_error( $term_info ) )
-								return new IXR_Error( 500, $term_info->get_error_message() );
+							if ( is_wp_error( $term_info ) ) {
+															return new IXR_Error( 500, $term_info->get_error_message() );
+							}
 
 							$terms[$taxonomy][] = (int) $term_info['term_id'];
 						} else {
@@ -1437,8 +1481,9 @@ 
 		if ( isset( $post_data['post_format'] ) ) {
 			$format = set_post_format( $post_ID, $post_data['post_format'] );
 
-			if ( is_wp_error( $format ) )
-				return new IXR_Error( 500, $format->get_error_message() );
+			if ( is_wp_error( $format ) ) {
+							return new IXR_Error( 500, $format->get_error_message() );
+			}
 
 			unset( $post_data['post_format'] );
 		}
@@ -1460,11 +1505,13 @@ 
 		$post_data = apply_filters( 'xmlrpc_wp_insert_post_data', $post_data, $content_struct );
 
 		$post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error( 500, $post_ID->get_error_message() );
+		if ( is_wp_error( $post_ID ) ) {
+					return new IXR_Error( 500, $post_ID->get_error_message() );
+		}
 
-		if ( ! $post_ID )
-			return new IXR_Error( 401, __( 'Sorry, your entry could not be posted. Something wrong happened.' ) );
+		if ( ! $post_ID ) {
+					return new IXR_Error( 401, __( 'Sorry, your entry could not be posted. Something wrong happened.' ) );
+		}
 
 		return strval( $post_ID );
 	}
@@ -1489,8 +1536,9 @@ 
 	 * @return true|IXR_Error True on success, IXR_Error on failure.
 	 */
 	public function wp_editPost( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 5 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1499,16 +1547,18 @@ 
 		$post_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editPost' );
 
 		$post = get_post( $post_id, ARRAY_A );
 
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( empty( $post['ID'] ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
 		if ( isset( $content_struct['if_not_modified_since'] ) ) {
 			// If the post has been modified since the date provided, return an error.
@@ -1524,17 +1574,19 @@ 
 		 * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
 		 * since _insert_post() will ignore the non-GMT date if the GMT date is set.
 		 */
-		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
-			unset( $post['post_date_gmt'] );
-		else
-			$post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
+					unset( $post['post_date_gmt'] );
+		} else {
+					$post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+		}
 
 		$this->escape( $post );
 		$merged_content_struct = array_merge( $post, $content_struct );
 
 		$retval = $this->_insert_post( $user, $merged_content_struct );
-		if ( $retval instanceof IXR_Error )
-			return $retval;
+		if ( $retval instanceof IXR_Error ) {
+					return $retval;
+		}
 
 		return true;
 	}
@@ -1557,8 +1609,9 @@ 
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_deletePost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1566,23 +1619,27 @@ 
 		$password   = $args[2];
 		$post_id    = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deletePost' );
 
 		$post = get_post( $post_id, ARRAY_A );
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( empty( $post['ID'] ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'delete_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
+		if ( ! current_user_can( 'delete_post', $post_id ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
+		}
 
 		$result = wp_delete_post( $post_id );
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+		if ( ! $result ) {
+					return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+		}
 
 		return true;
 	}
@@ -1637,8 +1694,9 @@ 
 	 *  - 'enclosure'
 	 */
 	public function wp_getPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1660,19 +1718,22 @@ 
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPost' );
 
 		$post = get_post( $post_id, ARRAY_A );
 
-		if ( empty( $post['ID'] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( empty( $post['ID'] ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		}
 
 		return $this->_prepare_post( $post, $fields );
 	}
@@ -1700,8 +1761,9 @@ 
 	 * @return array|IXR_Error Array contains a collection of posts.
 	 */
 	public function wp_getPosts( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1716,8 +1778,9 @@ 
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPosts' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPosts' );
@@ -1726,31 +1789,37 @@ 
 
 		if ( isset( $filter['post_type'] ) ) {
 			$post_type = get_post_type_object( $filter['post_type'] );
-			if ( ! ( (bool) $post_type ) )
-				return new IXR_Error( 403, __( 'The post type specified is not valid' ) );
+			if ( ! ( (bool) $post_type ) ) {
+							return new IXR_Error( 403, __( 'The post type specified is not valid' ) );
+			}
 		} else {
 			$post_type = get_post_type_object( 'post' );
 		}
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type' ));
+		if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type' ));
+		}
 
 		$query['post_type'] = $post_type->name;
 
-		if ( isset( $filter['post_status'] ) )
-			$query['post_status'] = $filter['post_status'];
+		if ( isset( $filter['post_status'] ) ) {
+					$query['post_status'] = $filter['post_status'];
+		}
 
-		if ( isset( $filter['number'] ) )
-			$query['numberposts'] = absint( $filter['number'] );
+		if ( isset( $filter['number'] ) ) {
+					$query['numberposts'] = absint( $filter['number'] );
+		}
 
-		if ( isset( $filter['offset'] ) )
-			$query['offset'] = absint( $filter['offset'] );
+		if ( isset( $filter['offset'] ) ) {
+					$query['offset'] = absint( $filter['offset'] );
+		}
 
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
-				$query['order'] = $filter['order'];
+			if ( isset( $filter['order'] ) ) {
+							$query['order'] = $filter['order'];
+			}
 		}
 
 		if ( isset( $filter['s'] ) ) {
@@ -1759,15 +1828,17 @@ 
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( ! $posts_list )
-			return array();
+		if ( ! $posts_list ) {
+					return array();
+		}
 
 		// Holds all the posts data.
 		$struct = array();
 
 		foreach ( $posts_list as $post ) {
-			if ( ! current_user_can( 'edit_post', $post['ID'] ) )
-				continue;
+			if ( ! current_user_can( 'edit_post', $post['ID'] ) ) {
+							continue;
+			}
 
 			$struct[] = $this->_prepare_post( $post, $fields );
 		}
@@ -1795,8 +1866,9 @@ 
 	 * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
 	 */
 	public function wp_newTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1804,19 +1876,22 @@ 
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newTerm' );
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
 
-		if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->manage_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
+		}
 
 		$taxonomy = (array) $taxonomy;
 
@@ -1824,38 +1899,46 @@ 
 		$term_data = array();
 
 		$term_data['name'] = trim( $content_struct['name'] );
-		if ( empty( $term_data['name'] ) )
-			return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+		if ( empty( $term_data['name'] ) ) {
+					return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+		}
 
 		if ( isset( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+			if ( ! $taxonomy['hierarchical'] ) {
+							return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+			}
 
 			$parent_term_id = (int) $content_struct['parent'];
 			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
 
-			if ( is_wp_error( $parent_term ) )
-				return new IXR_Error( 500, $parent_term->get_error_message() );
+			if ( is_wp_error( $parent_term ) ) {
+							return new IXR_Error( 500, $parent_term->get_error_message() );
+			}
 
-			if ( ! $parent_term )
-				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			if ( ! $parent_term ) {
+							return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			}
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
-			$term_data['description'] = $content_struct['description'];
+		if ( isset( $content_struct['description'] ) ) {
+					$term_data['description'] = $content_struct['description'];
+		}
 
-		if ( isset( $content_struct['slug'] ) )
-			$term_data['slug'] = $content_struct['slug'];
+		if ( isset( $content_struct['slug'] ) ) {
+					$term_data['slug'] = $content_struct['slug'];
+		}
 
 		$term = wp_insert_term( $term_data['name'] , $taxonomy['name'] , $term_data );
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $term ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
-			return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
+		if ( ! $term ) {
+					return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
+		}
 
 		return strval( $term['term_id'] );
 	}
@@ -1881,8 +1964,9 @@ 
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_editTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 5 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1891,19 +1975,22 @@ 
 		$term_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editTerm' );
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
 
-		if ( ! current_user_can( $taxonomy->cap->edit_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->edit_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
+		}
 
 		$taxonomy = (array) $taxonomy;
 
@@ -1912,48 +1999,58 @@ 
 
 		$term = get_term( $term_id , $content_struct['taxonomy'] );
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $term ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term ) {
+					return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		}
 
 		if ( isset( $content_struct['name'] ) ) {
 			$term_data['name'] = trim( $content_struct['name'] );
 
-			if ( empty( $term_data['name'] ) )
-				return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+			if ( empty( $term_data['name'] ) ) {
+							return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+			}
 		}
 
 		if ( isset( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+			if ( ! $taxonomy['hierarchical'] ) {
+							return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+			}
 
 			$parent_term_id = (int) $content_struct['parent'];
 			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
 
-			if ( is_wp_error( $parent_term ) )
-				return new IXR_Error( 500, $parent_term->get_error_message() );
+			if ( is_wp_error( $parent_term ) ) {
+							return new IXR_Error( 500, $parent_term->get_error_message() );
+			}
 
-			if ( ! $parent_term )
-				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			if ( ! $parent_term ) {
+							return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			}
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
-			$term_data['description'] = $content_struct['description'];
+		if ( isset( $content_struct['description'] ) ) {
+					$term_data['description'] = $content_struct['description'];
+		}
 
-		if ( isset( $content_struct['slug'] ) )
-			$term_data['slug'] = $content_struct['slug'];
+		if ( isset( $content_struct['slug'] ) ) {
+					$term_data['slug'] = $content_struct['slug'];
+		}
 
 		$term = wp_update_term( $term_id , $taxonomy['name'] , $term_data );
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $term ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
-			return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+		if ( ! $term ) {
+					return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+		}
 
 		return true;
 	}
@@ -1977,8 +2074,9 @@ 
 	 * @return bool|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_deleteTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 5 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1987,35 +2085,42 @@ 
 		$taxonomy           = $args[3];
 		$term_id            = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteTerm' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->delete_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
+		}
 
 		$term = get_term( $term_id, $taxonomy->name );
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $term ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term ) {
+					return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		}
 
 		$result = wp_delete_term( $term_id, $taxonomy->name );
 
-		if ( is_wp_error( $result ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $result ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+		if ( ! $result ) {
+					return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+		}
 
 		return $result;
 	}
@@ -2048,8 +2153,9 @@ 
 	 *  - 'count'
 	 */
 	public function wp_getTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 5 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2058,27 +2164,32 @@ 
 		$taxonomy           = $args[3];
 		$term_id            = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTerm' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		}
 
 		$term = get_term( $term_id , $taxonomy->name, ARRAY_A );
 
-		if ( is_wp_error( $term ) )
-			return new IXR_Error( 500, $term->get_error_message() );
+		if ( is_wp_error( $term ) ) {
+					return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
-			return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		if ( ! $term ) {
+					return new IXR_Error( 404, __( 'Invalid term ID' ) );
+		}
 
 		return $this->_prepare_term( $term );
 	}
@@ -2106,8 +2217,9 @@ 
 	 * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
 	 */
 	public function wp_getTerms( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2116,47 +2228,56 @@ 
 		$taxonomy       = $args[3];
 		$filter         = isset( $args[4] ) ? $args[4] : array();
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTerms' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		}
 
 		$query = array();
 
-		if ( isset( $filter['number'] ) )
-			$query['number'] = absint( $filter['number'] );
+		if ( isset( $filter['number'] ) ) {
+					$query['number'] = absint( $filter['number'] );
+		}
 
-		if ( isset( $filter['offset'] ) )
-			$query['offset'] = absint( $filter['offset'] );
+		if ( isset( $filter['offset'] ) ) {
+					$query['offset'] = absint( $filter['offset'] );
+		}
 
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
-				$query['order'] = $filter['order'];
+			if ( isset( $filter['order'] ) ) {
+							$query['order'] = $filter['order'];
+			}
 		}
 
-		if ( isset( $filter['hide_empty'] ) )
-			$query['hide_empty'] = $filter['hide_empty'];
-		else
-			$query['get'] = 'all';
+		if ( isset( $filter['hide_empty'] ) ) {
+					$query['hide_empty'] = $filter['hide_empty'];
+		} else {
+					$query['get'] = 'all';
+		}
 
-		if ( isset( $filter['search'] ) )
-			$query['search'] = $filter['search'];
+		if ( isset( $filter['search'] ) ) {
+					$query['search'] = $filter['search'];
+		}
 
 		$terms = get_terms( $taxonomy->name, $query );
 
-		if ( is_wp_error( $terms ) )
-			return new IXR_Error( 500, $terms->get_error_message() );
+		if ( is_wp_error( $terms ) ) {
+					return new IXR_Error( 500, $terms->get_error_message() );
+		}
 
 		$struct = array();
 
@@ -2188,8 +2309,9 @@ 
 	 * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
 	 */
 	public function wp_getTaxonomy( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2211,19 +2333,22 @@ 
 			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-			return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
+					return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+		}
 
 		return $this->_prepare_taxonomy( $taxonomy, $fields );
 	}
@@ -2248,8 +2373,9 @@ 
 	 *                         by `$fields`, or an IXR_Error instance on failure.
 	 */
 	public function wp_getTaxonomies( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2264,8 +2390,9 @@ 
 			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomies' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTaxonomies' );
@@ -2277,8 +2404,9 @@ 
 
 		foreach ( $taxonomies as $taxonomy ) {
 			// capability check for post_types
-			if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
-				continue;
+			if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
+							continue;
+			}
 
 			$struct[] = $this->_prepare_taxonomy( $taxonomy, $fields );
 		}
@@ -2323,8 +2451,9 @@ 
 	 *  - 'roles'
 	 */
 	public function wp_getUser( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2346,19 +2475,22 @@ 
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getUser' );
 
-		if ( ! current_user_can( 'edit_user', $user_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit users.' ) );
+		if ( ! current_user_can( 'edit_user', $user_id ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit users.' ) );
+		}
 
 		$user_data = get_userdata( $user_id );
 
-		if ( ! $user_data )
-			return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+		if ( ! $user_data ) {
+					return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+		}
 
 		return $this->_prepare_user( $user_data, $fields );
 	}
@@ -2388,8 +2520,9 @@ 
 	 * @return array|IXR_Error users data
 	 */
 	public function wp_getUsers( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2404,14 +2537,16 @@ 
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUsers' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getUsers' );
 
-		if ( ! current_user_can( 'list_users' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
+		if ( ! current_user_can( 'list_users' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
+		}
 
 		$query = array( 'fields' => 'all_with_meta' );
 
@@ -2421,13 +2556,15 @@ 
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
-				$query['order'] = $filter['order'];
+			if ( isset( $filter['order'] ) ) {
+							$query['order'] = $filter['order'];
+			}
 		}
 
 		if ( isset( $filter['role'] ) ) {
-			if ( get_role( $filter['role'] ) === null )
-				return new IXR_Error( 403, __( 'The role specified is not valid' ) );
+			if ( get_role( $filter['role'] ) === null ) {
+							return new IXR_Error( 403, __( 'The role specified is not valid' ) );
+			}
 
 			$query['role'] = $filter['role'];
 		}
@@ -2440,8 +2577,9 @@ 
 
 		$_users = array();
 		foreach ( $users as $user_data ) {
-			if ( current_user_can( 'edit_user', $user_data->ID ) )
-				$_users[] = $this->_prepare_user( $user_data, $fields );
+			if ( current_user_can( 'edit_user', $user_data->ID ) ) {
+							$_users[] = $this->_prepare_user( $user_data, $fields );
+			}
 		}
 		return $_users;
 	}
@@ -2462,8 +2600,9 @@ 
 	 * @return array|IXR_Error (@see wp_getUser)
 	 */
 	public function wp_getProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2477,14 +2616,16 @@ 
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getProfile' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getProfile' );
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		}
 
 		$user_data = get_userdata( $user->ID );
 
@@ -2514,8 +2655,9 @@ 
 	 * @return true|IXR_Error True, on success.
 	 */
 	public function wp_editProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2523,48 +2665,59 @@ 
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editProfile' );
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+		}
 
 		// holds data of the user
 		$user_data = array();
 		$user_data['ID'] = $user->ID;
 
 		// only set the user details if it was given
-		if ( isset( $content_struct['first_name'] ) )
-			$user_data['first_name'] = $content_struct['first_name'];
+		if ( isset( $content_struct['first_name'] ) ) {
+					$user_data['first_name'] = $content_struct['first_name'];
+		}
 
-		if ( isset( $content_struct['last_name'] ) )
-			$user_data['last_name'] = $content_struct['last_name'];
+		if ( isset( $content_struct['last_name'] ) ) {
+					$user_data['last_name'] = $content_struct['last_name'];
+		}
 
-		if ( isset( $content_struct['url'] ) )
-			$user_data['user_url'] = $content_struct['url'];
+		if ( isset( $content_struct['url'] ) ) {
+					$user_data['user_url'] = $content_struct['url'];
+		}
 
-		if ( isset( $content_struct['display_name'] ) )
-			$user_data['display_name'] = $content_struct['display_name'];
+		if ( isset( $content_struct['display_name'] ) ) {
+					$user_data['display_name'] = $content_struct['display_name'];
+		}
 
-		if ( isset( $content_struct['nickname'] ) )
-			$user_data['nickname'] = $content_struct['nickname'];
+		if ( isset( $content_struct['nickname'] ) ) {
+					$user_data['nickname'] = $content_struct['nickname'];
+		}
 
-		if ( isset( $content_struct['nicename'] ) )
-			$user_data['user_nicename'] = $content_struct['nicename'];
+		if ( isset( $content_struct['nicename'] ) ) {
+					$user_data['user_nicename'] = $content_struct['nicename'];
+		}
 
-		if ( isset( $content_struct['bio'] ) )
-			$user_data['description'] = $content_struct['bio'];
+		if ( isset( $content_struct['bio'] ) ) {
+					$user_data['description'] = $content_struct['bio'];
+		}
 
 		$result = wp_update_user( $user_data );
 
-		if ( is_wp_error( $result ) )
-			return new IXR_Error( 500, $result->get_error_message() );
+		if ( is_wp_error( $result ) ) {
+					return new IXR_Error( 500, $result->get_error_message() );
+		}
 
-		if ( ! $result )
-			return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+		if ( ! $result ) {
+					return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+		}
 
 		return true;
 	}
@@ -2596,11 +2749,13 @@ 
 		}
 
 		$page = get_post($page_id);
-		if ( ! $page )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $page ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_page', $page_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this page.' ) );
+		if ( !current_user_can( 'edit_page', $page_id ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit this page.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPage' );
@@ -2637,11 +2792,13 @@ 
 		$password  = $args[2];
 		$num_pages = isset($args[3]) ? (int) $args[3] : 10;
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		if ( !current_user_can( 'edit_pages' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPages' );
@@ -2654,8 +2811,9 @@ 
 			$pages_struct = array();
 
 			foreach ($pages as $page) {
-				if ( current_user_can( 'edit_page', $page->ID ) )
-					$pages_struct[] = $this->_prepare_page( $page );
+				if ( current_user_can( 'edit_page', $page->ID ) ) {
+									$pages_struct[] = $this->_prepare_page( $page );
+				}
 			}
 
 			return $pages_struct;
@@ -2686,8 +2844,9 @@ 
 		$username = $this->escape( $args[1] );
 		$password = $this->escape( $args[2] );
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newPage' );
@@ -2721,8 +2880,9 @@ 
 		$password = $args[2];
 		$page_id  = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deletePage' );
@@ -2730,17 +2890,20 @@ 
 		// Get the current page based on the page_id and
 		// make sure it is a page and not a post.
 		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		if ( !$actual_page || ($actual_page['post_type'] != 'page') ) {
+					return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		}
 
 		// Make sure the user can delete pages.
-		if ( !current_user_can('delete_page', $page_id) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
+		if ( !current_user_can('delete_page', $page_id) ) {
+					return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
+		}
 
 		// Attempt to delete the page.
 		$result = wp_delete_post($page_id);
-		if ( !$result )
-			return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+		if ( !$result ) {
+					return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+		}
 
 		/**
 		 * Fires after a page has been successfully deleted via XML-RPC.
@@ -2792,12 +2955,14 @@ 
 
 		// Get the page data and make sure it is a page.
 		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		if ( !$actual_page || ($actual_page['post_type'] != 'page') ) {
+					return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		}
 
 		// Make sure the user is allowed to edit pages.
-		if ( !current_user_can('edit_page', $page_id) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
+		if ( !current_user_can('edit_page', $page_id) ) {
+					return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
+		}
 
 		// Mark this as content for a page.
 		$content['post_type'] = 'page';
@@ -2839,11 +3004,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		if ( !current_user_can( 'edit_pages' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPageList' );
@@ -2895,11 +3062,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can('edit_posts') )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( !current_user_can('edit_posts') ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getAuthors' );
@@ -2936,11 +3105,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getKeywords' );
@@ -2986,29 +3157,34 @@ 
 		$password = $args[2];
 		$category = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newCategory' );
 
 		// Make sure the user is allowed to add a category.
-		if ( !current_user_can('manage_categories') )
-			return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
+		if ( !current_user_can('manage_categories') ) {
+					return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
+		}
 
 		// If no slug was provided make it empty so that
 		// WordPress will generate one.
-		if ( empty($category['slug']) )
-			$category['slug'] = '';
+		if ( empty($category['slug']) ) {
+					$category['slug'] = '';
+		}
 
 		// If no parent_id was provided make it empty
 		// so that it will be a top level page (no parent).
-		if ( !isset($category['parent_id']) )
-			$category['parent_id'] = '';
+		if ( !isset($category['parent_id']) ) {
+					$category['parent_id'] = '';
+		}
 
 		// If no description was provided make it empty.
-		if ( empty($category["description"]) )
-			$category["description"] = "";
+		if ( empty($category["description"]) ) {
+					$category["description"] = "";
+		}
 
 		$new_category = array(
 			'cat_name'				=> $category['name'],
@@ -3019,10 +3195,11 @@ 
 
 		$cat_id = wp_insert_category($new_category, true);
 		if ( is_wp_error( $cat_id ) ) {
-			if ( 'term_exists' == $cat_id->get_error_code() )
-				return (int) $cat_id->get_error_data();
-			else
-				return new IXR_Error(500, __('Sorry, the new category failed.'));
+			if ( 'term_exists' == $cat_id->get_error_code() ) {
+							return (int) $cat_id->get_error_data();
+			} else {
+							return new IXR_Error(500, __('Sorry, the new category failed.'));
+			}
 		} elseif ( ! $cat_id ) {
 			return new IXR_Error(500, __('Sorry, the new category failed.'));
 		}
@@ -3062,14 +3239,16 @@ 
 		$password    = $args[2];
 		$category_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteCategory' );
 
-		if ( !current_user_can('manage_categories') )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
+		if ( !current_user_can('manage_categories') ) {
+					return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
+		}
 
 		$status = wp_delete_term( $category_id, 'category' );
 
@@ -3112,11 +3291,13 @@ 
 		$category    = $args[3];
 		$max_results = (int) $args[4];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.suggestCategories' );
@@ -3155,17 +3336,20 @@ 
 		$password	= $args[2];
 		$comment_id	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( !current_user_can( 'moderate_comments' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getComment' );
 
-		if ( ! $comment = get_comment($comment_id) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! $comment = get_comment($comment_id) ) {
+					return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		}
 
 		return $this->_prepare_comment( $comment );
 	}
@@ -3203,31 +3387,37 @@ 
 		$password = $args[2];
 		$struct	  = isset( $args[3] ) ? $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
+		if ( !current_user_can( 'moderate_comments' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getComments' );
 
-		if ( isset($struct['status']) )
-			$status = $struct['status'];
-		else
-			$status = '';
+		if ( isset($struct['status']) ) {
+					$status = $struct['status'];
+		} else {
+					$status = '';
+		}
 
 		$post_id = '';
-		if ( isset($struct['post_id']) )
-			$post_id = absint($struct['post_id']);
+		if ( isset($struct['post_id']) ) {
+					$post_id = absint($struct['post_id']);
+		}
 
 		$offset = 0;
-		if ( isset($struct['offset']) )
-			$offset = absint($struct['offset']);
+		if ( isset($struct['offset']) ) {
+					$offset = absint($struct['offset']);
+		}
 
 		$number = 10;
-		if ( isset($struct['number']) )
-			$number = absint($struct['number']);
+		if ( isset($struct['number']) ) {
+					$number = absint($struct['number']);
+		}
 
 		$comments = get_comments( array( 'status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
 
@@ -3267,17 +3457,21 @@ 
 		$password	= $args[2];
 		$comment_ID	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( !current_user_can( 'moderate_comments' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		}
 
-		if ( ! get_comment($comment_ID) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! get_comment($comment_ID) ) {
+					return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_comment', $comment_ID ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( !current_user_can( 'edit_comment', $comment_ID ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteComment' );
@@ -3334,17 +3528,21 @@ 
 		$comment_ID	= (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( !current_user_can( 'moderate_comments' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		}
 
-		if ( ! get_comment($comment_ID) )
-			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		if ( ! get_comment($comment_ID) ) {
+					return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_comment', $comment_ID ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		if ( !current_user_can( 'edit_comment', $comment_ID ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editComment' );
@@ -3353,8 +3551,9 @@ 
 			$statuses = get_comment_statuses();
 			$statuses = array_keys($statuses);
 
-			if ( ! in_array($content_struct['status'], $statuses) )
-				return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+			if ( ! in_array($content_struct['status'], $statuses) ) {
+							return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+			}
 			$comment_approved = $content_struct['status'];
 		}
 
@@ -3366,27 +3565,33 @@ 
 			$comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
 		}
 
-		if ( isset($content_struct['content']) )
-			$comment_content = $content_struct['content'];
+		if ( isset($content_struct['content']) ) {
+					$comment_content = $content_struct['content'];
+		}
 
-		if ( isset($content_struct['author']) )
-			$comment_author = $content_struct['author'];
+		if ( isset($content_struct['author']) ) {
+					$comment_author = $content_struct['author'];
+		}
 
-		if ( isset($content_struct['author_url']) )
-			$comment_author_url = $content_struct['author_url'];
+		if ( isset($content_struct['author_url']) ) {
+					$comment_author_url = $content_struct['author_url'];
+		}
 
-		if ( isset($content_struct['author_email']) )
-			$comment_author_email = $content_struct['author_email'];
+		if ( isset($content_struct['author_email']) ) {
+					$comment_author_email = $content_struct['author_email'];
+		}
 
 		// We've got all the data -- post it:
 		$comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
 
 		$result = wp_update_comment($comment);
-		if ( is_wp_error( $result ) )
-			return new IXR_Error(500, $result->get_error_message());
+		if ( is_wp_error( $result ) ) {
+					return new IXR_Error(500, $result->get_error_message());
+		}
 
-		if ( !$result )
-			return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
+		if ( !$result ) {
+					return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
+		}
 
 		/**
 		 * Fires after a comment has been successfully updated via XML-RPC.
@@ -3448,16 +3653,19 @@ 
 			$logged_in = true;
 		}
 
-		if ( is_numeric($post) )
-			$post_id = absint($post);
-		else
-			$post_id = url_to_postid($post);
+		if ( is_numeric($post) ) {
+					$post_id = absint($post);
+		} else {
+					$post_id = url_to_postid($post);
+		}
 
-		if ( ! $post_id )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post_id ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! get_post($post_id) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post($post_id) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
 		$comment = array();
 		$comment['comment_post_ID'] = $post_id;
@@ -3469,24 +3677,28 @@ 
 			$comment['user_ID'] = $user->ID;
 		} else {
 			$comment['comment_author'] = '';
-			if ( isset($content_struct['author']) )
-				$comment['comment_author'] = $content_struct['author'];
+			if ( isset($content_struct['author']) ) {
+							$comment['comment_author'] = $content_struct['author'];
+			}
 
 			$comment['comment_author_email'] = '';
-			if ( isset($content_struct['author_email']) )
-				$comment['comment_author_email'] = $content_struct['author_email'];
+			if ( isset($content_struct['author_email']) ) {
+							$comment['comment_author_email'] = $content_struct['author_email'];
+			}
 
 			$comment['comment_author_url'] = '';
-			if ( isset($content_struct['author_url']) )
-				$comment['comment_author_url'] = $content_struct['author_url'];
+			if ( isset($content_struct['author_url']) ) {
+							$comment['comment_author_url'] = $content_struct['author_url'];
+			}
 
 			$comment['user_ID'] = 0;
 
 			if ( get_option('require_name_email') ) {
-				if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
-					return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
-				elseif ( !is_email($comment['comment_author_email']) )
-					return new IXR_Error( 403, __( 'A valid email address is required' ) );
+				if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) {
+									return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
+				} elseif ( !is_email($comment['comment_author_email']) ) {
+									return new IXR_Error( 403, __( 'A valid email address is required' ) );
+				}
 			}
 		}
 
@@ -3532,11 +3744,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( !current_user_can( 'moderate_comments' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getCommentStatusList' );
@@ -3566,11 +3780,13 @@ 
 		$password	= $args[2];
 		$post_id	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getCommentCount' );
@@ -3604,11 +3820,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
@@ -3636,11 +3854,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( !current_user_can( 'edit_pages' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
@@ -3668,11 +3888,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( !current_user_can( 'edit_pages' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		}
 
 		$templates = get_page_templates();
 		$templates['Default'] = 'default';
@@ -3702,12 +3924,14 @@ 
 		$password	= $args[2];
 		$options	= isset( $args[3] ) ? (array) $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		// If no specific options where asked for, return all of them
-		if ( count( $options ) == 0 )
-			$options = array_keys($this->blog_options);
+		if ( count( $options ) == 0 ) {
+					$options = array_keys($this->blog_options);
+		}
 
 		return $this->_getOptions($options);
 	}
@@ -3732,8 +3956,9 @@ 
 					unset($data[$option]['option']);
 				}
 
-				if ( ! $can_manage )
-					$data[$option]['readonly'] = true;
+				if ( ! $can_manage ) {
+									$data[$option]['readonly'] = true;
+				}
 			}
 		}
 
@@ -3762,20 +3987,24 @@ 
 		$password	= $args[2];
 		$options	= (array) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'manage_options' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
+		if ( !current_user_can( 'manage_options' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
+		}
 
 		$option_names = array();
 		foreach ( $options as $o_name => $o_value ) {
 			$option_names[] = $o_name;
-			if ( !array_key_exists( $o_name, $this->blog_options ) )
-				continue;
+			if ( !array_key_exists( $o_name, $this->blog_options ) ) {
+							continue;
+			}
 
-			if ( $this->blog_options[$o_name]['readonly'] == true )
-				continue;
+			if ( $this->blog_options[$o_name]['readonly'] == true ) {
+							continue;
+			}
 
 			update_option( $this->blog_options[$o_name]['option'], wp_unslash( $o_value ) );
 		}
@@ -3814,17 +4043,20 @@ 
 		$password		= $args[2];
 		$attachment_id	= (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
+		if ( !current_user_can( 'upload_files' ) ) {
+					return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getMediaItem' );
 
-		if ( ! $attachment = get_post($attachment_id) )
-			return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+		if ( ! $attachment = get_post($attachment_id) ) {
+					return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+		}
 
 		return $this->_prepare_media_item( $attachment );
 	}
@@ -3862,11 +4094,13 @@ 
 		$password	= $args[2];
 		$struct		= isset( $args[3] ) ? $args[3] : array() ;
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+		if ( !current_user_can( 'upload_files' ) ) {
+					return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getMediaLibrary' );
@@ -3880,8 +4114,9 @@ 
 
 		$attachments_struct = array();
 
-		foreach ($attachments as $attachment )
-			$attachments_struct[] = $this->_prepare_media_item( $attachment );
+		foreach ($attachments as $attachment ) {
+					$attachments_struct[] = $this->_prepare_media_item( $attachment );
+		}
 
 		return $attachments_struct;
 	}
@@ -3906,11 +4141,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( !$user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostFormats' );
@@ -3963,8 +4200,9 @@ 
 	 *  - 'supports'
 	 */
 	public function wp_getPostType( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -3986,19 +4224,22 @@ 
 			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
 		}
 
-		if ( !$user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( !$user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostType' );
 
-		if ( ! post_type_exists( $post_type_name ) )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+		if ( ! post_type_exists( $post_type_name ) ) {
+					return new IXR_Error( 403, __( 'Invalid post type' ) );
+		}
 
 		$post_type = get_post_type_object( $post_type_name );
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
+		if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
+		}
 
 		return $this->_prepare_post_type( $post_type, $fields );
 	}
@@ -4022,8 +4263,9 @@ 
 	 * @return array|IXR_Error
 	 */
 	public function wp_getPostTypes( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4038,8 +4280,9 @@ 
 			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostTypes' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostTypes' );
@@ -4049,8 +4292,9 @@ 
 		$struct = array();
 
 		foreach( $post_types as $post_type ) {
-			if ( ! current_user_can( $post_type->cap->edit_posts ) )
-				continue;
+			if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
+							continue;
+			}
 
 			$struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
 		}
@@ -4081,8 +4325,9 @@ 
 	 * @return array|IXR_Error contains a collection of posts.
 	 */
 	public function wp_getRevisions( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 4 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4104,36 +4349,43 @@ 
 			$fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getRevisions' );
 
-		if ( ! $post = get_post( $post_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post = get_post( $post_id ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 
 		// Check if revisions are enabled.
-		if ( ! wp_revisions_enabled( $post ) )
-			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		if ( ! wp_revisions_enabled( $post ) ) {
+					return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		}
 
 		$revisions = wp_get_post_revisions( $post_id );
 
-		if ( ! $revisions )
-			return array();
+		if ( ! $revisions ) {
+					return array();
+		}
 
 		$struct = array();
 
 		foreach ( $revisions as $revision ) {
-			if ( ! current_user_can( 'read_post', $revision->ID ) )
-				continue;
+			if ( ! current_user_can( 'read_post', $revision->ID ) ) {
+							continue;
+			}
 
 			// Skip autosaves
-			if ( wp_is_post_autosave( $revision ) )
-				continue;
+			if ( wp_is_post_autosave( $revision ) ) {
+							continue;
+			}
 
 			$struct[] = $this->_prepare_post( get_object_vars( $revision ), $fields );
 		}
@@ -4159,8 +4411,9 @@ 
 	 * @return bool|IXR_Error false if there was an error restoring, true if success.
 	 */
 	public function wp_restoreRevision( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
-			return $this->error;
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+					return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4168,27 +4421,33 @@ 
 		$password    = $args[2];
 		$revision_id = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
-			return $this->error;
+		if ( ! $user = $this->login( $username, $password ) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.restoreRevision' );
 
-		if ( ! $revision = wp_get_post_revision( $revision_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( wp_is_post_autosave( $revision ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( wp_is_post_autosave( $revision ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! $post = get_post( $revision->post_parent ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post = get_post( $revision->post_parent ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		}
 
 		// Check if revisions are disabled.
-		if ( ! wp_revisions_enabled( $post ) )
-			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		if ( ! wp_revisions_enabled( $post ) ) {
+					return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		}
 
 		$post = wp_restore_post_revision( $revision_id );
 
@@ -4216,16 +4475,18 @@ 
 	 * @return array|IXR_Error
 	 */
 	public function blogger_getUsersBlogs($args) {
-		if ( is_multisite() )
-			return $this->_multisite_getUsersBlogs($args);
+		if ( is_multisite() ) {
+					return $this->_multisite_getUsersBlogs($args);
+		}
 
 		$this->escape($args);
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
@@ -4260,15 +4521,17 @@ 
 		$rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
 		$blogs = $rpc->getResponse();
 
-		if ( isset($blogs['faultCode']) )
-			return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
+		if ( isset($blogs['faultCode']) ) {
+					return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
+		}
 
 		if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
 			return $blogs;
 		} else {
 			foreach ( (array) $blogs as $blog ) {
-				if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) )
-					return array($blog);
+				if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) ) {
+									return array($blog);
+				}
 			}
 			return array();
 		}
@@ -4296,11 +4559,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
@@ -4338,15 +4603,18 @@ 
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		$post_data = get_post($post_ID, ARRAY_A);
-		if ( ! $post_data )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $post_data ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( !current_user_can( 'edit_post', $post_ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getPost' );
@@ -4390,16 +4658,19 @@ 
 		// $args[0] = appkey - ignored
 		$username = $args[2];
 		$password = $args[3];
-		if ( isset( $args[4] ) )
-			$query = array( 'numberposts' => absint( $args[4] ) );
-		else
-			$query = array();
+		if ( isset( $args[4] ) ) {
+					$query = array( 'numberposts' => absint( $args[4] ) );
+		} else {
+					$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( ! current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( ! current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getRecentPosts' );
@@ -4413,8 +4684,9 @@ 
 
 		$recent_posts = array();
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
-				continue;
+			if ( !current_user_can( 'edit_post', $entry['ID'] ) ) {
+							continue;
+			}
 
 			$post_date  = $this->_convert_date( $entry['post_date'] );
 			$categories = implode(',', wp_get_post_categories($entry['ID']));
@@ -4481,15 +4753,17 @@ 
 		$content  = $args[4];
 		$publish  = $args[5];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.newPost' );
 
 		$cap = ($publish) ? 'publish_posts' : 'edit_posts';
-		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
-			return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
+		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) ) {
+					return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
+		}
 
 		$post_status = ($publish) ? 'publish' : 'draft';
 
@@ -4505,11 +4779,13 @@ 
 		$post_data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
 
 		$post_ID = wp_insert_post($post_data);
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error(500, $post_ID->get_error_message());
+		if ( is_wp_error( $post_ID ) ) {
+					return new IXR_Error(500, $post_ID->get_error_message());
+		}
 
-		if ( !$post_ID )
-			return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+		if ( !$post_ID ) {
+					return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+		}
 
 		$this->attach_uploads( $post_ID, $post_content );
 
@@ -4623,24 +4899,28 @@ 
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.deletePost' );
 
 		$actual_post = get_post($post_ID,ARRAY_A);
 
-		if ( !$actual_post || $actual_post['post_type'] != 'post' )
-			return new IXR_Error(404, __('Sorry, no such post.'));
+		if ( !$actual_post || $actual_post['post_type'] != 'post' ) {
+					return new IXR_Error(404, __('Sorry, no such post.'));
+		}
 
-		if ( !current_user_can('delete_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
+		if ( !current_user_can('delete_post', $post_ID) ) {
+					return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
+		}
 
 		$result = wp_delete_post($post_ID);
 
-		if ( !$result )
-			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+		if ( !$result ) {
+					return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+		}
 
 		/**
 		 * Fires after a post has been successfully deleted via the XML-RPC Blogger API.
@@ -4705,8 +4985,9 @@ 
 		$content_struct = $args[3];
 		$publish        = isset( $args[4] ) ? $args[4] : 0;
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
@@ -4714,23 +4995,26 @@ 
 		$page_template = '';
 		if ( !empty( $content_struct['post_type'] ) ) {
 			if ( $content_struct['post_type'] == 'page' ) {
-				if ( $publish )
-					$cap  = 'publish_pages';
-				elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] )
-					$cap  = 'publish_pages';
-				else
-					$cap = 'edit_pages';
+				if ( $publish ) {
+									$cap  = 'publish_pages';
+				} elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] ) {
+									$cap  = 'publish_pages';
+				} else {
+									$cap = 'edit_pages';
+				}
 				$error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
 				$post_type = 'page';
-				if ( !empty( $content_struct['wp_page_template'] ) )
-					$page_template = $content_struct['wp_page_template'];
+				if ( !empty( $content_struct['wp_page_template'] ) ) {
+									$page_template = $content_struct['wp_page_template'];
+				}
 			} elseif ( $content_struct['post_type'] == 'post' ) {
-				if ( $publish )
-					$cap  = 'publish_posts';
-				elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] )
-					$cap  = 'publish_posts';
-				else
-					$cap = 'edit_posts';
+				if ( $publish ) {
+									$cap  = 'publish_posts';
+				} elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] ) {
+									$cap  = 'publish_posts';
+				} else {
+									$cap = 'edit_posts';
+				}
 				$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
 				$post_type = 'post';
 			} else {
@@ -4738,20 +5022,23 @@ 
 				return new IXR_Error( 401, __( 'Invalid post type' ) );
 			}
 		} else {
-			if ( $publish )
-				$cap  = 'publish_posts';
-			elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
-				$cap  = 'publish_posts';
-			else
-				$cap = 'edit_posts';
+			if ( $publish ) {
+							$cap  = 'publish_posts';
+			} elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status']) {
+							$cap  = 'publish_posts';
+			} else {
+							$cap = 'edit_posts';
+			}
 			$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
 			$post_type = 'post';
 		}
 
-		if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
-		if ( !current_user_can( $cap ) )
-			return new IXR_Error( 401, $error_message );
+		if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
+		}
+		if ( !current_user_can( $cap ) ) {
+					return new IXR_Error( 401, $error_message );
+		}
 
 		// Check for a valid post format if one was given
 		if ( isset( $content_struct['wp_post_format'] ) ) {
@@ -4764,20 +5051,24 @@ 
 		// Let WordPress generate the post_name (slug) unless
 		// one has been provided.
 		$post_name = "";
-		if ( isset($content_struct['wp_slug']) )
-			$post_name = $content_struct['wp_slug'];
+		if ( isset($content_struct['wp_slug']) ) {
+					$post_name = $content_struct['wp_slug'];
+		}
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
-			$post_password = $content_struct['wp_password'];
+		if ( isset($content_struct['wp_password']) ) {
+					$post_password = $content_struct['wp_password'];
+		}
 
 		// Only set a post parent if one was provided.
-		if ( isset($content_struct['wp_page_parent_id']) )
-			$post_parent = $content_struct['wp_page_parent_id'];
+		if ( isset($content_struct['wp_page_parent_id']) ) {
+					$post_parent = $content_struct['wp_page_parent_id'];
+		}
 
 		// Only set the menu_order if it was provided.
-		if ( isset($content_struct['wp_page_order']) )
-			$menu_order = $content_struct['wp_page_order'];
+		if ( isset($content_struct['wp_page_order']) ) {
+					$menu_order = $content_struct['wp_page_order'];
+		}
 
 		$post_author = $user->ID;
 
@@ -4785,19 +5076,22 @@ 
 		if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
 			switch ( $post_type ) {
 				case "post":
-					if ( !current_user_can( 'edit_others_posts' ) )
-						return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+					if ( !current_user_can( 'edit_others_posts' ) ) {
+											return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+					}
 					break;
 				case "page":
-					if ( !current_user_can( 'edit_others_pages' ) )
-						return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
+					if ( !current_user_can( 'edit_others_pages' ) ) {
+											return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
+					}
 					break;
 				default:
 					return new IXR_Error( 401, __( 'Invalid post type' ) );
 			}
 			$author = get_userdata( $content_struct['wp_author_id'] );
-			if ( ! $author )
-				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			if ( ! $author ) {
+							return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			}
 			$post_author = $content_struct['wp_author_id'];
 		}
 
@@ -4886,22 +5180,25 @@ 
 			$ping_status = get_default_comment_status( $post_type, 'pingback' );
 		}
 
-		if ( $post_more )
-			$post_content = $post_content . '<!--more-->' . $post_more;
+		if ( $post_more ) {
+					$post_content = $post_content . '<!--more-->' . $post_more;
+		}
 
 		$to_ping = null;
 		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
-				$to_ping = implode(' ', $to_ping);
+			if ( is_array($to_ping) ) {
+							$to_ping = implode(' ', $to_ping);
+			}
 		}
 
 		// Do some timestamp voodoo
-		if ( !empty( $content_struct['date_created_gmt'] ) )
-			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
+		if ( !empty( $content_struct['date_created_gmt'] ) ) {
+					// We know this is supposed to be GMT, so we're going to slap that Z on there by force
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
-			$dateCreated = $content_struct['dateCreated']->getIso();
+		} elseif ( !empty( $content_struct['dateCreated']) ) {
+					$dateCreated = $content_struct['dateCreated']->getIso();
+		}
 
 		if ( !empty( $dateCreated ) ) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
@@ -4936,12 +5233,14 @@ 
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
-			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		if ( isset($content_struct['custom_fields']) ) {
+					$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		}
 
 		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
-			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
-				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
+							return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			}
 
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
@@ -4954,15 +5253,18 @@ 
 
 		// Handle post formats if assigned, value is validated earlier
 		// in this function
-		if ( isset( $content_struct['wp_post_format'] ) )
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		if ( isset( $content_struct['wp_post_format'] ) ) {
+					set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		}
 
 		$post_ID = wp_insert_post( $postdata, true );
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error(500, $post_ID->get_error_message());
+		if ( is_wp_error( $post_ID ) ) {
+					return new IXR_Error(500, $post_ID->get_error_message());
+		}
 
-		if ( !$post_ID )
-			return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+		if ( !$post_ID ) {
+					return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+		}
 
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC MovableType API.
@@ -4994,8 +5296,9 @@ 
 					}
 				}
 			}
-			if ( ! $found )
-				add_post_meta( $post_ID, 'enclosure', $encstring );
+			if ( ! $found ) {
+							add_post_meta( $post_ID, 'enclosure', $encstring );
+			}
 		}
 	}
 
@@ -5016,8 +5319,9 @@ 
 		$attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
 		if ( is_array( $attachments ) ) {
 			foreach ( $attachments as $file ) {
-				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
-					$wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
+									$wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+				}
 			}
 		}
 	}
@@ -5047,8 +5351,9 @@ 
 		$content_struct = $args[3];
 		$publish        = isset( $args[4] ) ? $args[4] : 0;
 
-		if ( ! $user = $this->login($username, $password) )
-			return $this->error;
+		if ( ! $user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
@@ -5059,19 +5364,23 @@ 
 		 * If there is no post data for the give post id, stop now and return an error.
 		 * Otherwise a new post will be created (which was the old behavior).
 		 */
-		if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata || empty( $postdata[ 'ID' ] ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this post.' ) );
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this post.' ) );
+		}
 
 		// Use wp.editPost to edit post types other than post and page.
-		if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
-			return new IXR_Error( 401, __( 'Invalid post type' ) );
+		if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) ) {
+					return new IXR_Error( 401, __( 'Invalid post type' ) );
+		}
 
 		// Thwart attempt to change the post type.
-		if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) )
-			return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+		if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) ) {
+					return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+		}
 
 		// Check for a valid post format if one was given
 		if ( isset( $content_struct['wp_post_format'] ) ) {
@@ -5094,24 +5403,29 @@ 
 
 		// Let WordPress manage slug if none was provided.
 		$post_name = $postdata['post_name'];
-		if ( isset($content_struct['wp_slug']) )
-			$post_name = $content_struct['wp_slug'];
+		if ( isset($content_struct['wp_slug']) ) {
+					$post_name = $content_struct['wp_slug'];
+		}
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
-			$post_password = $content_struct['wp_password'];
+		if ( isset($content_struct['wp_password']) ) {
+					$post_password = $content_struct['wp_password'];
+		}
 
 		// Only set a post parent if one was given.
-		if ( isset($content_struct['wp_page_parent_id']) )
-			$post_parent = $content_struct['wp_page_parent_id'];
+		if ( isset($content_struct['wp_page_parent_id']) ) {
+					$post_parent = $content_struct['wp_page_parent_id'];
+		}
 
 		// Only set the menu_order if it was given.
-		if ( isset($content_struct['wp_page_order']) )
-			$menu_order = $content_struct['wp_page_order'];
+		if ( isset($content_struct['wp_page_order']) ) {
+					$menu_order = $content_struct['wp_page_order'];
+		}
 
 		$page_template = null;
-		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
-			$page_template = $content_struct['wp_page_template'];
+		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type ) {
+					$page_template = $content_struct['wp_page_template'];
+		}
 
 		$post_author = $postdata['post_author'];
 
@@ -5195,11 +5509,13 @@ 
 			}
 		}
 
-		if ( isset( $content_struct['title'] ) )
-			$post_title =  $content_struct['title'];
+		if ( isset( $content_struct['title'] ) ) {
+					$post_title =  $content_struct['title'];
+		}
 
-		if ( isset( $content_struct['description'] ) )
-			$post_content = $content_struct['description'];
+		if ( isset( $content_struct['description'] ) ) {
+					$post_content = $content_struct['description'];
+		}
 
 		$post_category = array();
 		if ( isset( $content_struct['categories'] ) ) {
@@ -5211,8 +5527,9 @@ 
 			}
 		}
 
-		if ( isset( $content_struct['mt_excerpt'] ) )
-			$post_excerpt =  $content_struct['mt_excerpt'];
+		if ( isset( $content_struct['mt_excerpt'] ) ) {
+					$post_excerpt =  $content_struct['mt_excerpt'];
+		}
 
 		$post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
 
@@ -5241,22 +5558,25 @@ 
 			}
 		}
 
-		if ( $post_more )
-			$post_content = $post_content . "<!--more-->" . $post_more;
+		if ( $post_more ) {
+					$post_content = $post_content . "<!--more-->" . $post_more;
+		}
 
 		$to_ping = null;
 		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
-				$to_ping = implode(' ', $to_ping);
+			if ( is_array($to_ping) ) {
+							$to_ping = implode(' ', $to_ping);
+			}
 		}
 
 		// Do some timestamp voodoo.
-		if ( !empty( $content_struct['date_created_gmt'] ) )
-			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
+		if ( !empty( $content_struct['date_created_gmt'] ) ) {
+					// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
-			$dateCreated = $content_struct['dateCreated']->getIso();
+		} elseif ( !empty( $content_struct['dateCreated']) ) {
+					$dateCreated = $content_struct['dateCreated']->getIso();
+		}
 
 		if ( !empty( $dateCreated ) ) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
@@ -5270,11 +5590,13 @@ 
 		$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
 
 		$result = wp_update_post($newpost, true);
-		if ( is_wp_error( $result ) )
-			return new IXR_Error(500, $result->get_error_message());
+		if ( is_wp_error( $result ) ) {
+					return new IXR_Error(500, $result->get_error_message());
+		}
 
-		if ( !$result )
-			return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+		if ( !$result ) {
+					return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+		}
 
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
@@ -5287,8 +5609,9 @@ 
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
-			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		if ( isset($content_struct['custom_fields']) ) {
+					$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		}
 
 		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
 
@@ -5296,8 +5619,9 @@ 
 			if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
 				delete_post_thumbnail( $post_ID );
 			} else {
-				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
-					return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
+									return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+				}
 			}
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
@@ -5309,8 +5633,9 @@ 
 		$this->attach_uploads( $ID, $post_content );
 
 		// Handle post formats if assigned, validation is handled earlier in this function.
-		if ( isset( $content_struct['wp_post_format'] ) )
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		if ( isset( $content_struct['wp_post_format'] ) ) {
+					set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		}
 
 		/**
 		 * Fires after a post has been successfully updated via the XML-RPC MovableType API.
@@ -5347,15 +5672,18 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		if ( !current_user_can( 'edit_post', $post_ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
@@ -5368,14 +5696,16 @@ 
 
 			$categories = array();
 			$catids = wp_get_post_categories($post_ID);
-			foreach($catids as $catid)
-				$categories[] = get_cat_name($catid);
+			foreach($catids as $catid) {
+							$categories[] = get_cat_name($catid);
+			}
 
 			$tagnames = array();
 			$tags = wp_get_post_tags( $post_ID );
 			if ( !empty( $tags ) ) {
-				foreach ( $tags as $tag )
-					$tagnames[] = $tag->name;
+				foreach ( $tags as $tag ) {
+									$tagnames[] = $tag->name;
+				}
 				$tagnames = implode( ', ', $tagnames );
 			} else {
 				$tagnames = '';
@@ -5391,17 +5721,20 @@ 
 			$allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $postdata['post_status'] === 'future' )
-				$postdata['post_status'] = 'publish';
+			if ( $postdata['post_status'] === 'future' ) {
+							$postdata['post_status'] = 'publish';
+			}
 
 			// Get post format
 			$post_format = get_post_format( $post_ID );
-			if ( empty( $post_format ) )
-				$post_format = 'standard';
+			if ( empty( $post_format ) ) {
+							$post_format = 'standard';
+			}
 
 			$sticky = false;
-			if ( is_sticky( $post_ID ) )
-				$sticky = true;
+			if ( is_sticky( $post_ID ) ) {
+							$sticky = true;
+			}
 
 			$enclosure = array();
 			foreach ( (array) get_post_custom($post_ID) as $key => $val) {
@@ -5446,7 +5779,9 @@ 
 				'date_modified_gmt' => $post_modified_gmt
 			);
 
-			if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure;
+			if ( !empty($enclosure) ) {
+				$resp['enclosure'] = $enclosure;
+			}
 
 			$resp['wp_post_thumbnail'] = get_post_thumbnail_id( $postdata['ID'] );
 
@@ -5476,29 +5811,34 @@ 
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
-			$query = array( 'numberposts' => absint( $args[3] ) );
-		else
-			$query = array();
+		if ( isset( $args[3] ) ) {
+					$query = array( 'numberposts' => absint( $args[3] ) );
+		} else {
+					$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( ! current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		if ( ! current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts' );
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( !$posts_list )
-			return array();
+		if ( !$posts_list ) {
+					return array();
+		}
 
 		$recent_posts = array();
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
-				continue;
+			if ( !current_user_can( 'edit_post', $entry['ID'] ) ) {
+							continue;
+			}
 
 			$post_date = $this->_convert_date( $entry['post_date'] );
 			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
@@ -5507,8 +5847,9 @@ 
 
 			$categories = array();
 			$catids = wp_get_post_categories($entry['ID']);
-			foreach( $catids as $catid )
-				$categories[] = get_cat_name($catid);
+			foreach( $catids as $catid ) {
+							$categories[] = get_cat_name($catid);
+			}
 
 			$tagnames = array();
 			$tags = wp_get_post_tags( $entry['ID'] );
@@ -5531,13 +5872,15 @@ 
 			$allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $entry['post_status'] === 'future' )
-				$entry['post_status'] = 'publish';
+			if ( $entry['post_status'] === 'future' ) {
+							$entry['post_status'] = 'publish';
+			}
 
 			// Get post format
 			$post_format = get_post_format( $entry['ID'] );
-			if ( empty( $post_format ) )
-				$post_format = 'standard';
+			if ( empty( $post_format ) ) {
+							$post_format = 'standard';
+			}
 
 			$recent_posts[] = array(
 				'dateCreated' => $post_date,
@@ -5594,11 +5937,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getCategories' );
@@ -5655,8 +6000,9 @@ 
 		$type = $data['type'];
 		$bits = $data['bits'];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
@@ -5708,8 +6054,9 @@ 
 		if ( ! empty( $data['post_id'] ) ) {
 			$post_id = (int) $data['post_id'];
 
-			if ( ! current_user_can( 'edit_post', $post_id ) )
-				return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+							return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+			}
 		}
 		$attachment = array(
 			'post_title' => $name,
@@ -5769,13 +6116,15 @@ 
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
-			$query = array( 'numberposts' => absint( $args[3] ) );
-		else
-			$query = array();
+		if ( isset( $args[3] ) ) {
+					$query = array( 'numberposts' => absint( $args[3] ) );
+		} else {
+					$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles' );
@@ -5790,8 +6139,9 @@ 
 		$recent_posts = array();
 
 		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
-				continue;
+			if ( !current_user_can( 'edit_post', $entry['ID'] ) ) {
+							continue;
+			}
 
 			$post_date = $this->_convert_date( $entry['post_date'] );
 			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
@@ -5829,11 +6179,13 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
-			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		if ( !current_user_can( 'edit_posts' ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getCategoryList' );
@@ -5874,14 +6226,17 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
-		if ( ! get_post( $post_ID ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post( $post_ID ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) );
+		if ( !current_user_can( 'edit_post', $post_ID ) ) {
+					return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getPostCategories' );
@@ -5925,17 +6280,20 @@ 
 		$password   = $args[2];
 		$categories = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.setPostCategories' );
 
-		if ( ! get_post( $post_ID ) )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! get_post( $post_ID ) ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can('edit_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
+		if ( !current_user_can('edit_post', $post_ID) ) {
+					return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
+		}
 
 		$catids = array();
 		foreach ( $categories as $cat ) {
@@ -5998,13 +6356,15 @@ 
 
 		$actual_post = get_post($post_ID, ARRAY_A);
 
-		if ( !$actual_post )
-			return new IXR_Error(404, __('Sorry, no such post.'));
+		if ( !$actual_post ) {
+					return new IXR_Error(404, __('Sorry, no such post.'));
+		}
 
 		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
 
-		if ( !$comments )
-			return array();
+		if ( !$comments ) {
+					return array();
+		}
 
 		$trackback_pings = array();
 		foreach ( $comments as $comment ) {
@@ -6043,18 +6403,21 @@ 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
-			return $this->error;
+		if ( !$user = $this->login($username, $password) ) {
+					return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.publishPost' );
 
 		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
-			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		if ( ! $postdata ) {
+					return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you cannot publish this post.'));
+		if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) ) {
+					return new IXR_Error(401, __('Sorry, you cannot publish this post.'));
+		}
 
 		$postdata['post_status'] = 'publish';
 
@@ -6108,13 +6471,15 @@ 
 		 */
 		$pagelinkedfrom = apply_filters( 'pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto );
 
-		if ( ! $pagelinkedfrom )
-			return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
+		if ( ! $pagelinkedfrom ) {
+					return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
+		}
 
 		// Check if the page linked to is in our site
 		$pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
-		if ( !$pos1 )
-			return $this->pingback_error( 0, __( 'Is there no link to us?' ) );
+		if ( !$pos1 ) {
+					return $this->pingback_error( 0, __( 'Is there no link to us?' ) );
+		}
 
 		// let's find which post is linked to
 		// FIXME: does url_to_postid() cover all these cases already?
@@ -6155,19 +6520,24 @@ 
 
 		$post = get_post($post_ID);
 
-		if ( !$post ) // Post_ID not found
+		if ( !$post ) {
+			// Post_ID not found
 	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		}
 
-		if ( $post_ID == url_to_postid($pagelinkedfrom) )
-			return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
+		if ( $post_ID == url_to_postid($pagelinkedfrom) ) {
+					return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
+		}
 
 		// Check if pings are on
-		if ( !pings_open($post) )
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		if ( !pings_open($post) ) {
+			  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		}
 
 		// Let's check that the remote site didn't already pingback this entry
-		if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
-			return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+		if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) ) {
+					return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+		}
 
 		// very stupid, but gives time to the 'from' server to publish !
 		sleep(1);
@@ -6190,8 +6560,9 @@ 
 		$request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
 		$linea = wp_remote_retrieve_body( $request );
 
-		if ( !$linea )
-			return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+		if ( !$linea ) {
+					return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+		}
 
 		/**
 		 * Filter the pingback remote source.
@@ -6210,8 +6581,9 @@ 
 
 		preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
 		$title = $matchtitle[1];
-		if ( empty( $title ) )
-			return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
+		if ( empty( $title ) ) {
+					return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
+		}
 
 		$linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
 
@@ -6224,16 +6596,18 @@ 
 				preg_match("|<a[^>]+?".$preg_target."[^>]*>([^>]+?)</a>|", $para, $context);
 
 				// If the URL isn't in a link context, keep looking
-				if ( empty($context) )
-					continue;
+				if ( empty($context) ) {
+									continue;
+				}
 
 				// We're going to use this fake tag to mark the context in a bit
 				// the marker is needed in case the link text appears more than once in the paragraph
 				$excerpt = preg_replace('|\</?wpcontext\>|', '', $para);
 
 				// prevent really long link text
-				if ( strlen($context[1]) > 100 )
-					$context[1] = substr($context[1], 0, 100) . '&#8230;';
+				if ( strlen($context[1]) > 100 ) {
+									$context[1] = substr($context[1], 0, 100) . '&#8230;';
+				}
 
 				$marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
 				$excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
@@ -6246,8 +6620,10 @@ 
 			}
 		}
 
-		if ( empty($context) ) // Link to target not found
+		if ( empty($context) ) {
+			// Link to target not found
 			return $this->pingback_error( 17, __( 'The source URL does not contain a link to the target URL, and so cannot be used as a source.' ) );
+		}
 
 		$pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
 
@@ -6314,13 +6690,15 @@ 
 
 		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
 
-		if ( !$comments )
-			return array();
+		if ( !$comments ) {
+					return array();
+		}
 
 		$pingbacks = array();
 		foreach ( $comments as $comment ) {
-			if ( 'pingback' == $comment->comment_type )
-				$pingbacks[] = $comment->comment_author_url;
+			if ( 'pingback' == $comment->comment_type ) {
+							$pingbacks[] = $comment->comment_author_url;
+			}
 		}
 
 		return $pingbacks;

src/wp-includes/option.php

Indentation +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Option API
- *
- * @package WordPress
- * @subpackage Option
- */
+	 * Option API
+	 *
+	 * @package WordPress
+	 * @subpackage Option
+	 */
 
 /**
  * Retrieve option value based on name of option.
@@ -596,19 +596,19 @@ 
 function get_transient( $transient ) {
 
  	/**
-	 * Filter the value of an existing transient.
-	 *
-	 * The dynamic portion of the hook name, `$transient`, refers to the transient name.
-	 *
-	 * Passing a truthy value to the filter will effectively short-circuit retrieval
-	 * of the transient, returning the passed value instead.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param mixed $pre_transient The default value to return if the transient does not exist.
-	 *                             Any value other than false will short-circuit the retrieval
-	 *                             of the transient, and return the returned value.
-	 */
+ 	 * Filter the value of an existing transient.
+ 	 *
+ 	 * The dynamic portion of the hook name, `$transient`, refers to the transient name.
+ 	 *
+ 	 * Passing a truthy value to the filter will effectively short-circuit retrieval
+ 	 * of the transient, returning the passed value instead.
+ 	 *
+ 	 * @since 2.8.0
+ 	 *
+ 	 * @param mixed $pre_transient The default value to return if the transient does not exist.
+ 	 *                             Any value other than false will short-circuit the retrieval
+ 	 *                             of the transient, and return the returned value.
+ 	 */
 	$pre = apply_filters( 'pre_transient_' . $transient, false );
 	if ( false !== $pre )
 		return $pre;

Spacing +334 added lines, -334 removed lines

@@ -24,11 +24,11 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_option( $option, $default = false ) {
+function get_option($option, $default = false) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
 	/**
@@ -44,17 +44,17 @@ 
 	 * @param bool|mixed $pre_option Value to return instead of the option value.
 	 *                               Default false to skip it.
 	 */
-	$pre = apply_filters( 'pre_option_' . $option, false );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_option_'.$option, false);
+	if (false !== $pre)
 		return $pre;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
+	if (defined('WP_SETUP_CONFIG'))
 		return false;
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
+	if ( ! defined('WP_INSTALLING')) {
 		// prevent non-existent options from triggering multiple queries
-		$notoptions = wp_cache_get( 'notoptions', 'options' );
-		if ( isset( $notoptions[ $option ] ) ) {
+		$notoptions = wp_cache_get('notoptions', 'options');
+		if (isset($notoptions[$option])) {
 			/**
 			 * Filter the default value for an option.
 			 *
@@ -65,53 +65,53 @@ 
 			 * @param mixed $default The default value to return if the option does not exist
 			 *                       in the database.
 			 */
-			return apply_filters( 'default_option_' . $option, $default );
+			return apply_filters('default_option_'.$option, $default);
 		}
 
 		$alloptions = wp_load_alloptions();
 
-		if ( isset( $alloptions[$option] ) ) {
+		if (isset($alloptions[$option])) {
 			$value = $alloptions[$option];
 		} else {
-			$value = wp_cache_get( $option, 'options' );
+			$value = wp_cache_get($option, 'options');
 
-			if ( false === $value ) {
-				$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
+			if (false === $value) {
+				$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
 
 				// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-				if ( is_object( $row ) ) {
+				if (is_object($row)) {
 					$value = $row->option_value;
-					wp_cache_add( $option, $value, 'options' );
+					wp_cache_add($option, $value, 'options');
 				} else { // option does not exist, so we must cache its non-existence
-					if ( ! is_array( $notoptions ) ) {
+					if ( ! is_array($notoptions)) {
 						 $notoptions = array();
 					}
 					$notoptions[$option] = true;
-					wp_cache_set( 'notoptions', $notoptions, 'options' );
+					wp_cache_set('notoptions', $notoptions, 'options');
 
 					/** This filter is documented in wp-includes/option.php */
-					return apply_filters( 'default_option_' . $option, $default );
+					return apply_filters('default_option_'.$option, $default);
 				}
 			}
 		}
 	} else {
 		$suppress = $wpdb->suppress_errors();
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
-		$wpdb->suppress_errors( $suppress );
-		if ( is_object( $row ) ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
+		$wpdb->suppress_errors($suppress);
+		if (is_object($row)) {
 			$value = $row->option_value;
 		} else {
 			/** This filter is documented in wp-includes/option.php */
-			return apply_filters( 'default_option_' . $option, $default );
+			return apply_filters('default_option_'.$option, $default);
 		}
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ('home' == $option && '' == $value)
+		return get_option('siteurl');
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if (in_array($option, array('siteurl', 'home', 'category_base', 'tag_base')))
+		$value = untrailingslashit($value);
 
 	/**
 	 * Filter the value of an existing option.
@@ -124,7 +124,7 @@ 
 	 * @param mixed $value Value of the option. If stored serialized, it will be
 	 *                     unserialized prior to being returned.
 	 */
-	return apply_filters( 'option_' . $option, maybe_unserialize( $value ) );
+	return apply_filters('option_'.$option, maybe_unserialize($value));
 }
 
 /**
@@ -137,9 +137,9 @@ 
  *
  * @param string $option Option name.
  */
-function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+function wp_protect_special_option($option) {
+	if ('alloptions' === $option || 'notoptions' === $option)
+		wp_die(sprintf(__('%s is a protected WP option and may not be modified'), esc_html($option)));
 }
 
 /**
@@ -149,8 +149,8 @@ 
  *
  * @param string $option Option name.
  */
-function form_option( $option ) {
-	echo esc_attr( get_option( $option ) );
+function form_option($option) {
+	echo esc_attr(get_option($option));
 }
 
 /**
@@ -165,22 +165,22 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
+	if ( ! defined('WP_INSTALLING') || ! is_multisite())
+		$alloptions = wp_cache_get('alloptions', 'options');
 	else
 		$alloptions = false;
 
-	if ( !$alloptions ) {
+	if ( ! $alloptions) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( ! $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'"))
+			$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
-		foreach ( (array) $alloptions_db as $o ) {
+		foreach ((array) $alloptions_db as $o) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( ! defined('WP_INSTALLING') || ! is_multisite())
+			wp_cache_add('alloptions', $alloptions, 'options');
 	}
 
 	return $alloptions;
@@ -195,26 +195,26 @@ 
  *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
-function wp_load_core_site_options( $site_id = null ) {
+function wp_load_core_site_options($site_id = null) {
 	global $wpdb;
 
-	if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
+	if ( ! is_multisite() || wp_using_ext_object_cache() || defined('WP_INSTALLING'))
 		return;
 
-	if ( empty($site_id) )
+	if (empty($site_id))
 		$site_id = $wpdb->siteid;
 
-	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
+	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting');
 
-	$core_options_in = "'" . implode("', '", $core_options) . "'";
-	$options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
+	$core_options_in = "'".implode("', '", $core_options)."'";
+	$options = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id));
 
-	foreach ( $options as $option ) {
+	foreach ($options as $option) {
 		$key = $option->meta_key;
 		$cache_key = "{$site_id}:$key";
-		$option->meta_value = maybe_unserialize( $option->meta_value );
+		$option->meta_value = maybe_unserialize($option->meta_value);
 
-		wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+		wp_cache_set($cache_key, $option->meta_value, 'site-options');
 	}
 }
 
@@ -241,20 +241,20 @@ 
  *                              the default value is 'yes'. Default null.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_option( $option, $value, $autoload = null ) {
+function update_option($option, $value, $autoload = null) {
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object( $value ) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
-	$old_value = get_option( $option );
+	$value = sanitize_option($option, $value);
+	$old_value = get_option($option);
 
 	/**
 	 * Filter a specific option before its value is (maybe) serialized and updated.
@@ -266,7 +266,7 @@ 
 	 * @param mixed $value     The new, unserialized option value.
 	 * @param mixed $old_value The old option value.
 	 */
-	$value = apply_filters( 'pre_update_option_' . $option, $value, $old_value );
+	$value = apply_filters('pre_update_option_'.$option, $value, $old_value);
 
 	/**
 	 * Filter an option before its value is (maybe) serialized and updated.
@@ -277,23 +277,23 @@ 
 	 * @param string $option    Name of the option.
 	 * @param mixed  $old_value The old option value.
 	 */
-	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
+	$value = apply_filters('pre_update_option', $value, $option, $old_value);
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
+	if ($value === $old_value)
 		return false;
 
 	/** This filter is documented in wp-includes/option.php */
-	if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
+	if (apply_filters('default_option_'.$option, false) === $old_value) {
 		// Default setting for new options is 'yes'.
-		if ( null === $autoload ) {
+		if (null === $autoload) {
 			$autoload = 'yes';
 		}
 
-		return add_option( $option, $value, '', $autoload );
+		return add_option($option, $value, '', $autoload);
 	}
 
-	$serialized_value = maybe_serialize( $value );
+	$serialized_value = maybe_serialize($value);
 
 	/**
 	 * Fires immediately before an option value is updated.
@@ -304,33 +304,33 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'update_option', $option, $old_value, $value );
+	do_action('update_option', $option, $old_value, $value);
 
 	$update_args = array(
 		'option_value' => $serialized_value,
 	);
 
-	if ( null !== $autoload ) {
-		$update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	if (null !== $autoload) {
+		$update_args['autoload'] = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 	}
 
-	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
+	$result = $wpdb->update($wpdb->options, $update_args, array('option_name' => $option));
+	if ( ! $result)
 		return false;
 
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
+	if ( ! defined('WP_INSTALLING')) {
 		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$option] ) ) {
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+		if (isset($alloptions[$option])) {
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
@@ -344,7 +344,7 @@ 
 	 * @param mixed $old_value The old option value.
 	 * @param mixed $value     The new option value.
 	 */
-	do_action( "update_option_{$option}", $old_value, $value );
+	do_action("update_option_{$option}", $old_value, $value);
 
 	/**
 	 * Fires after the value of an option has been successfully updated.
@@ -355,7 +355,7 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'updated_option', $option, $old_value, $value );
+	do_action('updated_option', $option, $old_value, $value);
 	return true;
 }
 
@@ -382,32 +382,32 @@ 
  *                                    Default is enabled. Accepts 'no' to disable for legacy reasons.
  * @return bool False if option was not added and true if option was added.
  */
-function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
+function add_option($option, $value = '', $deprecated = '', $autoload = 'yes') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.3');
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object($value) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
+	$value = sanitize_option($option, $value);
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if ( ! is_array($notoptions) || ! isset($notoptions[$option]))
 		/** This filter is documented in wp-includes/option.php */
-		if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) )
+		if (apply_filters('default_option_'.$option, false) !== get_option($option))
 			return false;
 
-	$serialized_value = maybe_serialize( $value );
-	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	$serialized_value = maybe_serialize($value);
+	$autoload = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 
 	/**
 	 * Fires before an option is added.
@@ -417,27 +417,27 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'add_option', $option, $value );
+	do_action('add_option', $option, $value);
 
-	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
+	$result = $wpdb->query($wpdb->prepare("INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload));
+	if ( ! $result)
 		return false;
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		if ( 'yes' == $autoload ) {
+	if ( ! defined('WP_INSTALLING')) {
+		if ('yes' == $autoload) {
 			$alloptions = wp_load_alloptions();
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
 	// This option exists now
-	$notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options'); // yes, again... we need it to be fresh
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
 	/**
@@ -451,7 +451,7 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( "add_option_{$option}", $option, $value );
+	do_action("add_option_{$option}", $option, $value);
 
 	/**
 	 * Fires after an option has been added.
@@ -461,7 +461,7 @@ 
 	 * @param string $option Name of the added option.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'added_option', $option, $value );
+	do_action('added_option', $option, $value);
 	return true;
 }
 
@@ -475,18 +475,18 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_option( $option ) {
+function delete_option($option) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	// Get the ID, if no ID then return
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option));
+	if (is_null($row))
 		return false;
 
 	/**
@@ -496,21 +496,21 @@ 
 	 *
 	 * @param string $option Name of the option to delete.
 	 */
-	do_action( 'delete_option', $option );
+	do_action('delete_option', $option);
 
-	$result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		if ( 'yes' == $row->autoload ) {
+	$result = $wpdb->delete($wpdb->options, array('option_name' => $option));
+	if ( ! defined('WP_INSTALLING')) {
+		if ('yes' == $row->autoload) {
 			$alloptions = wp_load_alloptions();
-			if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
-				unset( $alloptions[$option] );
-				wp_cache_set( 'alloptions', $alloptions, 'options' );
+			if (is_array($alloptions) && isset($alloptions[$option])) {
+				unset($alloptions[$option]);
+				wp_cache_set('alloptions', $alloptions, 'options');
 			}
 		} else {
-			wp_cache_delete( $option, 'options' );
+			wp_cache_delete($option, 'options');
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific option has been deleted.
@@ -521,7 +521,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( "delete_option_$option", $option );
+		do_action("delete_option_$option", $option);
 
 		/**
 		 * Fires after an option has been deleted.
@@ -530,7 +530,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( 'deleted_option', $option );
+		do_action('deleted_option', $option);
 		return true;
 	}
 	return false;
@@ -544,7 +544,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool true if successful, false otherwise
  */
-function delete_transient( $transient ) {
+function delete_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific transient is deleted.
@@ -555,19 +555,19 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_transient_' . $transient, $transient );
+	do_action('delete_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'transient');
 	} else {
-		$option_timeout = '_transient_timeout_' . $transient;
-		$option = '_transient_' . $transient;
-		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		$option_timeout = '_transient_timeout_'.$transient;
+		$option = '_transient_'.$transient;
+		$result = delete_option($option);
+		if ($result)
+			delete_option($option_timeout);
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -576,7 +576,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_transient', $transient );
+		do_action('deleted_transient', $transient);
 	}
 
 	return $result;
@@ -593,7 +593,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_transient( $transient ) {
+function get_transient($transient) {
 
  	/**
 	 * Filter the value of an existing transient.
@@ -609,30 +609,30 @@ 
 	 *                             Any value other than false will short-circuit the retrieval
 	 *                             of the transient, and return the returned value.
 	 */
-	$pre = apply_filters( 'pre_transient_' . $transient, false );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_transient_'.$transient, false);
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'transient');
 	} else {
-		$transient_option = '_transient_' . $transient;
-		if ( ! defined( 'WP_INSTALLING' ) ) {
+		$transient_option = '_transient_'.$transient;
+		if ( ! defined('WP_INSTALLING')) {
 			// If option is not in alloptions, it is not autoloaded and thus has a timeout
 			$alloptions = wp_load_alloptions();
-			if ( !isset( $alloptions[$transient_option] ) ) {
-				$transient_timeout = '_transient_timeout_' . $transient;
-				$timeout = get_option( $transient_timeout );
-				if ( false !== $timeout && $timeout < time() ) {
-					delete_option( $transient_option  );
-					delete_option( $transient_timeout );
+			if ( ! isset($alloptions[$transient_option])) {
+				$transient_timeout = '_transient_timeout_'.$transient;
+				$timeout = get_option($transient_timeout);
+				if (false !== $timeout && $timeout < time()) {
+					delete_option($transient_option);
+					delete_option($transient_timeout);
 					$value = false;
 				}
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_option($transient_option);
 	}
 
 	/**
@@ -644,7 +644,7 @@ 
 	 *
 	 * @param mixed $value Value of transient.
 	 */
-	return apply_filters( 'transient_' . $transient, $value );
+	return apply_filters('transient_'.$transient, $value);
 }
 
 /**
@@ -662,7 +662,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0.
  * @return bool False if value was not set and true if value was set.
  */
-function set_transient( $transient, $value, $expiration = 0 ) {
+function set_transient($transient, $value, $expiration = 0) {
 
 	$expiration = (int) $expiration;
 
@@ -677,41 +677,41 @@ 
 	 * @param mixed $value      New value of transient.
 	 * @param int   $expiration Time until expiration in seconds.
 	 */
-	$value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration );
+	$value = apply_filters('pre_set_transient_'.$transient, $value, $expiration);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'transient', $expiration);
 	} else {
-		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient = '_transient_' . $transient;
-		if ( false === get_option( $transient ) ) {
+		$transient_timeout = '_transient_timeout_'.$transient;
+		$transient = '_transient_'.$transient;
+		if (false === get_option($transient)) {
 			$autoload = 'yes';
-			if ( $expiration ) {
+			if ($expiration) {
 				$autoload = 'no';
-				add_option( $transient_timeout, time() + $expiration, '', 'no' );
+				add_option($transient_timeout, time() + $expiration, '', 'no');
 			}
-			$result = add_option( $transient, $value, '', $autoload );
+			$result = add_option($transient, $value, '', $autoload);
 		} else {
 			// If expiration is requested, but the transient has no timeout option,
 			// delete, then re-create transient rather than update.
 			$update = true;
-			if ( $expiration ) {
-				if ( false === get_option( $transient_timeout ) ) {
-					delete_option( $transient );
-					add_option( $transient_timeout, time() + $expiration, '', 'no' );
-					$result = add_option( $transient, $value, '', 'no' );
+			if ($expiration) {
+				if (false === get_option($transient_timeout)) {
+					delete_option($transient);
+					add_option($transient_timeout, time() + $expiration, '', 'no');
+					$result = add_option($transient, $value, '', 'no');
 					$update = false;
 				} else {
-					update_option( $transient_timeout, time() + $expiration );
+					update_option($transient_timeout, time() + $expiration);
 				}
 			}
-			if ( $update ) {
-				$result = update_option( $transient, $value );
+			if ($update) {
+				$result = update_option($transient, $value);
 			}
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific transient has been set.
@@ -723,7 +723,7 @@ 
 		 * @param mixed $value      Transient value.
 		 * @param int   $expiration Time until expiration in seconds. Default 0.
 		 */
-		do_action( 'set_transient_' . $transient, $value, $expiration );
+		do_action('set_transient_'.$transient, $value, $expiration);
 
 		/**
 		 * Fires after the value for a transient has been set.
@@ -734,7 +734,7 @@ 
 		 * @param mixed  $value      Transient value.
 		 * @param int    $expiration Time until expiration in seconds. Default 0.
 		 */
-		do_action( 'setted_transient', $transient, $value, $expiration );
+		do_action('setted_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }
@@ -750,43 +750,43 @@ 
  */
 function wp_user_settings() {
 
-	if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+	if ( ! is_admin() || defined('DOING_AJAX')) {
 		return;
 	}
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
-	$settings = (string) get_user_option( 'user-settings', $user_id );
+	$settings = (string) get_user_option('user-settings', $user_id);
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
 		// No change or both empty
-		if ( $cookie == $settings )
+		if ($cookie == $settings)
 			return;
 
-		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
-		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
+		$last_saved = (int) get_user_option('user-settings-time', $user_id);
+		$current = isset($_COOKIE['wp-settings-time-'.$user_id]) ? preg_replace('/[^0-9]/', '', $_COOKIE['wp-settings-time-'.$user_id]) : 0;
 
 		// The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
-		if ( $current > $last_saved ) {
-			update_user_option( $user_id, 'user-settings', $cookie, false );
-			update_user_option( $user_id, 'user-settings-time', time() - 5, false );
+		if ($current > $last_saved) {
+			update_user_option($user_id, 'user-settings', $cookie, false);
+			update_user_option($user_id, 'user-settings-time', time() - 5, false);
 			return;
 		}
 	}
 
 	// The cookie is not set in the current browser or the saved value is newer.
-	$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) );
-	setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	$_COOKIE['wp-settings-' . $user_id] = $settings;
+	$secure = ('https' === parse_url(site_url(), PHP_URL_SCHEME));
+	setcookie('wp-settings-'.$user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	setcookie('wp-settings-time-'.$user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	$_COOKIE['wp-settings-'.$user_id] = $settings;
 }
 
 /**
@@ -798,10 +798,10 @@ 
  * @param string $default Optional default value to return when $name is not set.
  * @return mixed the last saved user setting or the default value/false if it doesn't exist.
  */
-function get_user_setting( $name, $default = false ) {
+function get_user_setting($name, $default = false) {
 	$all_user_settings = get_all_user_settings();
 
-	return isset( $all_user_settings[$name] ) ? $all_user_settings[$name] : $default;
+	return isset($all_user_settings[$name]) ? $all_user_settings[$name] : $default;
 }
 
 /**
@@ -816,15 +816,15 @@ 
  * @param string $value The value for the setting.
  * @return bool|void true if set successfully/false if not.
  */
-function set_user_setting( $name, $value ) {
-	if ( headers_sent() ) {
+function set_user_setting($name, $value) {
+	if (headers_sent()) {
 		return false;
 	}
 
 	$all_user_settings = get_all_user_settings();
 	$all_user_settings[$name] = $value;
 
-	return wp_set_all_user_settings( $all_user_settings );
+	return wp_set_all_user_settings($all_user_settings);
 }
 
 /**
@@ -838,8 +838,8 @@ 
  * @param string $names The name or array of names of the setting to be deleted.
  * @return bool|void true if deleted successfully/false if not.
  */
-function delete_user_setting( $names ) {
-	if ( headers_sent() ) {
+function delete_user_setting($names) {
+	if (headers_sent()) {
 		return false;
 	}
 
@@ -847,15 +847,15 @@ 
 	$names = (array) $names;
 	$deleted = false;
 
-	foreach ( $names as $name ) {
-		if ( isset( $all_user_settings[$name] ) ) {
-			unset( $all_user_settings[$name] );
+	foreach ($names as $name) {
+		if (isset($all_user_settings[$name])) {
+			unset($all_user_settings[$name]);
 			$deleted = true;
 		}
 	}
 
-	if ( $deleted ) {
-		return wp_set_all_user_settings( $all_user_settings );
+	if ($deleted) {
+		return wp_set_all_user_settings($all_user_settings);
 	}
 
 	return false;
@@ -873,27 +873,27 @@ 
 function get_all_user_settings() {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return array();
 	}
 
-	if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) ) {
+	if (isset($_updated_user_settings) && is_array($_updated_user_settings)) {
 		return $_updated_user_settings;
 	}
 
 	$user_settings = array();
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
-		if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
-			parse_str( $cookie, $user_settings );
+		if (strpos($cookie, '=')) { // '=' cannot be 1st char
+			parse_str($cookie, $user_settings);
 		}
 	} else {
-		$option = get_user_option( 'user-settings', $user_id );
+		$option = get_user_option('user-settings', $user_id);
 
-		if ( $option && is_string( $option ) ) {
-			parse_str( $option, $user_settings );
+		if ($option && is_string($option)) {
+			parse_str($option, $user_settings);
 		}
 	}
 
@@ -911,32 +911,32 @@ 
  * @param array $user_settings
  * @return bool|void
  */
-function wp_set_all_user_settings( $user_settings ) {
+function wp_set_all_user_settings($user_settings) {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return false;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
 	$settings = '';
-	foreach ( $user_settings as $name => $value ) {
-		$_name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name );
-		$_value = preg_replace( '/[^A-Za-z0-9_]+/', '', $value );
+	foreach ($user_settings as $name => $value) {
+		$_name = preg_replace('/[^A-Za-z0-9_]+/', '', $name);
+		$_value = preg_replace('/[^A-Za-z0-9_]+/', '', $value);
 
-		if ( ! empty( $_name ) ) {
-			$settings .= $_name . '=' . $_value . '&';
+		if ( ! empty($_name)) {
+			$settings .= $_name.'='.$_value.'&';
 		}
 	}
 
-	$settings = rtrim( $settings, '&' );
-	parse_str( $settings, $_updated_user_settings );
+	$settings = rtrim($settings, '&');
+	parse_str($settings, $_updated_user_settings);
 
-	update_user_option( $user_id, 'user-settings', $settings, false );
-	update_user_option( $user_id, 'user-settings-time', time(), false );
+	update_user_option($user_id, 'user-settings', $settings, false);
+	update_user_option($user_id, 'user-settings-time', time(), false);
 
 	return true;
 }
@@ -947,12 +947,12 @@ 
  * @since 2.7.0
  */
 function delete_all_user_settings() {
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	update_user_option( $user_id, 'user-settings', '', false );
-	setcookie( 'wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+	update_user_option($user_id, 'user-settings', '', false);
+	setcookie('wp-settings-'.$user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
 }
 
 /**
@@ -969,7 +969,7 @@ 
  * @param bool   $use_cache Whether to use cache. Multisite only. Default true.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $use_cache = true ) {
+function get_site_option($option, $default = false, $use_cache = true) {
 	global $wpdb;
 
 	/**
@@ -985,16 +985,16 @@ 
 	 *
 	 * @param mixed $pre_option The default value to return if the option does not exist.
 	 */
- 	$pre = apply_filters( 'pre_site_option_' . $option, false );
+ 	$pre = apply_filters('pre_site_option_'.$option, false);
 
- 	if ( false !== $pre )
+ 	if (false !== $pre)
  		return $pre;
 
 	// prevent non-existent options from triggering multiple queries
 	$notoptions_key = "{$wpdb->siteid}:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
 
-	if ( isset( $notoptions[$option] ) ) {
+	if (isset($notoptions[$option])) {
 
 		/**
 		 * Filter a specific default site option.
@@ -1006,36 +1006,36 @@ 
 		 * @param mixed $default The value to return if the site option does not exist
 		 *                       in the database.
 		 */
-		return apply_filters( 'default_site_option_' . $option, $default );
+		return apply_filters('default_site_option_'.$option, $default);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default );
+		$default = apply_filters('default_site_option_'.$option, $default);
 		$value = get_option($option, $default);
 	} else {
 		$cache_key = "{$wpdb->siteid}:$option";
-		if ( $use_cache )
+		if ($use_cache)
 			$value = wp_cache_get($cache_key, 'site-options');
 
-		if ( !isset($value) || (false === $value) ) {
-			$row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
+		if ( ! isset($value) || (false === $value)) {
+			$row = $wpdb->get_row($wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid));
 
 			// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-			if ( is_object( $row ) ) {
+			if (is_object($row)) {
 				$value = $row->meta_value;
-				$value = maybe_unserialize( $value );
-				wp_cache_set( $cache_key, $value, 'site-options' );
+				$value = maybe_unserialize($value);
+				wp_cache_set($cache_key, $value, 'site-options');
 			} else {
-				if ( ! is_array( $notoptions ) ) {
+				if ( ! is_array($notoptions)) {
 					 $notoptions = array();
 				}
 				$notoptions[$option] = true;
-				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+				wp_cache_set($notoptions_key, $notoptions, 'site-options');
 
 				/** This filter is documented in wp-includes/option.php */
-				$value = apply_filters( 'default_site_option_' . $option, $default );
+				$value = apply_filters('default_site_option_'.$option, $default);
 			}
 		}
 	}
@@ -1050,7 +1050,7 @@ 
 	 *
 	 * @param mixed $value Value of site option.
 	 */
- 	return apply_filters( 'site_option_' . $option, $value );
+ 	return apply_filters('site_option_'.$option, $value);
 }
 
 /**
@@ -1068,10 +1068,10 @@ 
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_site_option( $option, $value ) {
+function add_site_option($option, $value) {
 	global $wpdb;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	/**
 	 * Filter the value of a specific site option before it is added.
@@ -1083,40 +1083,40 @@ 
 	 *
 	 * @param mixed $value Value of site option.
 	 */
-	$value = apply_filters( 'pre_add_site_option_' . $option, $value );
+	$value = apply_filters('pre_add_site_option_'.$option, $value);
 
 	$notoptions_key = "{$wpdb->siteid}:notoptions";
 
-	if ( !is_multisite() ) {
-		$result = add_option( $option, $value );
+	if ( ! is_multisite()) {
+		$result = add_option($option, $value);
 	} else {
 		$cache_key = "{$wpdb->siteid}:$option";
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-		if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
-			if ( false !== get_site_option( $option ) )
+		$notoptions = wp_cache_get($notoptions_key, 'site-options');
+		if ( ! is_array($notoptions) || ! isset($notoptions[$option]))
+			if (false !== get_site_option($option))
 				return false;
 
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->insert($wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value));
 
-		if ( ! $result )
+		if ( ! $result)
 			return false;
 
-		wp_cache_set( $cache_key, $value, 'site-options' );
+		wp_cache_set($cache_key, $value, 'site-options');
 
 		// This option exists now
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
-		if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-			unset( $notoptions[$option] );
-			wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+		$notoptions = wp_cache_get($notoptions_key, 'site-options'); // yes, again... we need it to be fresh
+		if (is_array($notoptions) && isset($notoptions[$option])) {
+			unset($notoptions[$option]);
+			wp_cache_set($notoptions_key, $notoptions, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific site option has been successfully added.
@@ -1129,7 +1129,7 @@ 
 		 * @param string $option Name of site option.
 		 * @param mixed  $value  Value of site option.
 		 */
-		do_action( "add_site_option_{$option}", $option, $value );
+		do_action("add_site_option_{$option}", $option, $value);
 
 		/**
 		 * Fires after a site option has been successfully added.
@@ -1139,7 +1139,7 @@ 
 		 * @param string $option Name of site option.
 		 * @param mixed  $value  Value of site option.
 		 */
-		do_action( "add_site_option", $option, $value );
+		do_action("add_site_option", $option, $value);
 
 		return true;
 	}
@@ -1158,7 +1158,7 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_site_option( $option ) {
+function delete_site_option($option) {
 	global $wpdb;
 
 	// ms_protect_special_option( $option ); @todo
@@ -1170,21 +1170,21 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'pre_delete_site_option_' . $option );
+	do_action('pre_delete_site_option_'.$option);
 
-	if ( !is_multisite() ) {
-		$result = delete_option( $option );
+	if ( ! is_multisite()) {
+		$result = delete_option($option);
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
-		if ( is_null( $row ) || !$row->meta_id )
+		$row = $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid));
+		if (is_null($row) || ! $row->meta_id)
 			return false;
 		$cache_key = "{$wpdb->siteid}:$option";
-		wp_cache_delete( $cache_key, 'site-options' );
+		wp_cache_delete($cache_key, 'site-options');
 
-		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $wpdb->siteid ) );
+		$result = $wpdb->delete($wpdb->sitemeta, array('meta_key' => $option, 'site_id' => $wpdb->siteid));
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific site option has been deleted.
@@ -1196,7 +1196,7 @@ 
 		 *
 		 * @param string $option Name of the site option.
 		 */
-		do_action( "delete_site_option_{$option}", $option );
+		do_action("delete_site_option_{$option}", $option);
 
 		/**
 		 * Fires after a site option has been deleted.
@@ -1205,7 +1205,7 @@ 
 		 *
 		 * @param string $option Name of the site option.
 		 */
-		do_action( "delete_site_option", $option );
+		do_action("delete_site_option", $option);
 
 		return true;
 	}
@@ -1225,12 +1225,12 @@ 
  * @param mixed  $value  Option value. Expected to not be SQL-escaped.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_site_option( $option, $value ) {
+function update_site_option($option, $value) {
 	global $wpdb;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	$old_value = get_site_option( $option );
+	$old_value = get_site_option($option);
 
 	/**
 	 * Filter a specific site option before its value is updated.
@@ -1243,36 +1243,36 @@ 
 	 * @param mixed $value     New value of site option.
 	 * @param mixed $old_value Old value of site option.
 	 */
-	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value );
+	$value = apply_filters('pre_update_site_option_'.$option, $value, $old_value);
 
-	if ( $value === $old_value )
+	if ($value === $old_value)
 		return false;
 
-	if ( false === $old_value )
-		return add_site_option( $option, $value );
+	if (false === $old_value)
+		return add_site_option($option, $value);
 
 	$notoptions_key = "{$wpdb->siteid}:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set($notoptions_key, $notoptions, 'site-options');
 	}
 
-	if ( !is_multisite() ) {
-		$result = update_option( $option, $value );
+	if ( ! is_multisite()) {
+		$result = update_option($option, $value);
 	} else {
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->update($wpdb->sitemeta, array('meta_value' => $serialized_value), array('site_id' => $wpdb->siteid, 'meta_key' => $option));
 
-		if ( $result ) {
+		if ($result) {
 			$cache_key = "{$wpdb->siteid}:$option";
-			wp_cache_set( $cache_key, $value, 'site-options' );
+			wp_cache_set($cache_key, $value, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value of a specific site option has been successfully updated.
@@ -1286,7 +1286,7 @@ 
 		 * @param mixed  $value     Current value of site option.
 		 * @param mixed  $old_value Old value of site option.
 		 */
-		do_action( "update_site_option_{$option}", $option, $value, $old_value );
+		do_action("update_site_option_{$option}", $option, $value, $old_value);
 
 		/**
 		 * Fires after the value of a site option has been successfully updated.
@@ -1297,7 +1297,7 @@ 
 		 * @param mixed  $value     Current value of site option.
 		 * @param mixed  $old_value Old value of site option.
 		 */
-		do_action( "update_site_option", $option, $value, $old_value );
+		do_action("update_site_option", $option, $value, $old_value);
 
 		return true;
 	}
@@ -1312,7 +1312,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool True if successful, false otherwise
  */
-function delete_site_transient( $transient ) {
+function delete_site_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific site transient is deleted.
@@ -1323,18 +1323,18 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_site_transient_' . $transient, $transient );
+	do_action('delete_site_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'site-transient');
 	} else {
-		$option_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		$option_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		$result = delete_site_option($option);
+		if ($result)
+			delete_site_option($option_timeout);
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -1343,7 +1343,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_site_transient', $transient );
+		do_action('deleted_site_transient', $transient);
 	}
 
 	return $result;
@@ -1362,7 +1362,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_site_transient( $transient ) {
+function get_site_transient($transient) {
 
 	/**
 	 * Filter the value of an existing site transient.
@@ -1378,29 +1378,29 @@ 
 	 *                                  Any value other than false will short-circuit the retrieval
 	 *                                  of the transient, and return the returned value.
 	 */
-	$pre = apply_filters( 'pre_site_transient_' . $transient, false );
+	$pre = apply_filters('pre_site_transient_'.$transient, false);
 
-	if ( false !== $pre )
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'site-transient');
 	} else {
 		// Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
 		$no_timeout = array('update_core', 'update_plugins', 'update_themes');
-		$transient_option = '_site_transient_' . $transient;
-		if ( ! in_array( $transient, $no_timeout ) ) {
-			$transient_timeout = '_site_transient_timeout_' . $transient;
-			$timeout = get_site_option( $transient_timeout );
-			if ( false !== $timeout && $timeout < time() ) {
-				delete_site_option( $transient_option  );
-				delete_site_option( $transient_timeout );
+		$transient_option = '_site_transient_'.$transient;
+		if ( ! in_array($transient, $no_timeout)) {
+			$transient_timeout = '_site_transient_timeout_'.$transient;
+			$timeout = get_site_option($transient_timeout);
+			if (false !== $timeout && $timeout < time()) {
+				delete_site_option($transient_option);
+				delete_site_option($transient_timeout);
 				$value = false;
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_site_option($transient_option);
 	}
 
 	/**
@@ -1412,7 +1412,7 @@ 
 	 *
 	 * @param mixed $value Value of site transient.
 	 */
-	return apply_filters( 'site_transient_' . $transient, $value );
+	return apply_filters('site_transient_'.$transient, $value);
 }
 
 /**
@@ -1431,7 +1431,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0.
  * @return bool False if value was not set and true if value was set.
  */
-function set_site_transient( $transient, $value, $expiration = 0 ) {
+function set_site_transient($transient, $value, $expiration = 0) {
 
 	/**
 	 * Filter the value of a specific site transient before it is set.
@@ -1442,26 +1442,26 @@ 
 	 *
 	 * @param mixed $value Value of site transient.
 	 */
-	$value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
+	$value = apply_filters('pre_set_site_transient_'.$transient, $value);
 
 	$expiration = (int) $expiration;
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'site-transient', $expiration);
 	} else {
-		$transient_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
-			$result = add_site_option( $option, $value );
+		$transient_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		if (false === get_site_option($option)) {
+			if ($expiration)
+				add_site_option($transient_timeout, time() + $expiration);
+			$result = add_site_option($option, $value);
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
-			$result = update_site_option( $option, $value );
+			if ($expiration)
+				update_site_option($transient_timeout, time() + $expiration);
+			$result = update_site_option($option, $value);
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific site transient has been set.
@@ -1473,7 +1473,7 @@ 
 		 * @param mixed $value      Site transient value.
 		 * @param int   $expiration Time until expiration in seconds. Default 0.
 		 */
-		do_action( 'set_site_transient_' . $transient, $value, $expiration );
+		do_action('set_site_transient_'.$transient, $value, $expiration);
 
 		/**
 		 * Fires after the value for a site transient has been set.
@@ -1484,7 +1484,7 @@ 
 		 * @param mixed  $value      Site transient value.
 		 * @param int    $expiration Time until expiration in seconds. Default 0.
 		 */
-		do_action( 'setted_site_transient', $transient, $value, $expiration );
+		do_action('setted_site_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }

Braces +117 added lines, -79 removed lines

@@ -28,8 +28,9 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	/**
 	 * Filter the value of an existing option before it is retrieved.
@@ -45,11 +46,13 @@ 
 	 *                               Default false to skip it.
 	 */
 	$pre = apply_filters( 'pre_option_' . $option, false );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
-		return false;
+	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+			return false;
+	}
 
 	if ( ! defined( 'WP_INSTALLING' ) ) {
 		// prevent non-existent options from triggering multiple queries
@@ -107,11 +110,13 @@ 
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ( 'home' == $option && '' == $value ) {
+			return get_option( 'siteurl' );
+	}
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) ) {
+			$value = untrailingslashit( $value );
+	}
 
 	/**
 	 * Filter the value of an existing option.
@@ -138,9 +143,10 @@ 
  * @param string $option Option name.
  */
 function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
-}
+	if ( 'alloptions' === $option || 'notoptions' === $option ) {
+			wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+	}
+	}
 
 /**
  * Print option value after sanitizing for forms.
@@ -165,22 +171,25 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
-	else
-		$alloptions = false;
+	if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) {
+			$alloptions = wp_cache_get( 'alloptions', 'options' );
+	} else {
+			$alloptions = false;
+	}
 
 	if ( !$alloptions ) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) ) {
+					$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		}
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
 		foreach ( (array) $alloptions_db as $o ) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) {
+					wp_cache_add( 'alloptions', $alloptions, 'options' );
+		}
 	}
 
 	return $alloptions;
@@ -198,11 +207,13 @@ 
 function wp_load_core_site_options( $site_id = null ) {
 	global $wpdb;
 
-	if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
-		return;
+	if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) ) {
+			return;
+	}
 
-	if ( empty($site_id) )
-		$site_id = $wpdb->siteid;
+	if ( empty($site_id) ) {
+			$site_id = $wpdb->siteid;
+	}
 
 	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 
@@ -245,13 +256,15 @@ 
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object( $value ) )
-		$value = clone $value;
+	if ( is_object( $value ) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 	$old_value = get_option( $option );
@@ -280,8 +293,9 @@ 
 	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
-		return false;
+	if ( $value === $old_value ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/option.php */
 	if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
@@ -315,8 +329,9 @@ 
 	}
 
 	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
@@ -385,26 +400,30 @@ 
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.3' );
+	}
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object($value) )
-		$value = clone $value;
+	if ( is_object($value) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
-		/** This filter is documented in wp-includes/option.php */
+	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) ) {
+			/** This filter is documented in wp-includes/option.php */
 		if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) )
 			return false;
+	}
 
 	$serialized_value = maybe_serialize( $value );
 	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
@@ -420,8 +439,9 @@ 
 	do_action( 'add_option', $option, $value );
 
 	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	if ( ! defined( 'WP_INSTALLING' ) ) {
 		if ( 'yes' == $autoload ) {
@@ -479,15 +499,17 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
 	// Get the ID, if no ID then return
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
-		return false;
+	if ( is_null( $row ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before an option is deleted.
@@ -563,8 +585,9 @@ 
 		$option_timeout = '_transient_timeout_' . $transient;
 		$option = '_transient_' . $transient;
 		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		if ( $result ) {
+					delete_option( $option_timeout );
+		}
 	}
 
 	if ( $result ) {
@@ -610,8 +633,9 @@ 
 	 *                             of the transient, and return the returned value.
 	 */
 	$pre = apply_filters( 'pre_transient_' . $transient, false );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'transient' );
@@ -631,8 +655,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_option( $transient_option );
+		}
 	}
 
 	/**
@@ -768,8 +793,9 @@ 
 		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
 
 		// No change or both empty
-		if ( $cookie == $settings )
-			return;
+		if ( $cookie == $settings ) {
+					return;
+		}
 
 		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
 		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
@@ -987,8 +1013,9 @@ 
 	 */
  	$pre = apply_filters( 'pre_site_option_' . $option, false );
 
- 	if ( false !== $pre )
- 		return $pre;
+ 	if ( false !== $pre ) {
+ 	 		return $pre;
+ 	}
 
 	// prevent non-existent options from triggering multiple queries
 	$notoptions_key = "{$wpdb->siteid}:notoptions";
@@ -1016,8 +1043,9 @@ 
 		$value = get_option($option, $default);
 	} else {
 		$cache_key = "{$wpdb->siteid}:$option";
-		if ( $use_cache )
-			$value = wp_cache_get($cache_key, 'site-options');
+		if ( $use_cache ) {
+					$value = wp_cache_get($cache_key, 'site-options');
+		}
 
 		if ( !isset($value) || (false === $value) ) {
 			$row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
@@ -1094,17 +1122,19 @@ 
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-		if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
-			if ( false !== get_site_option( $option ) )
+		if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) ) {
+					if ( false !== get_site_option( $option ) )
 				return false;
+		}
 
 		$value = sanitize_option( $option, $value );
 
 		$serialized_value = maybe_serialize( $value );
 		$result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
 
-		if ( ! $result )
-			return false;
+		if ( ! $result ) {
+					return false;
+		}
 
 		wp_cache_set( $cache_key, $value, 'site-options' );
 
@@ -1176,8 +1206,9 @@ 
 		$result = delete_option( $option );
 	} else {
 		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
-		if ( is_null( $row ) || !$row->meta_id )
-			return false;
+		if ( is_null( $row ) || !$row->meta_id ) {
+					return false;
+		}
 		$cache_key = "{$wpdb->siteid}:$option";
 		wp_cache_delete( $cache_key, 'site-options' );
 
@@ -1245,11 +1276,13 @@ 
 	 */
 	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value );
 
-	if ( $value === $old_value )
-		return false;
+	if ( $value === $old_value ) {
+			return false;
+	}
 
-	if ( false === $old_value )
-		return add_site_option( $option, $value );
+	if ( false === $old_value ) {
+			return add_site_option( $option, $value );
+	}
 
 	$notoptions_key = "{$wpdb->siteid}:notoptions";
 	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
@@ -1331,8 +1364,9 @@ 
 		$option_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		if ( $result ) {
+					delete_site_option( $option_timeout );
+		}
 	}
 	if ( $result ) {
 
@@ -1380,8 +1414,9 @@ 
 	 */
 	$pre = apply_filters( 'pre_site_transient_' . $transient, false );
 
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'site-transient' );
@@ -1399,8 +1434,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_site_option( $transient_option );
+		}
 	}
 
 	/**
@@ -1452,12 +1488,14 @@ 
 		$transient_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							add_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = add_site_option( $option, $value );
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							update_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = update_site_option( $option, $value );
 		}
 	}

src/wp-includes/class-wp-http-ixr-client.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WP_HTTP_IXR_Client
- *
- * @package WordPress
- * @since 3.1.0
- *
- */
+	 * WP_HTTP_IXR_Client
+	 *
+	 * @package WordPress
+	 * @since 3.1.0
+	 *
+	 */
 class WP_HTTP_IXR_Client extends IXR_Client {
 	public $scheme;
 	/**

Spacing +18 added lines, -18 removed lines

@@ -20,21 +20,21 @@ 
 	 * @param int $timeout
 	 */
 	public function __construct($server, $path = false, $port = false, $timeout = 15) {
-		if ( ! $path ) {
+		if ( ! $path) {
 			// Assume we have been given a URL instead
 			$bits = parse_url($server);
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
 			$this->port = isset($bits['port']) ? $bits['port'] : $port;
-			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
+			$this->path = ! empty($bits['path']) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path
-			if ( ! $this->path ) {
+			if ( ! $this->path) {
 				$this->path = '/';
 			}
 
-			if ( ! empty( $bits['query'] ) ) {
-				$this->path .= '?' . $bits['query'];
+			if ( ! empty($bits['query'])) {
+				$this->path .= '?'.$bits['query'];
 			}
 		} else {
 			$this->scheme = 'http';
@@ -56,7 +56,7 @@ 
 		$xml = $request->getXml();
 
 		$port = $this->port ? ":$this->port" : '';
-		$url = $this->scheme . '://' . $this->server . $port . $this->path;
+		$url = $this->scheme.'://'.$this->server.$port.$this->path;
 		$args = array(
 			'headers'    => array('Content-Type' => 'text/xml'),
 			'user-agent' => $this->useragent,
@@ -64,43 +64,43 @@ 
 		);
 
 		// Merge Custom headers ala #8145
-		foreach ( $this->headers as $header => $value )
+		foreach ($this->headers as $header => $value)
 			$args['headers'][$header] = $value;
 
-		if ( $this->timeout !== false )
+		if ($this->timeout !== false)
 			$args['timeout'] = $this->timeout;
 
 		// Now send the request
-		if ( $this->debug )
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		if ($this->debug)
+			echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
 
 		$response = wp_remote_post($url, $args);
 
-		if ( is_wp_error($response) ) {
+		if (is_wp_error($response)) {
 			$errno    = $response->get_error_code();
 			$errorstr = $response->get_error_message();
 			$this->error = new IXR_Error(-32300, "transport error: $errno $errorstr");
 			return false;
 		}
 
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')');
+		if (200 != wp_remote_retrieve_response_code($response)) {
+			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 ('.wp_remote_retrieve_response_code($response).')');
 			return false;
 		}
 
-		if ( $this->debug )
-			echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		if ($this->debug)
+			echo '<pre class="ixr_response">'.htmlspecialchars(wp_remote_retrieve_body($response))."\n</pre>\n\n";
 
 		// Now parse what we've got back
-		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );
-		if ( ! $this->message->parse() ) {
+		$this->message = new IXR_Message(wp_remote_retrieve_body($response));
+		if ( ! $this->message->parse()) {
 			// XML error
 			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
 			return false;
 		}
 
 		// Is the message a fault?
-		if ( $this->message->messageType == 'fault' ) {
+		if ($this->message->messageType == 'fault') {
 			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
 			return false;
 		}

Braces +12 added lines, -8 removed lines

@@ -64,15 +64,18 @@ 
 		);
 
 		// Merge Custom headers ala #8145
-		foreach ( $this->headers as $header => $value )
-			$args['headers'][$header] = $value;
+		foreach ( $this->headers as $header => $value ) {
+					$args['headers'][$header] = $value;
+		}
 
-		if ( $this->timeout !== false )
-			$args['timeout'] = $this->timeout;
+		if ( $this->timeout !== false ) {
+					$args['timeout'] = $this->timeout;
+		}
 
 		// Now send the request
-		if ( $this->debug )
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		if ( $this->debug ) {
+					echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		}
 
 		$response = wp_remote_post($url, $args);
 
@@ -88,8 +91,9 @@ 
 			return false;
 		}
 
-		if ( $this->debug )
-			echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		if ( $this->debug ) {
+					echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		}
 
 		// Now parse what we've got back
 		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );

src/wp-includes/js/tinymce/wp-tinymce.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Disable error reporting
- *
- * Set this to error_reporting( -1 ) for debugging.
- */
+	 * Disable error reporting
+	 *
+	 * Set this to error_reporting( -1 ) for debugging.
+	 */
 error_reporting(0);
 
 $basepath = dirname(__FILE__);

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
+	if (function_exists('realpath'))
 		$path = realpath($path);
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file($path))
 		return false;
 
 	return @file_get_contents($path);
@@ -23,17 +23,17 @@ 
 
 header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if (isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ($file = get_file($basepath.'/wp-tinymce.js.gz'))) {
 
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
 	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
-	echo get_file( $basepath . '/tinymce.min.js' );
-	echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
+	echo get_file($basepath.'/tinymce.min.js');
+	echo get_file($basepath.'/plugins/compat3x/plugin.min.js');
 }
 exit;

Braces +6 added lines, -4 removed lines

@@ -10,11 +10,13 @@
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists('realpath') ) {
+			$path = realpath($path);
+	}
 
-	if ( ! $path || ! @is_file($path) )
-		return false;
+	if ( ! $path || ! @is_file($path) ) {
+			return false;
+	}
 
 	return @file_get_contents($path);
 }