ntwb / wordpress

src/wp-admin/includes/class-language-pack-upgrader.php

Braces +28 added lines, -20 removed lines

@@ -176,8 +176,9 @@ 
 		$this->init();
 		$this->upgrade_strings();
 
-		if ( ! $language_updates )
-			$language_updates = wp_get_translation_updates();
+		if ( ! $language_updates ) {
+					$language_updates = wp_get_translation_updates();
+		}
 
 		if ( empty( $language_updates ) ) {
 			$this->skin->header();
@@ -188,8 +189,9 @@ 
 			return true;
 		}
 
-		if ( 'upgrader_process_complete' == current_filter() )
-			$this->skin->feedback( 'starting_upgrade' );
+		if ( 'upgrader_process_complete' == current_filter() ) {
+					$this->skin->feedback( 'starting_upgrade' );
+		}
 
 		// Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230
 		remove_all_filters( 'upgrader_pre_install' );
@@ -218,9 +220,10 @@ 
 		 * as we then may need to create a /plugins or /themes directory inside of it.
 		 */
 		$remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
-		if ( ! $wp_filesystem->exists( $remote_destination ) )
-			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
+		if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+					if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
 				return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination );
+		}
 
 		$language_updates_results = array();
 
@@ -229,10 +232,11 @@ 
 			$this->skin->language_update = $language_update;
 
 			$destination = WP_LANG_DIR;
-			if ( 'plugin' == $language_update->type )
-				$destination .= '/plugins';
-			elseif ( 'theme' == $language_update->type )
-				$destination .= '/themes';
+			if ( 'plugin' == $language_update->type ) {
+							$destination .= '/plugins';
+			} elseif ( 'theme' == $language_update->type ) {
+							$destination .= '/themes';
+			}
 
 			$this->update_current++;
 
@@ -317,8 +321,9 @@ 
 	public function check_package( $source, $remote_source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $source ) )
-			return $source;
+		if ( is_wp_error( $source ) ) {
+					return $source;
+		}
 
 		// Check that the folder contains a valid language.
 		$files = $wp_filesystem->dirlist( $remote_source );
@@ -326,10 +331,11 @@ 
 		// Check to see if a .po and .mo exist in the folder.
 		$po = $mo = false;
 		foreach ( (array) $files as $file => $filedata ) {
-			if ( '.po' == substr( $file, -3 ) )
-				$po = true;
-			elseif ( '.mo' == substr( $file, -3 ) )
-				$mo = true;
+			if ( '.po' == substr( $file, -3 ) ) {
+							$po = true;
+			} elseif ( '.mo' == substr( $file, -3 ) ) {
+							$mo = true;
+			}
 		}
 
 		if ( ! $mo || ! $po ) {
@@ -361,14 +367,16 @@ 
 
 			case 'theme':
 				$theme = wp_get_theme( $update->slug );
-				if ( $theme->exists() )
-					return $theme->Get( 'Name' );
+				if ( $theme->exists() ) {
+									return $theme->Get( 'Name' );
+				}
 				break;
 			case 'plugin':
 				$plugin_data = get_plugins( '/' . $update->slug );
 				$plugin_data = reset( $plugin_data );
-				if ( $plugin_data )
-					return $plugin_data['Name'];
+				if ( $plugin_data ) {
+									return $plugin_data['Name'];
+				}
 				break;
 		}
 		return '';

Spacing +82 added lines, -82 removed lines

@@ -50,15 +50,15 @@ 
 	 *                                    a Language_Pack_Upgrader instance, the method will bail to
 	 *                                    avoid recursion. Otherwise unused. Default false.
 	 */
-	public static function async_upgrade( $upgrader = false ) {
+	public static function async_upgrade($upgrader = false) {
 		// Avoid recursion.
-		if ( $upgrader && $upgrader instanceof Language_Pack_Upgrader ) {
+		if ($upgrader && $upgrader instanceof Language_Pack_Upgrader) {
 			return;
 		}
 
 		// Nothing to do?
 		$language_updates = wp_get_translation_updates();
-		if ( ! $language_updates ) {
+		if ( ! $language_updates) {
 			return;
 		}
 
@@ -67,12 +67,12 @@ 
 		 * Noted: this is not the ideal way to accomplish this.
 		 */
 		$check_vcs = new WP_Automatic_Updater;
-		if ( $check_vcs->is_vcs_checkout( WP_CONTENT_DIR ) ) {
+		if ($check_vcs->is_vcs_checkout(WP_CONTENT_DIR)) {
 			return;
 		}
 
-		foreach ( $language_updates as $key => $language_update ) {
-			$update = ! empty( $language_update->autoupdate );
+		foreach ($language_updates as $key => $language_update) {
+			$update = ! empty($language_update->autoupdate);
 
 			/**
 			 * Filters whether to asynchronously update translation for core, a plugin, or a theme.
@@ -82,28 +82,28 @@ 
 			 * @param bool   $update          Whether to update.
 			 * @param object $language_update The update offer.
 			 */
-			$update = apply_filters( 'async_update_translation', $update, $language_update );
+			$update = apply_filters('async_update_translation', $update, $language_update);
 
-			if ( ! $update ) {
-				unset( $language_updates[ $key ] );
+			if ( ! $update) {
+				unset($language_updates[$key]);
 			}
 		}
 
-		if ( empty( $language_updates ) ) {
+		if (empty($language_updates)) {
 			return;
 		}
 
 		// Re-use the automatic upgrader skin if the parent upgrader is using it.
-		if ( $upgrader && $upgrader->skin instanceof Automatic_Upgrader_Skin ) {
+		if ($upgrader && $upgrader->skin instanceof Automatic_Upgrader_Skin) {
 			$skin = $upgrader->skin;
 		} else {
-			$skin = new Language_Pack_Upgrader_Skin( array(
+			$skin = new Language_Pack_Upgrader_Skin(array(
 				'skip_header_footer' => true,
-			) );
+			));
 		}
 
-		$lp_upgrader = new Language_Pack_Upgrader( $skin );
-		$lp_upgrader->bulk_upgrade( $language_updates );
+		$lp_upgrader = new Language_Pack_Upgrader($skin);
+		$lp_upgrader->bulk_upgrade($language_updates);
 	}
 
 	/**
@@ -113,13 +113,13 @@ 
 	 * @access public
 	 */
 	public function upgrade_strings() {
-		$this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
-		$this->strings['up_to_date'] = __( 'The translations are up to date.' );
-		$this->strings['no_package'] = __( 'Update package not available.' );
-		$this->strings['downloading_package'] = __( 'Downloading translation from <span class="code">%s</span>&#8230;' );
-		$this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
-		$this->strings['process_failed'] = __( 'Translation update failed.' );
-		$this->strings['process_success'] = __( 'Translation updated successfully.' );
+		$this->strings['starting_upgrade'] = __('Some of your translations need updating. Sit tight for a few more seconds while we update them as well.');
+		$this->strings['up_to_date'] = __('The translations are up to date.');
+		$this->strings['no_package'] = __('Update package not available.');
+		$this->strings['downloading_package'] = __('Downloading translation from <span class="code">%s</span>&#8230;');
+		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
+		$this->strings['process_failed'] = __('Translation update failed.');
+		$this->strings['process_success'] = __('Translation updated successfully.');
 	}
 
 	/**
@@ -133,14 +133,14 @@ 
 	 *                             Language_Pack_Upgrader::bulk_upgrade(). Default empty array.
 	 * @return array|bool|WP_Error The result of the upgrade, or a WP_Error object instead.
 	 */
-	public function upgrade( $update = false, $args = array() ) {
-		if ( $update ) {
-			$update = array( $update );
+	public function upgrade($update = false, $args = array()) {
+		if ($update) {
+			$update = array($update);
 		}
 
-		$results = $this->bulk_upgrade( $update, $args );
+		$results = $this->bulk_upgrade($update, $args);
 
-		if ( ! is_array( $results ) ) {
+		if ( ! is_array($results)) {
 			return $results;
 		}
 
@@ -165,73 +165,73 @@ 
 	 * @return array|bool|WP_Error Will return an array of results, or true if there are no updates,
 	 *                                   false or WP_Error for initial errors.
 	 */
-	public function bulk_upgrade( $language_updates = array(), $args = array() ) {
+	public function bulk_upgrade($language_updates = array(), $args = array()) {
 		global $wp_filesystem;
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
-		if ( ! $language_updates )
+		if ( ! $language_updates)
 			$language_updates = wp_get_translation_updates();
 
-		if ( empty( $language_updates ) ) {
+		if (empty($language_updates)) {
 			$this->skin->header();
-			$this->skin->set_result( true );
-			$this->skin->feedback( 'up_to_date' );
+			$this->skin->set_result(true);
+			$this->skin->feedback('up_to_date');
 			$this->skin->bulk_footer();
 			$this->skin->footer();
 			return true;
 		}
 
-		if ( 'upgrader_process_complete' == current_filter() )
-			$this->skin->feedback( 'starting_upgrade' );
+		if ('upgrader_process_complete' == current_filter())
+			$this->skin->feedback('starting_upgrade');
 
 		// Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230
-		remove_all_filters( 'upgrader_pre_install' );
-		remove_all_filters( 'upgrader_clear_destination' );
-		remove_all_filters( 'upgrader_post_install' );
-		remove_all_filters( 'upgrader_source_selection' );
+		remove_all_filters('upgrader_pre_install');
+		remove_all_filters('upgrader_clear_destination');
+		remove_all_filters('upgrader_post_install');
+		remove_all_filters('upgrader_source_selection');
 
-		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ), 10, 2 );
+		add_filter('upgrader_source_selection', array($this, 'check_package'), 10, 2);
 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR, WP_LANG_DIR));
+		if ( ! $res) {
 			$this->skin->footer();
 			return false;
 		}
 
 		$results = array();
 
-		$this->update_count = count( $language_updates );
+		$this->update_count = count($language_updates);
 		$this->update_current = 0;
 
 		/*
 		 * The filesystem's mkdir() is not recursive. Make sure WP_LANG_DIR exists,
 		 * as we then may need to create a /plugins or /themes directory inside of it.
 		 */
-		$remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
-		if ( ! $wp_filesystem->exists( $remote_destination ) )
-			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
-				return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination );
+		$remote_destination = $wp_filesystem->find_folder(WP_LANG_DIR);
+		if ( ! $wp_filesystem->exists($remote_destination))
+			if ( ! $wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR))
+				return new WP_Error('mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination);
 
 		$language_updates_results = array();
 
-		foreach ( $language_updates as $language_update ) {
+		foreach ($language_updates as $language_update) {
 
 			$this->skin->language_update = $language_update;
 
 			$destination = WP_LANG_DIR;
-			if ( 'plugin' == $language_update->type )
+			if ('plugin' == $language_update->type)
 				$destination .= '/plugins';
-			elseif ( 'theme' == $language_update->type )
+			elseif ('theme' == $language_update->type)
 				$destination .= '/themes';
 
 			$this->update_current++;
@@ -249,51 +249,51 @@ 
 				)
 			);
 
-			$result = $this->run( $options );
+			$result = $this->run($options);
 
 			$results[] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times.
-			if ( false === $result ) {
+			if (false === $result) {
 				break;
 			}
 
 			$language_updates_results[] = array(
 				'language' => $language_update->language,
 				'type'     => $language_update->type,
-				'slug'     => isset( $language_update->slug ) ? $language_update->slug : 'default',
+				'slug'     => isset($language_update->slug) ? $language_update->slug : 'default',
 				'version'  => $language_update->version,
 			);
 		}
 
 		// Remove upgrade hooks which are not required for translation updates.
-		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-		remove_action( 'upgrader_process_complete', 'wp_version_check' );
-		remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
-		remove_action( 'upgrader_process_complete', 'wp_update_themes' );
+		remove_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+		remove_action('upgrader_process_complete', 'wp_version_check');
+		remove_action('upgrader_process_complete', 'wp_update_plugins');
+		remove_action('upgrader_process_complete', 'wp_update_themes');
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
+		do_action('upgrader_process_complete', $this, array(
 			'action'       => 'update',
 			'type'         => 'translation',
 			'bulk'         => true,
 			'translations' => $language_updates_results
-		) );
+		));
 
 		// Re-add upgrade hooks.
-		add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-		add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
-		add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
-		add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+		add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+		add_action('upgrader_process_complete', 'wp_version_check', 10, 0);
+		add_action('upgrader_process_complete', 'wp_update_plugins', 10, 0);
+		add_action('upgrader_process_complete', 'wp_update_themes', 10, 0);
 
 		$this->skin->bulk_footer();
 
 		$this->skin->footer();
 
 		// Clean up our hooks, in case something else does an upgrade on this connection.
-		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			wp_clean_update_cache();
 		}
 
@@ -314,28 +314,28 @@ 
 	 * @param string|WP_Error $source
 	 * @param string          $remote_source
 	 */
-	public function check_package( $source, $remote_source ) {
+	public function check_package($source, $remote_source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $source ) )
+		if (is_wp_error($source))
 			return $source;
 
 		// Check that the folder contains a valid language.
-		$files = $wp_filesystem->dirlist( $remote_source );
+		$files = $wp_filesystem->dirlist($remote_source);
 
 		// Check to see if a .po and .mo exist in the folder.
 		$po = $mo = false;
-		foreach ( (array) $files as $file => $filedata ) {
-			if ( '.po' == substr( $file, -3 ) )
+		foreach ((array) $files as $file => $filedata) {
+			if ('.po' == substr($file, -3))
 				$po = true;
-			elseif ( '.mo' == substr( $file, -3 ) )
+			elseif ('.mo' == substr($file, -3))
 				$mo = true;
 		}
 
-		if ( ! $mo || ! $po ) {
-			return new WP_Error( 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
+		if ( ! $mo || ! $po) {
+			return new WP_Error('incompatible_archive_pomo', $this->strings['incompatible_archive'],
 				/* translators: 1: .po 2: .mo */
-				sprintf( __( 'The language pack is missing either the %1$s or %2$s files.' ),
+				sprintf(__('The language pack is missing either the %1$s or %2$s files.'),
 					'<code>.po</code>',
 					'<code>.mo</code>'
 				)
@@ -354,20 +354,20 @@ 
 	 * @param object $update The data for an update.
 	 * @return string The name of the item being updated.
 	 */
-	public function get_name_for_update( $update ) {
-		switch ( $update->type ) {
+	public function get_name_for_update($update) {
+		switch ($update->type) {
 			case 'core':
 				return 'WordPress'; // Not translated
 
 			case 'theme':
-				$theme = wp_get_theme( $update->slug );
-				if ( $theme->exists() )
-					return $theme->Get( 'Name' );
+				$theme = wp_get_theme($update->slug);
+				if ($theme->exists())
+					return $theme->Get('Name');
 				break;
 			case 'plugin':
-				$plugin_data = get_plugins( '/' . $update->slug );
-				$plugin_data = reset( $plugin_data );
-				if ( $plugin_data )
+				$plugin_data = get_plugins('/'.$update->slug);
+				$plugin_data = reset($plugin_data);
+				if ($plugin_data)
 					return $plugin_data['Name'];
 				break;
 		}

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

Spacing +82 added lines, -82 removed lines

@@ -33,9 +33,9 @@ 
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
 		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
 		$this->strings['copy_failed'] = __('Could not copy files.');
-		$this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' );
-		$this->strings['start_rollback'] = __( 'Attempting to roll back to previous version.' );
-		$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' );
+		$this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.');
+		$this->strings['start_rollback'] = __('Attempting to roll back to previous version.');
+		$this->strings['rollback_was_required'] = __('Due to an error during updating, WordPress has rolled back to your previous version.');
 	}
 
 	/**
@@ -60,10 +60,10 @@ 
 	 * }
 	 * @return null|false|WP_Error False or WP_Error on failure, null on success.
 	 */
-	public function upgrade( $current, $args = array() ) {
+	public function upgrade($current, $args = array()) {
 		global $wp_filesystem;
 
-		include( ABSPATH . WPINC . '/version.php' ); // $wp_version;
+		include(ABSPATH.WPINC.'/version.php'); // $wp_version;
 
 		$start_time = time();
 
@@ -73,26 +73,26 @@ 
 			'do_rollback'      => false,
 			'allow_relaxed_file_ownership' => false,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
 		// Is an update available?
-		if ( !isset( $current->response ) || $current->response == 'latest' )
+		if ( ! isset($current->response) || $current->response == 'latest')
 			return new WP_Error('up_to_date', $this->strings['up_to_date']);
 
-		$res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
-		if ( ! $res || is_wp_error( $res ) ) {
+		$res = $this->fs_connect(array(ABSPATH, WP_CONTENT_DIR), $parsed_args['allow_relaxed_file_ownership']);
+		if ( ! $res || is_wp_error($res)) {
 			return $res;
 		}
 
 		$wp_dir = trailingslashit($wp_filesystem->abspath());
 
 		$partial = true;
-		if ( $parsed_args['do_rollback'] )
+		if ($parsed_args['do_rollback'])
 			$partial = false;
-		elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
+		elseif ($parsed_args['pre_check_md5'] && ! $this->check_files())
 			$partial = false;
 
 		/*
@@ -101,112 +101,112 @@ 
 		 * the new_bundled zip. Don't though if the constant is set to skip bundled items.
 		 * If the API returns a no_content zip, go with it. Finally, default to the full zip.
 		 */
-		if ( $parsed_args['do_rollback'] && $current->packages->rollback )
+		if ($parsed_args['do_rollback'] && $current->packages->rollback)
 			$to_download = 'rollback';
-		elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial )
+		elseif ($current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial)
 			$to_download = 'partial';
-		elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
-			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
+		elseif ($current->packages->new_bundled && version_compare($wp_version, $current->new_bundled, '<')
+			&& ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED))
 			$to_download = 'new_bundled';
-		elseif ( $current->packages->no_content )
+		elseif ($current->packages->no_content)
 			$to_download = 'no_content';
 		else
 			$to_download = 'full';
 
 		// Lock to prevent multiple Core Updates occuring
-		$lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
-		if ( ! $lock ) {
-			return new WP_Error( 'locked', $this->strings['locked'] );
+		$lock = WP_Upgrader::create_lock('core_updater', 15 * MINUTE_IN_SECONDS);
+		if ( ! $lock) {
+			return new WP_Error('locked', $this->strings['locked']);
 		}
 
-		$download = $this->download_package( $current->packages->$to_download );
-		if ( is_wp_error( $download ) ) {
-			WP_Upgrader::release_lock( 'core_updater' );
+		$download = $this->download_package($current->packages->$to_download);
+		if (is_wp_error($download)) {
+			WP_Upgrader::release_lock('core_updater');
 			return $download;
 		}
 
-		$working_dir = $this->unpack_package( $download );
-		if ( is_wp_error( $working_dir ) ) {
-			WP_Upgrader::release_lock( 'core_updater' );
+		$working_dir = $this->unpack_package($download);
+		if (is_wp_error($working_dir)) {
+			WP_Upgrader::release_lock('core_updater');
 			return $working_dir;
 		}
 
 		// Copy update-core.php from the new version into place.
-		if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
+		if ( ! $wp_filesystem->copy($working_dir.'/wordpress/wp-admin/includes/update-core.php', $wp_dir.'wp-admin/includes/update-core.php', true)) {
 			$wp_filesystem->delete($working_dir, true);
-			WP_Upgrader::release_lock( 'core_updater' );
-			return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
+			WP_Upgrader::release_lock('core_updater');
+			return new WP_Error('copy_failed_for_update_core_file', __('The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.'), 'wp-admin/includes/update-core.php');
 		}
-		$wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
+		$wp_filesystem->chmod($wp_dir.'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
 
-		require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
+		require_once(ABSPATH.'wp-admin/includes/update-core.php');
 
-		if ( ! function_exists( 'update_core' ) ) {
-			WP_Upgrader::release_lock( 'core_updater' );
-			return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
+		if ( ! function_exists('update_core')) {
+			WP_Upgrader::release_lock('core_updater');
+			return new WP_Error('copy_failed_space', $this->strings['copy_failed_space']);
 		}
 
-		$result = update_core( $working_dir, $wp_dir );
+		$result = update_core($working_dir, $wp_dir);
 
 		// In the event of an issue, we may be able to roll back.
-		if ( $parsed_args['attempt_rollback'] && $current->packages->rollback && ! $parsed_args['do_rollback'] ) {
+		if ($parsed_args['attempt_rollback'] && $current->packages->rollback && ! $parsed_args['do_rollback']) {
 			$try_rollback = false;
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				$error_code = $result->get_error_code();
 				/*
 				 * Not all errors are equal. These codes are critical: copy_failed__copy_dir,
 				 * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
 				 * do_rollback allows for update_core() to trigger a rollback if needed.
 				 */
-				if ( false !== strpos( $error_code, 'do_rollback' ) )
+				if (false !== strpos($error_code, 'do_rollback'))
 					$try_rollback = true;
-				elseif ( false !== strpos( $error_code, '__copy_dir' ) )
+				elseif (false !== strpos($error_code, '__copy_dir'))
 					$try_rollback = true;
-				elseif ( 'disk_full' === $error_code )
+				elseif ('disk_full' === $error_code)
 					$try_rollback = true;
 			}
 
-			if ( $try_rollback ) {
+			if ($try_rollback) {
 				/** This filter is documented in wp-admin/includes/update-core.php */
-				apply_filters( 'update_feedback', $result );
+				apply_filters('update_feedback', $result);
 
 				/** This filter is documented in wp-admin/includes/update-core.php */
-				apply_filters( 'update_feedback', $this->strings['start_rollback'] );
+				apply_filters('update_feedback', $this->strings['start_rollback']);
 
-				$rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
+				$rollback_result = $this->upgrade($current, array_merge($parsed_args, array('do_rollback' => true)));
 
 				$original_result = $result;
-				$result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], (object) array( 'update' => $original_result, 'rollback' => $rollback_result ) );
+				$result = new WP_Error('rollback_was_required', $this->strings['rollback_was_required'], (object) array('update' => $original_result, 'rollback' => $rollback_result));
 			}
 		}
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) );
+		do_action('upgrader_process_complete', $this, array('action' => 'update', 'type' => 'core'));
 
 		// Clear the current updates
-		delete_site_transient( 'update_core' );
+		delete_site_transient('update_core');
 
-		if ( ! $parsed_args['do_rollback'] ) {
+		if ( ! $parsed_args['do_rollback']) {
 			$stats = array(
 				'update_type'      => $current->response,
 				'success'          => true,
 				'fs_method'        => $wp_filesystem->method,
-				'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
-				'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
+				'fs_method_forced' => defined('FS_METHOD') || has_filter('filesystem_method'),
+				'fs_method_direct' => ! empty($GLOBALS['_wp_filesystem_direct_method']) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
 				'time_taken'       => time() - $start_time,
 				'reported'         => $wp_version,
 				'attempted'        => $current->version,
 			);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				$stats['success'] = false;
 				// Did a rollback occur?
-				if ( ! empty( $try_rollback ) ) {
+				if ( ! empty($try_rollback)) {
 					$stats['error_code'] = $original_result->get_error_code();
 					$stats['error_data'] = $original_result->get_error_data();
 					// Was the rollback successful? If not, collect its error too.
-					$stats['rollback'] = ! is_wp_error( $rollback_result );
-					if ( is_wp_error( $rollback_result ) ) {
+					$stats['rollback'] = ! is_wp_error($rollback_result);
+					if (is_wp_error($rollback_result)) {
 						$stats['rollback_code'] = $rollback_result->get_error_code();
 						$stats['rollback_data'] = $rollback_result->get_error_data();
 					}
@@ -216,10 +216,10 @@ 
 				}
 			}
 
-			wp_version_check( $stats );
+			wp_version_check($stats);
 		}
 
-		WP_Upgrader::release_lock( 'core_updater' );
+		WP_Upgrader::release_lock('core_updater');
 
 		return $result;
 	}
@@ -235,12 +235,12 @@ 
 	 * @param string $offered_ver The offered version, of the format x.y.z.
 	 * @return bool True if we should update to the offered version, otherwise false.
 	 */
-	public static function should_update_to_version( $offered_ver ) {
-		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
+	public static function should_update_to_version($offered_ver) {
+		include(ABSPATH.WPINC.'/version.php'); // $wp_version; // x.y.z
 
-		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version  ), 0, 2 ) ); // x.y
-		$new_branch     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
-		$current_is_development_version = (bool) strpos( $wp_version, '-' );
+		$current_branch = implode('.', array_slice(preg_split('/[.-]/', $wp_version), 0, 2)); // x.y
+		$new_branch     = implode('.', array_slice(preg_split('/[.-]/', $offered_ver), 0, 2)); // x.y
+		$current_is_development_version = (bool) strpos($wp_version, '-');
 
 		// Defaults:
 		$upgrade_dev   = true;
@@ -248,14 +248,14 @@ 
 		$upgrade_major = false;
 
 		// WP_AUTO_UPDATE_CORE = true (all), 'minor', false.
-		if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
-			if ( false === WP_AUTO_UPDATE_CORE ) {
+		if (defined('WP_AUTO_UPDATE_CORE')) {
+			if (false === WP_AUTO_UPDATE_CORE) {
 				// Defaults to turned off, unless a filter allows it
 				$upgrade_dev = $upgrade_minor = $upgrade_major = false;
-			} elseif ( true === WP_AUTO_UPDATE_CORE ) {
+			} elseif (true === WP_AUTO_UPDATE_CORE) {
 				// ALL updates for core
 				$upgrade_dev = $upgrade_minor = $upgrade_major = true;
-			} elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {
+			} elseif ('minor' === WP_AUTO_UPDATE_CORE) {
 				// Only minor updates for core
 				$upgrade_dev = $upgrade_major = false;
 				$upgrade_minor = true;
@@ -263,32 +263,32 @@ 
 		}
 
 		// 1: If we're already on that version, not much point in updating?
-		if ( $offered_ver == $wp_version )
+		if ($offered_ver == $wp_version)
 			return false;
 
 		// 2: If we're running a newer version, that's a nope
-		if ( version_compare( $wp_version, $offered_ver, '>' ) )
+		if (version_compare($wp_version, $offered_ver, '>'))
 			return false;
 
-		$failure_data = get_site_option( 'auto_core_update_failed' );
-		if ( $failure_data ) {
+		$failure_data = get_site_option('auto_core_update_failed');
+		if ($failure_data) {
 			// If this was a critical update failure, cannot update.
-			if ( ! empty( $failure_data['critical'] ) )
+			if ( ! empty($failure_data['critical']))
 				return false;
 
 			// Don't claim we can update on update-core.php if we have a non-critical failure logged.
-			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) )
+			if ($wp_version == $failure_data['current'] && false !== strpos($offered_ver, '.1.next.minor'))
 				return false;
 
 			// Cannot update if we're retrying the same A to B update that caused a non-critical failure.
 			// Some non-critical failures do allow retries, like download_failed.
 			// 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.
-			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] )
+			if (empty($failure_data['retry']) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'])
 				return false;
 		}
 
 		// 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2
-		if ( $current_is_development_version ) {
+		if ($current_is_development_version) {
 
 			/**
 			 * Filters whether to enable automatic core updates for development versions.
@@ -298,13 +298,13 @@ 
 			 * @param bool $upgrade_dev Whether to enable automatic updates for
 			 *                          development versions.
 			 */
-			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) )
+			if ( ! apply_filters('allow_dev_auto_core_updates', $upgrade_dev))
 				return false;
 			// Else fall through to minor + major branches below.
 		}
 
 		// 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4)
-		if ( $current_branch == $new_branch ) {
+		if ($current_branch == $new_branch) {
 
 			/**
 			 * Filters whether to enable minor automatic core updates.
@@ -313,11 +313,11 @@ 
 			 *
 			 * @param bool $upgrade_minor Whether to enable minor automatic core updates.
 			 */
-			return apply_filters( 'allow_minor_auto_core_updates', $upgrade_minor );
+			return apply_filters('allow_minor_auto_core_updates', $upgrade_minor);
 		}
 
 		// 5: Major version updates (3.7.0 -> 3.8.0 -> 3.9.1)
-		if ( version_compare( $new_branch, $current_branch, '>' ) ) {
+		if (version_compare($new_branch, $current_branch, '>')) {
 
 			/**
 			 * Filters whether to enable major automatic core updates.
@@ -326,7 +326,7 @@ 
 			 *
 			 * @param bool $upgrade_major Whether to enable major automatic core updates.
 			 */
-			return apply_filters( 'allow_major_auto_core_updates', $upgrade_major );
+			return apply_filters('allow_major_auto_core_updates', $upgrade_major);
 		}
 
 		// If we're not sure, we don't want it
@@ -347,16 +347,16 @@ 
 	public function check_files() {
 		global $wp_version, $wp_local_package;
 
-		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
+		$checksums = get_core_checksums($wp_version, isset($wp_local_package) ? $wp_local_package : 'en_US');
 
-		if ( ! is_array( $checksums ) )
+		if ( ! is_array($checksums))
 			return false;
 
-		foreach ( $checksums as $file => $checksum ) {
+		foreach ($checksums as $file => $checksum) {
 			// Skip files which get updated
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+			if ('wp-content' == substr($file, 0, 10))
 				continue;
-			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
+			if ( ! file_exists(ABSPATH.$file) || md5_file(ABSPATH.$file) !== $checksum)
 				return false;
 		}
 

Braces +54 added lines, -41 removed lines

@@ -79,8 +79,9 @@ 
 		$this->upgrade_strings();
 
 		// Is an update available?
-		if ( !isset( $current->response ) || $current->response == 'latest' )
-			return new WP_Error('up_to_date', $this->strings['up_to_date']);
+		if ( !isset( $current->response ) || $current->response == 'latest' ) {
+					return new WP_Error('up_to_date', $this->strings['up_to_date']);
+		}
 
 		$res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
 		if ( ! $res || is_wp_error( $res ) ) {
@@ -90,10 +91,11 @@ 
 		$wp_dir = trailingslashit($wp_filesystem->abspath());
 
 		$partial = true;
-		if ( $parsed_args['do_rollback'] )
-			$partial = false;
-		elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
-			$partial = false;
+		if ( $parsed_args['do_rollback'] ) {
+					$partial = false;
+		} elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() ) {
+					$partial = false;
+		}
 
 		/*
 		 * If partial update is returned from the API, use that, unless we're doing
@@ -101,17 +103,18 @@ 
 		 * the new_bundled zip. Don't though if the constant is set to skip bundled items.
 		 * If the API returns a no_content zip, go with it. Finally, default to the full zip.
 		 */
-		if ( $parsed_args['do_rollback'] && $current->packages->rollback )
-			$to_download = 'rollback';
-		elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial )
-			$to_download = 'partial';
-		elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
-			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
-			$to_download = 'new_bundled';
-		elseif ( $current->packages->no_content )
-			$to_download = 'no_content';
-		else
-			$to_download = 'full';
+		if ( $parsed_args['do_rollback'] && $current->packages->rollback ) {
+					$to_download = 'rollback';
+		} elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) {
+					$to_download = 'partial';
+		} elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
+			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
+					$to_download = 'new_bundled';
+		} elseif ( $current->packages->no_content ) {
+					$to_download = 'no_content';
+		} else {
+					$to_download = 'full';
+		}
 
 		// Lock to prevent multiple Core Updates occuring
 		$lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
@@ -158,12 +161,13 @@ 
 				 * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
 				 * do_rollback allows for update_core() to trigger a rollback if needed.
 				 */
-				if ( false !== strpos( $error_code, 'do_rollback' ) )
-					$try_rollback = true;
-				elseif ( false !== strpos( $error_code, '__copy_dir' ) )
-					$try_rollback = true;
-				elseif ( 'disk_full' === $error_code )
-					$try_rollback = true;
+				if ( false !== strpos( $error_code, 'do_rollback' ) ) {
+									$try_rollback = true;
+				} elseif ( false !== strpos( $error_code, '__copy_dir' ) ) {
+									$try_rollback = true;
+				} elseif ( 'disk_full' === $error_code ) {
+									$try_rollback = true;
+				}
 			}
 
 			if ( $try_rollback ) {
@@ -263,28 +267,33 @@ 
 		}
 
 		// 1: If we're already on that version, not much point in updating?
-		if ( $offered_ver == $wp_version )
-			return false;
+		if ( $offered_ver == $wp_version ) {
+					return false;
+		}
 
 		// 2: If we're running a newer version, that's a nope
-		if ( version_compare( $wp_version, $offered_ver, '>' ) )
-			return false;
+		if ( version_compare( $wp_version, $offered_ver, '>' ) ) {
+					return false;
+		}
 
 		$failure_data = get_site_option( 'auto_core_update_failed' );
 		if ( $failure_data ) {
 			// If this was a critical update failure, cannot update.
-			if ( ! empty( $failure_data['critical'] ) )
-				return false;
+			if ( ! empty( $failure_data['critical'] ) ) {
+							return false;
+			}
 
 			// Don't claim we can update on update-core.php if we have a non-critical failure logged.
-			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) )
-				return false;
+			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
+							return false;
+			}
 
 			// Cannot update if we're retrying the same A to B update that caused a non-critical failure.
 			// Some non-critical failures do allow retries, like download_failed.
 			// 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.
-			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] )
-				return false;
+			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) {
+							return false;
+			}
 		}
 
 		// 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2
@@ -298,8 +307,9 @@ 
 			 * @param bool $upgrade_dev Whether to enable automatic updates for
 			 *                          development versions.
 			 */
-			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) )
-				return false;
+			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) ) {
+							return false;
+			}
 			// Else fall through to minor + major branches below.
 		}
 
@@ -349,15 +359,18 @@ 
 
 		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
 
-		if ( ! is_array( $checksums ) )
-			return false;
+		if ( ! is_array( $checksums ) ) {
+					return false;
+		}
 
 		foreach ( $checksums as $file => $checksum ) {
 			// Skip files which get updated
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
-				continue;
-			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
-				return false;
+			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
+							continue;
+			}
+			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {
+							return false;
+			}
 		}
 
 		return true;

src/wp-admin/includes/update.php

Braces +92 added lines, -62 removed lines

@@ -13,10 +13,12 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
-		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if ( ! is_array( $updates ) ) {
+			return false;
+	}
+	if ( empty( $updates ) ) {
+			return (object) array( 'response' => 'latest' );
+	}
 	return $updates[0];
 }
 
@@ -31,19 +33,22 @@ 
 	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
 	$dismissed = get_site_option( 'dismissed_update_core' );
 
-	if ( ! is_array( $dismissed ) )
-		$dismissed = array();
+	if ( ! is_array( $dismissed ) ) {
+			$dismissed = array();
+	}
 
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
-		return false;
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+			return false;
+	}
 
 	$updates = $from_api->updates;
 	$result = array();
 	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
-			continue;
+		if ( $update->response == 'autoupdate' ) {
+					continue;
+		}
 
 		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
 			if ( $options['dismissed'] ) {
@@ -71,22 +76,26 @@ 
  */
 function find_core_auto_update() {
 	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
-		return false;
+	if ( ! $updates || empty( $updates->updates ) ) {
+			return false;
+	}
 
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
 	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
-			continue;
+		if ( 'autoupdate' != $update->response ) {
+					continue;
+		}
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
-			continue;
+		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
+					continue;
+		}
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
-			$auto_update = $update;
+		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
+					$auto_update = $update;
+		}
 	}
 	return $auto_update;
 }
@@ -103,8 +112,9 @@ 
 function get_core_checksums( $version, $locale ) {
 	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	$options = array(
 		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
@@ -116,14 +126,16 @@ 
 		$response = wp_remote_get( $http_url, $options );
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-		return false;
+	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+			return false;
+	}
 
 	$body = trim( wp_remote_retrieve_body( $response ) );
 	$body = json_decode( $body, true );
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
-		return false;
+	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
+			return false;
+	}
 
 	return $body['checksums'];
 }
@@ -149,8 +161,9 @@ 
 	$dismissed = get_site_option( 'dismissed_update_core' );
 	$key = $version . '|' . $locale;
 
-	if ( ! isset( $dismissed[$key] ) )
-		return false;
+	if ( ! isset( $dismissed[$key] ) ) {
+			return false;
+	}
 
 	unset( $dismissed[$key] );
 	return update_site_option( 'dismissed_update_core', $dismissed );
@@ -165,13 +178,15 @@ 
 function find_core_update( $version, $locale ) {
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
-		return false;
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+			return false;
+	}
 
 	$updates = $from_api->updates;
 	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
-			return $update;
+		if ( $update->current == $version && $update->locale == $locale ) {
+					return $update;
+		}
 	}
 	return false;
 }
@@ -182,21 +197,26 @@ 
  * @return string
  */
 function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+	if ( !current_user_can('update_core') ) {
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+	}
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
-		$cur = new stdClass;
+	if ( ! is_object( $cur ) ) {
+			$cur = new stdClass;
+	}
 
-	if ( ! isset( $cur->current ) )
-		$cur->current = '';
+	if ( ! isset( $cur->current ) ) {
+			$cur->current = '';
+	}
 
-	if ( ! isset( $cur->url ) )
-		$cur->url = '';
+	if ( ! isset( $cur->url ) ) {
+			$cur->url = '';
+	}
 
-	if ( ! isset( $cur->response ) )
-		$cur->response = '';
+	if ( ! isset( $cur->response ) ) {
+			$cur->response = '';
+	}
 
 	switch ( $cur->response ) {
 	case 'development' :
@@ -217,18 +237,21 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
-		return false;
+	if ( is_multisite() && !current_user_can('update_core') ) {
+			return false;
+	}
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
-		return;
+	if ( 'update-core.php' == $pagenow ) {
+			return;
+	}
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
-		return false;
+	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) {
+			return false;
+	}
 
 	if ( current_user_can( 'update_core' ) ) {
 		$msg = sprintf(
@@ -270,8 +293,9 @@ 
 	if ( current_user_can('update_core') ) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
+					$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		}
 	}
 
 	/* translators: 1: version number, 2: theme name */
@@ -316,8 +340,9 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
-		return;
+	if ( !current_user_can('update_plugins' ) ) {
+			return;
+	}
 
 	$plugins = get_site_transient( 'update_plugins' );
 	if ( isset($plugins->response) && is_array($plugins->response) ) {
@@ -447,8 +472,9 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
-		return array();
+	if ( ! isset( $current->response ) ) {
+			return array();
+	}
 
 	$update_themes = array();
 	foreach ( $current->response as $stylesheet => $data ) {
@@ -463,8 +489,9 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
-		return;
+	if ( !current_user_can('update_themes' ) ) {
+			return;
+	}
 
 	$themes = get_site_transient( 'update_themes' );
 	if ( isset($themes->response) && is_array($themes->response) ) {
@@ -581,17 +608,20 @@ 
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
 		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
-			$nag = true;
+		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
+					$nag = true;
+		}
 	}
 
-	if ( ! $nag )
-		return false;
+	if ( ! $nag ) {
+			return false;
+	}
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
-	else
-		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+	if ( current_user_can('update_core') ) {
+			$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	} else {
+			$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+	}
 
 	echo "<div class='update-nag'>$msg</div>";
 }

Switch Indentation +8 added lines, -8 removed lines

@@ -206,16 +206,16 @@
 		$cur->response = '';
 
 	switch ( $cur->response ) {
-	case 'development' :
-		/* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		case 'development' :
+			/* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
+			return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
 
-	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		case 'upgrade' :
+			return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
 
-	case 'latest' :
-	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		case 'latest' :
+		default :
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 

Spacing +179 added lines, -179 removed lines

@@ -13,10 +13,10 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
+	if ( ! is_array($updates))
 		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if (empty($updates))
+		return (object) array('response' => 'latest');
 	return $updates[0];
 }
 
@@ -27,31 +27,31 @@ 
  * 	                     set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
-function get_core_updates( $options = array() ) {
-	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-	$dismissed = get_site_option( 'dismissed_update_core' );
+function get_core_updates($options = array()) {
+	$options = array_merge(array('available' => true, 'dismissed' => false), $options);
+	$dismissed = get_site_option('dismissed_update_core');
 
-	if ( ! is_array( $dismissed ) )
+	if ( ! is_array($dismissed))
 		$dismissed = array();
 
-	$from_api = get_site_transient( 'update_core' );
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
 	$result = array();
-	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
+	foreach ($updates as $update) {
+		if ($update->response == 'autoupdate')
 			continue;
 
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
+		if (array_key_exists($update->current.'|'.$update->locale, $dismissed)) {
+			if ($options['dismissed']) {
 				$update->dismissed = true;
 				$result[] = $update;
 			}
 		} else {
-			if ( $options['available'] ) {
+			if ($options['available']) {
 				$update->dismissed = false;
 				$result[] = $update;
 			}
@@ -70,22 +70,22 @@ 
  * @return array|false False on failure, otherwise the core update offering.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
+	$updates = get_site_transient('update_core');
+	if ( ! $updates || empty($updates->updates))
 		return false;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
+	foreach ($updates->updates as $update) {
+		if ('autoupdate' != $update->response)
 			continue;
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
+		if ( ! $upgrader->should_update('core', $update, ABSPATH))
 			continue;
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
+		if ( ! $auto_update || version_compare($update->current, $auto_update->current, '>'))
 			$auto_update = $update;
 	}
 	return $auto_update;
@@ -100,36 +100,36 @@ 
  * @param string $locale  Locale to query.
  * @return bool|array False on failure. An array of checksums on success.
  */
-function get_core_checksums( $version, $locale ) {
-	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+function get_core_checksums($version, $locale) {
+	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?'.http_build_query(compact('version', 'locale'), null, '&');
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
 	$options = array(
-		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+		'timeout' => ((defined('DOING_CRON') && DOING_CRON) ? 30 : 3),
 	);
 
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
+	$response = wp_remote_get($url, $options);
+	if ($ssl && is_wp_error($response)) {
 		trigger_error(
 			sprintf(
 				/* translators: %s: support forums URL */
-				__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-				__( 'https://wordpress.org/support/' )
-			) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+				__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+				__('https://wordpress.org/support/')
+			).' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'),
 			headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 		);
-		$response = wp_remote_get( $http_url, $options );
+		$response = wp_remote_get($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 		return false;
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
+	if ( ! is_array($body) || ! isset($body['checksums']) || ! is_array($body['checksums']))
 		return false;
 
 	return $body['checksums'];
@@ -140,10 +140,10 @@ 
  * @param object $update
  * @return bool
  */
-function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+function dismiss_core_update($update) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$dismissed[$update->current.'|'.$update->locale] = true;
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -152,15 +152,15 @@ 
  * @param string $locale
  * @return bool
  */
-function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key = $version . '|' . $locale;
+function undismiss_core_update($version, $locale) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$key = $version.'|'.$locale;
 
-	if ( ! isset( $dismissed[$key] ) )
+	if ( ! isset($dismissed[$key]))
 		return false;
 
-	unset( $dismissed[$key] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+	unset($dismissed[$key]);
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -169,15 +169,15 @@ 
  * @param string $locale
  * @return object|false
  */
-function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
+function find_core_update($version, $locale) {
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
+	foreach ($updates as $update) {
+		if ($update->current == $version && $update->locale == $locale)
 			return $update;
 	}
 	return false;
@@ -188,34 +188,34 @@ 
  * @param string $msg
  * @return string
  */
-function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+function core_update_footer($msg = '') {
+	if ( ! current_user_can('update_core'))
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
+	if ( ! is_object($cur))
 		$cur = new stdClass;
 
-	if ( ! isset( $cur->current ) )
+	if ( ! isset($cur->current))
 		$cur->current = '';
 
-	if ( ! isset( $cur->url ) )
+	if ( ! isset($cur->url))
 		$cur->url = '';
 
-	if ( ! isset( $cur->response ) )
+	if ( ! isset($cur->response))
 		$cur->response = '';
 
-	switch ( $cur->response ) {
+	switch ($cur->response) {
 	case 'development' :
 		/* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		return sprintf(__('You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.'), get_bloginfo('version', 'display'), network_admin_url('update-core.php'));
 
 	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		return '<strong><a href="'.network_admin_url('update-core.php').'">'.sprintf(__('Get Version %s'), $cur->current).'</a></strong>';
 
 	case 'latest' :
 	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 }
 
@@ -225,39 +225,39 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
+	if (is_multisite() && ! current_user_can('update_core'))
 		return false;
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
+	if ('update-core.php' == $pagenow)
 		return;
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+	if ( ! isset($cur->response) || $cur->response != 'upgrade')
 		return false;
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		$msg = sprintf(
 			/* translators: 1: Codex URL to release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.'),
 			sprintf(
 				/* translators: %s: WordPress version */
-				esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
+				esc_url(__('https://codex.wordpress.org/Version_%s')),
 				$cur->current
 			),
 			$cur->current,
-			network_admin_url( 'update-core.php' ),
-			esc_attr__( 'Please update WordPress now' )
+			network_admin_url('update-core.php'),
+			esc_attr__('Please update WordPress now')
 		);
 	} else {
 		$msg = sprintf(
 			/* translators: 1: Codex URL to release notes, 2: new WordPress version */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.'),
 			sprintf(
 				/* translators: %s: WordPress version */
-				esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
+				esc_url(__('https://codex.wordpress.org/Version_%s')),
 				$cur->current
 			),
 			$cur->current
@@ -269,21 +269,21 @@ 
 // Called directly from dashboard
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+	if (current_user_can('switch_themes')) {
+		$theme_name = sprintf('<a href="themes.php">%1$s</a>', $theme_name);
 	}
 
 	$msg = '';
 
-	if ( current_user_can('update_core') ) {
+	if (current_user_can('update_core')) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if (isset($cur->response) && $cur->response == 'upgrade')
+			$msg .= '<a href="'.network_admin_url('update-core.php').'" class="button" aria-describedby="wp-version">'.sprintf(__('Update to %s'), $cur->current ? $cur->current : __('Latest')).'</a> ';
 	}
 
 	/* translators: 1: version number, 2: theme name */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
+	$content = __('WordPress %1$s running %2$s theme.');
 
 	/**
 	 * Filters the text displayed in the 'At a Glance' dashboard widget.
@@ -294,9 +294,9 @@ 
 	 *
 	 * @param string $content Default text.
 	 */
-	$content = apply_filters( 'update_right_now_text', $content );
+	$content = apply_filters('update_right_now_text', $content);
 
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">'.$content.'</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -309,11 +309,11 @@ 
 function get_plugin_updates() {
 	$all_plugins = get_plugins();
 	$upgrade_plugins = array();
-	$current = get_site_transient( 'update_plugins' );
-	foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+	$current = get_site_transient('update_plugins');
+	foreach ((array) $all_plugins as $plugin_file => $plugin_data) {
+		if (isset($current->response[$plugin_file])) {
+			$upgrade_plugins[$plugin_file] = (object) $plugin_data;
+			$upgrade_plugins[$plugin_file]->update = $current->response[$plugin_file];
 		}
 	}
 
@@ -324,14 +324,14 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
+	if ( ! current_user_can('update_plugins'))
 		return;
 
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset($plugins->response) && is_array($plugins->response) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach ( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2 );
+	$plugins = get_site_transient('update_plugins');
+	if (isset($plugins->response) && is_array($plugins->response)) {
+		$plugins = array_keys($plugins->response);
+		foreach ($plugins as $plugin_file) {
+			add_action("after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2);
 		}
 	}
 }
@@ -343,74 +343,74 @@ 
  * @param array  $plugin_data Plugin information.
  * @return false|void
  */
-function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( ! isset( $current->response[ $file ] ) ) {
+function wp_plugin_update_row($file, $plugin_data) {
+	$current = get_site_transient('update_plugins');
+	if ( ! isset($current->response[$file])) {
 		return false;
 	}
 
-	$response = $current->response[ $file ];
+	$response = $current->response[$file];
 
 	$plugins_allowedtags = array(
-		'a'       => array( 'href' => array(), 'title' => array() ),
-		'abbr'    => array( 'title' => array() ),
-		'acronym' => array( 'title' => array() ),
+		'a'       => array('href' => array(), 'title' => array()),
+		'abbr'    => array('title' => array()),
+		'acronym' => array('title' => array()),
 		'code'    => array(),
 		'em'      => array(),
 		'strong'  => array(),
 	);
 
-	$plugin_name   = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
-	$details_url   = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $response->slug . '&section=changelog&TB_iframe=true&width=600&height=800' );
+	$plugin_name   = wp_kses($plugin_data['Name'], $plugins_allowedtags);
+	$details_url   = self_admin_url('plugin-install.php?tab=plugin-information&plugin='.$response->slug.'&section=changelog&TB_iframe=true&width=600&height=800');
 
 	/** @var WP_Plugins_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
-	if ( is_network_admin() || ! is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active' : '';
+	if (is_network_admin() || ! is_multisite()) {
+		if (is_network_admin()) {
+			$active_class = is_plugin_active_for_network($file) ? ' active' : '';
 		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
+			$active_class = is_plugin_active($file) ? ' active' : '';
 		}
 
-		echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $response->slug . '-update' ) . '" data-slug="' . esc_attr( $response->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
+		echo '<tr class="plugin-update-tr'.$active_class.'" id="'.esc_attr($response->slug.'-update').'" data-slug="'.esc_attr($response->slug).'" data-plugin="'.esc_attr($file).'"><td colspan="'.esc_attr($wp_list_table->get_column_count()).'" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version
 			);
-		} elseif ( empty( $response->package ) ) {
+		} elseif (empty($response->package)) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version
 			);
 		} else {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version,
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
-				sprintf( 'class="update-link" aria-label="%s"',
+				wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$file, 'upgrade-plugin_'.$file),
+				sprintf('class="update-link" aria-label="%s"',
 					/* translators: %s: plugin name */
-					esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+					esc_attr(sprintf(__('Update %s now'), $plugin_name))
 				)
 			);
 		}
@@ -450,7 +450,7 @@ 
 		 *     @type string $package     Plugin update package URL.
 		 * }
 		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $response );
+		do_action("in_plugin_update_message-{$file}", $plugin_data, $response);
 
 		echo '</p></div></td></tr>';
 	}
@@ -463,13 +463,13 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
+	if ( ! isset($current->response))
 		return array();
 
 	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
+	foreach ($current->response as $stylesheet => $data) {
+		$update_themes[$stylesheet] = wp_get_theme($stylesheet);
+		$update_themes[$stylesheet]->update = $data;
 	}
 
 	return $update_themes;
@@ -479,15 +479,15 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return;
 
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset($themes->response) && is_array($themes->response) ) {
-		$themes = array_keys( $themes->response );
+	$themes = get_site_transient('update_themes');
+	if (isset($themes->response) && is_array($themes->response)) {
+		$themes = array_keys($themes->response);
 
-		foreach ( $themes as $theme ) {
-			add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+		foreach ($themes as $theme) {
+			add_action("after_theme_row_$theme", 'wp_theme_update_row', 10, 2);
 		}
 	}
 }
@@ -499,63 +499,63 @@ 
  * @param WP_Theme $theme     Theme object.
  * @return false|void
  */
-function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
+function wp_theme_update_row($theme_key, $theme) {
+	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response[ $theme_key ] ) ) {
+	if ( ! isset($current->response[$theme_key])) {
 		return false;
 	}
 
-	$response = $current->response[ $theme_key ];
+	$response = $current->response[$theme_key];
 
-	$details_url = add_query_arg( array(
+	$details_url = add_query_arg(array(
 		'TB_iframe' => 'true',
 		'width'     => 1024,
 		'height'    => 800,
-	), $current->response[ $theme_key ]['url'] );
+	), $current->response[$theme_key]['url']);
 
 	/** @var WP_MS_Themes_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
+	$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-	$active = $theme->is_allowed( 'network' ) ? ' active' : '';
+	$active = $theme->is_allowed('network') ? ' active' : '';
 
-	echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
-	if ( ! current_user_can( 'update_themes' ) ) {
+	echo '<tr class="plugin-update-tr'.$active.'" id="'.esc_attr($theme->get_stylesheet().'-update').'" data-slug="'.esc_attr($theme->get_stylesheet()).'"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
+	if ( ! current_user_can('update_themes')) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version']
 		);
-	} elseif ( empty( $response['package'] ) ) {
+	} elseif (empty($response['package'])) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version']
 		);
 	} else {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version'],
-			wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
-			sprintf( 'class="update-link" aria-label="%s"',
+			wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=').$theme_key, 'upgrade-theme_'.$theme_key),
+			sprintf('class="update-link" aria-label="%s"',
 				/* translators: %s: theme name */
-				esc_attr( sprintf( __( 'Update %s now' ), $theme['Name'] ) )
+				esc_attr(sprintf(__('Update %s now'), $theme['Name']))
 			)
 		);
 	}
@@ -578,7 +578,7 @@ 
 	 *     @type string $package     Theme update package URL.
 	 * }
 	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $response );
+	do_action("in_theme_update_message-{$theme_key}", $theme, $response);
 
 	echo '</p></div></td></tr>';
 }
@@ -589,11 +589,11 @@ 
  * @return false|void
  */
 function maintenance_nag() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
+	$nag = isset($upgrading);
+	if ( ! $nag) {
+		$failed = get_site_option('auto_core_update_failed');
 		/*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the install claims we're running the version we attempted, nag.
@@ -604,16 +604,16 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+		$comparison = ! empty($failed['critical']) ? '>=' : '>';
+		if (version_compare($failed['attempted'], $wp_version, $comparison))
 			$nag = true;
 	}
 
-	if ( ! $nag )
+	if ( ! $nag)
 		return false;
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	if (current_user_can('update_core'))
+		$msg = sprintf(__('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php');
 	else
 		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 
@@ -649,24 +649,24 @@ 
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins */
-							printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugin successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes */
-							printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s theme successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } else { #>
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins */
-							printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugins successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes */
-							printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s themes successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } #>
@@ -676,15 +676,15 @@ 
 						<# if ( 1 === data.errors ) { #>
 							<?php
 							/* translators: %s: Number of failed updates */
-							printf( __( '%s update failed.' ), '{{ data.errors }}' );
+							printf(__('%s update failed.'), '{{ data.errors }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of failed updates */
-							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
+							printf(__('%s updates failed.'), '{{ data.errors }}');
 							?>
 						<# } #>
-						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Show more details'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				<# } #>
@@ -744,7 +744,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Plugin name */
-						_x( '%s was successfully deleted.', 'plugin' ),
+						_x('%s was successfully deleted.', 'plugin'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>
@@ -752,7 +752,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Theme name */
-						_x( '%s was successfully deleted.', 'theme' ),
+						_x('%s was successfully deleted.', 'theme'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>

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

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
+		$defaults = array('url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->theme = $args['theme'];
@@ -33,37 +33,37 @@ 
 	 * @access public
 	 */
 	public function after() {
-		$this->decrement_update_count( 'theme' );
+		$this->decrement_update_count('theme');
 
 		$update_actions = array();
-		if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
+		if ( ! empty($this->upgrader->result['destination_name']) && $theme_info = $this->upgrader->theme_info()) {
 			$name       = $theme_info->display('Name');
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
-			$activate_link = add_query_arg( array(
+			$activate_link = add_query_arg(array(
 				'action'     => 'activate',
-				'template'   => urlencode( $template ),
-				'stylesheet' => urlencode( $stylesheet ),
-			), admin_url('themes.php') );
-			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+				'template'   => urlencode($template),
+				'stylesheet' => urlencode($stylesheet),
+			), admin_url('themes.php'));
+			$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
 
-			if ( get_stylesheet() == $stylesheet ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
+			if (get_stylesheet() == $stylesheet) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Customize').'</span><span class="screen-reader-text">'.sprintf(__('Customize &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-			} elseif ( current_user_can( 'switch_themes' ) ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+			} elseif (current_user_can('switch_themes')) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+				$update_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error($this->result) || is_network_admin())
+				unset($update_actions['preview'], $update_actions['activate']);
 		}
 
-		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		$update_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
 		/**
 		 * Filters the list of action links available following a single theme update.
@@ -73,9 +73,9 @@ 
 		 * @param array  $update_actions Array of theme action links.
 		 * @param string $theme          Theme directory name.
 		 */
-		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
+		$update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -59,8 +59,9 @@ 
 				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
+							unset( $update_actions['preview'], $update_actions['activate'] );
+			}
 		}
 
 		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
@@ -75,7 +76,8 @@ 
 		 */
 		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }

src/wp-admin/includes/schema.php

Braces +92 added lines, -64 removed lines

@@ -38,8 +38,9 @@ 
 
 	$charset_collate = $wpdb->get_charset_collate();
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ( $blog_id && $blog_id != $wpdb->blogid ) {
+			$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	}
 
 	// Engage multisite if in the middle of turning it on from network.php.
 	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
@@ -235,10 +236,11 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
-	else
-		$global_tables = $users_single_table . $usermeta_table;
+	if ( $is_multisite ) {
+			$global_tables = $users_multi_table . $usermeta_table;
+	} else {
+			$global_tables = $users_single_table . $usermeta_table;
+	}
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -315,8 +317,9 @@ 
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 		case 'ms_global' :
 			$queries = $ms_global_tables;
@@ -324,13 +327,15 @@ 
 		case 'all' :
 		default:
 			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if ( isset( $old_blog_id ) ) {
+			$wpdb->set_blog_id( $old_blog_id );
+	}
 
 	return $queries;
 }
@@ -385,10 +390,11 @@ 
 	   for all timezone strings supported by PHP.
 	*/
 	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
-		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
-			$timezone_string = $offset_or_tz;
+	if ( is_numeric( $offset_or_tz ) ) {
+			$gmt_offset = $offset_or_tz;
+	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) ) {
+				$timezone_string = $offset_or_tz;
+	}
 
 	$options = array(
 	'siteurl' => $guessurl,
@@ -539,25 +545,32 @@ 
 
 	$insert = '';
 	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
-			continue;
-		if ( in_array($option, $fat_options) )
-			$autoload = 'no';
-		else
-			$autoload = 'yes';
-
-		if ( is_array($value) )
-			$value = serialize($value);
-		if ( !empty($insert) )
-			$insert .= ', ';
+		if ( in_array($option, $existing_options) ) {
+					continue;
+		}
+		if ( in_array($option, $fat_options) ) {
+					$autoload = 'no';
+		} else {
+					$autoload = 'yes';
+		}
+
+		if ( is_array($value) ) {
+					$value = serialize($value);
+		}
+		if ( !empty($insert) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( !empty($insert) ) {
+			$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	}
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( !__get_option('home') ) {
+		update_option('home', $guessurl);
+	}
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -578,8 +591,9 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
 	);
-	foreach ( $unusedoptions as $option )
-		delete_option($option);
+	foreach ( $unusedoptions as $option ) {
+			delete_option($option);
+	}
 
 	// Delete obsolete magpie stuff.
 	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
@@ -737,8 +751,9 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
-			continue;
+		if ( empty($role) ) {
+					continue;
+		}
 
 		$role->add_cap('edit_others_pages');
 		$role->add_cap('edit_published_pages');
@@ -869,8 +884,9 @@ 
  */
 if ( !function_exists( 'install_network' ) ) :
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
+			define( 'WP_INSTALLING_NETWORK', true );
+	}
 
 	dbDelta( wp_get_db_schema( 'global' ) );
 }
@@ -900,20 +916,25 @@ 
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ( '' == $domain ) {
+			$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
+	}
+	if ( '' == $site_name ) {
+			$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	}
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	}
 
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	if ( ! is_email( $email ) ) {
+			$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	}
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
 	$site_user = get_user_by( 'email', $email );
@@ -955,8 +976,9 @@ 
 		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
 		if ( $users ) {
 			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
-					$site_admins[] = $user->user_login;
+				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) ) {
+									$site_admins[] = $user->user_login;
+				}
 			}
 		}
 	} else {
@@ -1019,8 +1041,9 @@ 
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
-		$sitemeta['illegal_names'][] = 'blog';
+	if ( ! $subdomain_install ) {
+			$sitemeta['illegal_names'][] = 'blog';
+	}
 
 	/**
 	 * Filters meta for a network on creation.
@@ -1034,10 +1057,12 @@ 
 
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
-			$insert .= ', ';
+		if ( is_array( $meta_value ) ) {
+					$meta_value = serialize( $meta_value );
+		}
+		if ( !empty( $insert ) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
 	}
 	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
@@ -1059,24 +1084,27 @@ 
 		update_user_meta( $site_user->ID, 'source_domain', $domain );
 		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		if ( $subdomain_install ) {
+					$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		} else {
+					$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		}
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
-			return true;
+		if ( ! $subdomain_install ) {
+					return true;
+		}
 
 		$vhost_ok = false;
 		$errstr = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
 		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
-			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
-				$vhost_ok = true;
+		if ( is_wp_error( $page ) ) {
+					$errstr = $page->get_error_message();
+		} elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
+						$vhost_ok = true;
+		}
 
 		if ( ! $vhost_ok ) {
 			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';

Spacing +155 added lines, -155 removed lines

@@ -33,16 +33,16 @@ 
  * @param int $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site ID.
  * @return string The SQL needed to create the requested tables.
  */
-function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
+function wp_get_db_schema($scope = 'all', $blog_id = null) {
 	global $wpdb;
 
 	$charset_collate = $wpdb->get_charset_collate();
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ($blog_id && $blog_id != $wpdb->blogid)
+		$old_blog_id = $wpdb->set_blog_id($blog_id);
 
 	// Engage multisite if in the middle of turning it on from network.php.
-	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
+	$is_multisite = is_multisite() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK);
 
 	/*
 	 * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
@@ -235,10 +235,10 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
+	if ($is_multisite)
+		$global_tables = $users_multi_table.$usermeta_table;
 	else
-		$global_tables = $users_single_table . $usermeta_table;
+		$global_tables = $users_single_table.$usermeta_table;
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -309,13 +309,13 @@ 
   KEY domain_path (domain(140),path(51))
 ) $charset_collate;";
 
-	switch ( $scope ) {
+	switch ($scope) {
 		case 'blog' :
 			$queries = $blog_tables;
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 		case 'ms_global' :
@@ -323,20 +323,20 @@ 
 			break;
 		case 'all' :
 		default:
-			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
+			$queries = $global_tables.$blog_tables;
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if (isset($old_blog_id))
+		$wpdb->set_blog_id($old_blog_id);
 
 	return $queries;
 }
 
 // Populate for back compat.
-$wp_queries = wp_get_db_schema( 'all' );
+$wp_queries = wp_get_db_schema('all');
 
 /**
  * Create WordPress options and set the default values.
@@ -356,9 +356,9 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'populate_options' );
+	do_action('populate_options');
 
-	if ( ini_get('safe_mode') ) {
+	if (ini_get('safe_mode')) {
 		// Safe mode can break mkdir() so use a flat structure by default.
 		$uploads_use_yearmonth_folders = 0;
 	} else {
@@ -367,13 +367,13 @@ 
 
 	// If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
 	$stylesheet = $template = WP_DEFAULT_THEME;
-	$theme = wp_get_theme( WP_DEFAULT_THEME );
-	if ( ! $theme->exists() ) {
+	$theme = wp_get_theme(WP_DEFAULT_THEME);
+	if ( ! $theme->exists()) {
 		$theme = WP_Theme::get_core_default_theme();
 	}
 
 	// If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
-	if ( $theme ) {
+	if ($theme) {
 		$stylesheet = $theme->get_stylesheet();
 		$template   = $theme->get_template();
 	}
@@ -384,10 +384,10 @@ 
 	   or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php
 	   for all timezone strings supported by PHP.
 	*/
-	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
+	$offset_or_tz = _x('0', 'default GMT offset or timezone string');
+	if (is_numeric($offset_or_tz))
 		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
+	elseif ($offset_or_tz && in_array($offset_or_tz, timezone_identifiers_list()))
 			$timezone_string = $offset_or_tz;
 
 	$options = array(
@@ -399,7 +399,7 @@ 
 	'users_can_register' => 0,
 	'admin_email' => 'you@example.com',
 	/* translators: default start of the week. 0 = Sunday, 1 = Monday */
-	'start_of_week' => _x( '1', 'start of week' ),
+	'start_of_week' => _x('1', 'start of week'),
 	'use_balanceTags' => 0,
 	'use_smilies' => 1,
 	'require_name_email' => 1,
@@ -519,45 +519,45 @@ 
 	);
 
 	// 3.3
-	if ( ! is_multisite() ) {
-		$options['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+	if ( ! is_multisite()) {
+		$options['initial_db_version'] = ! empty($wp_current_db_version) && $wp_current_db_version < $wp_db_version
 			? $wp_current_db_version : $wp_db_version;
 	}
 
 	// 3.0 multisite
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		/* translators: site tagline */
-		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_network()->site_name );
-		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
+		$options['blogdescription'] = sprintf(__('Just another %s site'), get_network()->site_name);
+		$options['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 
 	// Set autoload to no for these options
-	$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
+	$fat_options = array('moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins');
 
-	$keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
-	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
+	$keys = "'".implode("', '", array_keys($options))."'";
+	$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )");
 
 	$insert = '';
-	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
+	foreach ($options as $option => $value) {
+		if (in_array($option, $existing_options))
 			continue;
-		if ( in_array($option, $fat_options) )
+		if (in_array($option, $fat_options))
 			$autoload = 'no';
 		else
 			$autoload = 'yes';
 
-		if ( is_array($value) )
+		if (is_array($value))
 			$value = serialize($value);
-		if ( !empty($insert) )
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+		$insert .= $wpdb->prepare("(%s, %s, %s)", $option, $value, $autoload);
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( ! empty($insert))
+		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES ".$insert);
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( ! __get_option('home')) update_option('home', $guessurl);
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -578,7 +578,7 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
 	);
-	foreach ( $unusedoptions as $option )
+	foreach ($unusedoptions as $option)
 		delete_option($option);
 
 	// Delete obsolete magpie stuff.
@@ -595,15 +595,15 @@ 
 		AND a.option_name NOT LIKE %s
 		AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
 		AND b.option_value < %d";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_transient_').'%', $wpdb->esc_like('_transient_timeout_').'%', $time));
 
-	if ( is_main_site() && is_main_network() ) {
+	if (is_main_site() && is_main_network()) {
 		$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
 			WHERE a.option_name LIKE %s
 			AND a.option_name NOT LIKE %s
 			AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
 			AND b.option_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 }
 
@@ -737,7 +737,7 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
+		if (empty($role))
 			continue;
 
 		$role->add_cap('edit_others_pages');
@@ -758,19 +758,19 @@ 
 	}
 
 	$role = get_role('administrator');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_users');
 		$role->add_cap('create_users');
 	}
 
 	$role = get_role('author');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 		$role->add_cap('delete_published_posts');
 	}
 
 	$role = get_role('contributor');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 	}
 }
@@ -781,10 +781,10 @@ 
  * @since 2.3.0
  */
 function populate_roles_230() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'unfiltered_upload' );
+	if ( ! empty($role)) {
+		$role->add_cap('unfiltered_upload');
 	}
 }
 
@@ -794,10 +794,10 @@ 
  * @since 2.5.0
  */
 function populate_roles_250() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'edit_dashboard' );
+	if ( ! empty($role)) {
+		$role->add_cap('edit_dashboard');
 	}
 }
 
@@ -807,11 +807,11 @@ 
  * @since 2.6.0
  */
 function populate_roles_260() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_plugins' );
-		$role->add_cap( 'delete_plugins' );
+	if ( ! empty($role)) {
+		$role->add_cap('update_plugins');
+		$role->add_cap('delete_plugins');
 	}
 }
 
@@ -821,11 +821,11 @@ 
  * @since 2.7.0
  */
 function populate_roles_270() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_plugins' );
-		$role->add_cap( 'update_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_plugins');
+		$role->add_cap('update_themes');
 	}
 }
 
@@ -835,10 +835,10 @@ 
  * @since 2.8.0
  */
 function populate_roles_280() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_themes');
 	}
 }
 
@@ -848,30 +848,30 @@ 
  * @since 3.0.0
  */
 function populate_roles_300() {
-	$role = get_role( 'administrator' );
-
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_core' );
-		$role->add_cap( 'list_users' );
-		$role->add_cap( 'remove_users' );
-		$role->add_cap( 'promote_users' );
-		$role->add_cap( 'edit_theme_options' );
-		$role->add_cap( 'delete_themes' );
-		$role->add_cap( 'export' );
+	$role = get_role('administrator');
+
+	if ( ! empty($role)) {
+		$role->add_cap('update_core');
+		$role->add_cap('list_users');
+		$role->add_cap('remove_users');
+		$role->add_cap('promote_users');
+		$role->add_cap('edit_theme_options');
+		$role->add_cap('delete_themes');
+		$role->add_cap('export');
 	}
 }
 
-if ( !function_exists( 'install_network' ) ) :
+if ( ! function_exists('install_network')) :
 /**
  * Install Network.
  *
  * @since 3.0.0
  */
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined('WP_INSTALLING_NETWORK'))
+		define('WP_INSTALLING_NETWORK', true);
 
-	dbDelta( wp_get_db_schema( 'global' ) );
+	dbDelta(wp_get_db_schema('global'));
 }
 endif;
 
@@ -895,75 +895,75 @@ 
  * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
  *                       so the error code must be checked) or failure.
  */
-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
+function populate_network($network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false) {
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ('' == $domain)
+		$errors->add('empty_domain', __('You must provide a domain name.'));
+	if ('' == $site_name)
+		$errors->add('empty_sitename', __('You must provide a name for your network of sites.'));
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ($network_id == $wpdb->get_var($wpdb->prepare("SELECT id FROM $wpdb->site WHERE id = %d", $network_id)))
+		$errors->add('siteid_exists', __('The network already exists.'));
 
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	if ( ! is_email($email))
+		$errors->add('invalid_email', __('You must provide a valid email address.'));
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
-	$site_user = get_user_by( 'email', $email );
-	if ( false === $site_user ) {
+	$site_user = get_user_by('email', $email);
+	if (false === $site_user) {
 		$site_user = wp_get_current_user();
 	}
 
 	// Set up site tables.
-	$template = get_option( 'template' );
-	$stylesheet = get_option( 'stylesheet' );
-	$allowed_themes = array( $stylesheet => true );
+	$template = get_option('template');
+	$stylesheet = get_option('stylesheet');
+	$allowed_themes = array($stylesheet => true);
 
-	if ( $template != $stylesheet ) {
-		$allowed_themes[ $template ] = true;
+	if ($template != $stylesheet) {
+		$allowed_themes[$template] = true;
 	}
 
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
-		$allowed_themes[ WP_DEFAULT_THEME ] = true;
+	if (WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template) {
+		$allowed_themes[WP_DEFAULT_THEME] = true;
 	}
 
 	// If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
-	if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
-		if ( $core_default = WP_Theme::get_core_default_theme() ) {
-			$allowed_themes[ $core_default->get_stylesheet() ] = true;
+	if ( ! wp_get_theme(WP_DEFAULT_THEME)->exists()) {
+		if ($core_default = WP_Theme::get_core_default_theme()) {
+			$allowed_themes[$core_default->get_stylesheet()] = true;
 		}
 	}
 
-	if ( 1 == $network_id ) {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
+	if (1 == $network_id) {
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path));
 		$network_id = $wpdb->insert_id;
 	} else {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path, 'id' => $network_id));
 	}
 
-	wp_cache_delete( 'networks_have_paths', 'site-options' );
+	wp_cache_delete('networks_have_paths', 'site-options');
 
-	if ( !is_multisite() ) {
-		$site_admins = array( $site_user->user_login );
-		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
-		if ( $users ) {
-			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
+	if ( ! is_multisite()) {
+		$site_admins = array($site_user->user_login);
+		$users = get_users(array('fields' => array('ID', 'user_login')));
+		if ($users) {
+			foreach ($users as $user) {
+				if (is_super_admin($user->ID) && ! in_array($user->user_login, $site_admins))
 					$site_admins[] = $user->user_login;
 			}
 		}
 	} else {
-		$site_admins = get_site_option( 'site_admins' );
+		$site_admins = get_site_option('site_admins');
 	}
 
 	/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-	$welcome_email = __( 'Howdy USERNAME,
+	$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -990,35 +990,35 @@ 
 	);
 	$audio_exts = wp_get_audio_extensions();
 	$video_exts = wp_get_video_extensions();
-	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
+	$upload_filetypes = array_unique(array_merge($misc_exts, $audio_exts, $video_exts));
 
 	$sitemeta = array(
 		'site_name' => $site_name,
 		'admin_email' => $email,
 		'admin_user_id' => $site_user->ID,
 		'registration' => 'none',
-		'upload_filetypes' => implode( ' ', $upload_filetypes ),
+		'upload_filetypes' => implode(' ', $upload_filetypes),
 		'blog_upload_space' => 100,
 		'fileupload_maxk' => 1500,
 		'site_admins' => $site_admins,
 		'allowedthemes' => $allowed_themes,
-		'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
+		'illegal_names' => array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files'),
 		'wpmu_upgrade_site' => $wp_db_version,
 		'welcome_email' => $welcome_email,
 		/* translators: %s: site link */
-		'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
+		'first_post' => __('Welcome to %s. This is your first post. Edit or delete it, then start blogging!'),
 		// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
-		'siteurl' => get_option( 'siteurl' ) . '/',
+		'siteurl' => get_option('siteurl').'/',
 		'add_new_users' => '0',
-		'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-		'subdomain_install' => intval( $subdomain_install ),
+		'upload_space_check_disabled' => is_multisite() ? get_site_option('upload_space_check_disabled') : '1',
+		'subdomain_install' => intval($subdomain_install),
 		'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'initial_db_version' => get_option( 'initial_db_version' ),
+		'ms_files_rewriting' => is_multisite() ? get_site_option('ms_files_rewriting') : '0',
+		'initial_db_version' => get_option('initial_db_version'),
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
+	if ( ! $subdomain_install)
 		$sitemeta['illegal_names'][] = 'blog';
 
 	/**
@@ -1029,17 +1029,17 @@ 
 	 * @param array $sitemeta   Associative array of network meta keys and values to be inserted.
 	 * @param int   $network_id ID of network to populate.
 	 */
-	$sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );
+	$sitemeta = apply_filters('populate_network_meta', $sitemeta, $network_id);
 
 	$insert = '';
-	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
+	foreach ($sitemeta as $meta_key => $meta_value) {
+		if (is_array($meta_value))
+			$meta_value = serialize($meta_value);
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
+		$insert .= $wpdb->prepare("( %d, %s, %s)", $network_id, $meta_key, $meta_value);
 	}
-	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
+	$wpdb->query("INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES ".$insert);
 
 	/*
 	 * When upgrading from single to multisite, assume the current site will
@@ -1048,58 +1048,58 @@ 
 	 * these steps since the main site of the new network has not yet been
 	 * created.
 	 */
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$current_site = new stdClass;
 		$current_site->domain = $domain;
 		$current_site->path = $path;
-		$current_site->site_name = ucfirst( $domain );
-		$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+		$current_site->site_name = ucfirst($domain);
+		$wpdb->insert($wpdb->blogs, array('site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
 		$current_site->blog_id = $blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
+		update_user_meta($site_user->ID, 'source_domain', $domain);
+		update_user_meta($site_user->ID, 'primary_blog', $blog_id);
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		if ($subdomain_install)
+			$wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
 		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+			$wp_rewrite->set_permalink_structure('/blog/%year%/%monthnum%/%day%/%postname%/');
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
+		if ( ! $subdomain_install)
 			return true;
 
 		$vhost_ok = false;
 		$errstr = '';
-		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
-		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
+		$hostname = substr(md5(time()), 0, 6).'.'.$domain; // Very random hostname!
+		$page = wp_remote_get('http://'.$hostname, array('timeout' => 5, 'httpversion' => '1.1'));
+		if (is_wp_error($page))
 			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
+		elseif (200 == wp_remote_retrieve_response_code($page))
 				$vhost_ok = true;
 
-		if ( ! $vhost_ok ) {
-			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
+		if ( ! $vhost_ok) {
+			$msg = '<p><strong>'.__('Warning! Wildcard DNS may not be configured correctly!').'</strong></p>';
 
-			$msg .= '<p>' . sprintf(
+			$msg .= '<p>'.sprintf(
 				/* translators: %s: host name */
-				__( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
-				'<code>' . $hostname . '</code>'
+				__('The installer attempted to contact a random hostname (%s) on your domain.'),
+				'<code>'.$hostname.'</code>'
 			);
-			if ( ! empty ( $errstr ) ) {
+			if ( ! empty ($errstr)) {
 				/* translators: %s: error message */
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+				$msg .= ' '.sprintf(__('This resulted in an error message: %s'), '<code>'.$errstr.'</code>');
 			}
 			$msg .= '</p>';
 
-			$msg .= '<p>' . sprintf(
+			$msg .= '<p>'.sprintf(
 				/* translators: %s: asterisk symbol (*) */
-				__( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
+				__('To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.'),
 				'<code>*</code>'
-			) . '</p>';
+			).'</p>';
 
-			$msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
+			$msg .= '<p>'.__('You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.').'</p>';
 
-			return new WP_Error( 'no_wildcard_dns', $msg );
+			return new WP_Error('no_wildcard_dns', $msg);
 		}
 	}
 

src/wp-admin/includes/image-edit.php

Indentation +2 added lines, -2 removed lines

@@ -520,7 +520,7 @@ 
 		 * @since 3.5.0
 		 *
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
- 		 * @param array           $changes Array of change operations.
+		 * @param array           $changes Array of change operations.
 		 */
 		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
 	} elseif ( is_resource( $image ) ) {
@@ -532,7 +532,7 @@ 
 		 * @deprecated 3.5.0 Use wp_image_editor_before_change instead.
 		 *
 		 * @param resource $image   GD image resource.
- 		 * @param array    $changes Array of change operations.
+		 * @param array    $changes Array of change operations.
 		 */
 		$image = apply_filters( 'image_edit_before_change', $image, $changes );
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
  * @ignore
  * @param resource  $img   Image resource.
  * @param float|int $angle Image rotation angle, in degrees.
- * @return resource|false GD image resource, false otherwise.
+ * @return resource GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
 	_deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::rotate' ) );

Spacing +230 added lines, -230 removed lines

@@ -20,22 +20,22 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
+	if (isset($meta['width'], $meta['height']))
+		$big = max($meta['width'], $meta['height']);
 	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+		die(__('Image data does not exist. Please re-upload the image.'));
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
-	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty($backup_sizes) && isset($backup_sizes['full-orig'], $meta['file']))
+		$can_restore = $backup_sizes['full-orig']['file'] != basename($meta['file']);
 
-	if ( $msg ) {
-		if ( isset($msg->error) )
+	if ($msg) {
+		if (isset($msg->error))
 			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
+		elseif (isset($msg->msg))
 			$note = "<div class='updated'><p>$msg->msg</p></div>";
 	}
 
@@ -46,28 +46,28 @@ 
 	<div class="imgedit-settings">
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Scale Image' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
+		<h2><?php _e('Scale Image'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Scale Image Help'); ?></span></button>
 		<div class="imgedit-help">
 		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
-		<p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+		<?php if (isset($meta['width'], $meta['height'])): ?>
+		<p><?php printf(__('Original dimensions %s'), $meta['width'].' &times; '.$meta['height']); ?></p>
 		<?php endif ?>
 		<div class="imgedit-submit">
 
 		<fieldset class="imgedit-scale">
-		<legend><?php _e( 'New dimensions:' ); ?></legend>
+		<legend><?php _e('New dimensions:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'scale width' ); ?></span>
-		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale width'); ?></span>
+		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'scale height' ); ?></span>
-		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale height'); ?></span>
+		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 		</label>
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e('Scale'); ?>" />
  		</div>
 		</fieldset>
 
@@ -75,20 +75,20 @@ 
 	</div>
 	</div>
 
-<?php if ( $can_restore ) { ?>
+<?php if ($can_restore) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e('Restore Original Image'); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
+		if ( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE)
 			echo ' '.__('Previously edited copies of the image will not be deleted.');
 
 		?></p>
 		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e('Restore image'); ?>" <?php echo $can_restore; ?> />
 		</div>
 		</div>
 	</div>
@@ -98,8 +98,8 @@ 
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Image Crop' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+		<h2><?php _e('Image Crop'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Image Crop Help'); ?></span></button>
 
 		<div class="imgedit-help">
 		<p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
@@ -113,26 +113,26 @@ 
 	</div>
 
 	<fieldset class="imgedit-crop-ratio">
-		<legend><?php _e( 'Aspect ratio:' ); ?></legend>
+		<legend><?php _e('Aspect ratio:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio width'); ?></span>
 		<input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
 		</label>
 		<span class="imgedit-separator">:</span>
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio height'); ?></span>
 		<input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
 		</label>
 		</div>
 	</fieldset>
 
 	<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
-		<legend><?php _e( 'Selection:' ); ?></legend>
+		<legend><?php _e('Selection:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'selection width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection width'); ?></span>
 		<input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'selection height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection height'); ?></span>
 		<input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		</label>
 		</div>
@@ -140,25 +140,25 @@ 
 
 	</div>
 
-	<?php if ( $thumb && $sub_sizes ) {
-		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+	<?php if ($thumb && $sub_sizes) {
+		$thumb_img = wp_constrain_dimensions($thumb['width'], $thumb['height'], 160, 120);
 	?>
 
 	<div class="imgedit-group imgedit-applyto">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+		<h2><?php _e('Thumbnail Settings'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Thumbnail Settings Help'); ?></span></button>
 		<p class="imgedit-help"><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
 	</div>
 
 	<figure class="imgedit-thumbnail-preview">
 		<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
-		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e('Current thumbnail'); ?></figcaption>
 	</figure>
 
 	<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
 	<fieldset>
-		<legend><strong><?php _e( 'Apply changes to:' ); ?></strong></legend>
+		<legend><strong><?php _e('Apply changes to:'); ?></strong></legend>
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
@@ -182,26 +182,26 @@ 
 	<div class="imgedit-panel-content wp-clearfix">
 		<?php echo $note; ?>
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button><?php
+			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Crop'); ?></span></button><?php
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) {
+		if (wp_image_editor_supports(array('mime_type' => get_post_mime_type($post_id), 'methods' => array('rotate')))) {
 			$note_no_rotate = '';
 	?>
-			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
-			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
+			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate counter-clockwise'); ?></span></button>
+			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate clockwise'); ?></span></button>
 	<?php } else {
-			$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
+			$note_no_rotate = '<p class="note-no-rotate"><em>'.__('Image rotation is not supported by your web host.').'</em></p>';
 	?>
 			<button type="button" class="imgedit-rleft button disabled" disabled></button>
 			<button type="button" class="imgedit-rright button disabled" disabled></button>
 	<?php } ?>
 
-			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e( 'Flip vertically' ); ?></span></button>
-			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e( 'Flip horizontally' ); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e('Flip vertically'); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e('Flip horizontally'); ?></span></button>
 
-			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Undo' ); ?></span></button>
-			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Redo' ); ?></span></button>
+			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Undo'); ?></span></button>
+			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Redo'); ?></span></button>
 			<?php echo $note_no_rotate; ?>
 		</div>
 
@@ -209,16 +209,16 @@ 
 		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
 		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
 		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
+		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url('admin-ajax.php', 'relative'); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e('Cancel'); ?>" />
+			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e('Save'); ?>" />
 		</div>
 	</div>
 
@@ -238,8 +238,8 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_stream_image( $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_stream_image($image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance for the image to be streamed to the browser.
@@ -249,14 +249,14 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
 		 * @param int             $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
+		if (is_wp_error($image->stream($mime_type)))
 			return false;
 
 		return true;
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
 		/**
 		 * Filters the GD image resource to be streamed to the browser.
@@ -267,18 +267,18 @@ 
 		 * @param resource $image   Image resource to be streamed.
 		 * @param int      $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $image, null, 90 );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($image, null, 90);
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $image );
+				header('Content-Type: image/png');
+				return imagepng($image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $image );
+				header('Content-Type: image/gif');
+				return imagegif($image);
 			default:
 				return false;
 		}
@@ -294,11 +294,11 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -314,17 +314,17 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		return $image->save( $filename, $mime_type );
+		return $image->save($filename, $mime_type);
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -341,20 +341,20 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
-				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+				return imagejpeg($image, $filename, apply_filters('jpeg_quality', 90, 'edit_image'));
 			case 'image/png':
-				return imagepng( $image, $filename );
+				return imagepng($image, $filename);
 			case 'image/gif':
-				return imagegif( $image, $filename );
+				return imagegif($image, $filename);
 			default:
 				return false;
 		}
@@ -387,10 +387,10 @@ 
  * @return resource|false GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()' );
-	if ( function_exists('imagerotate') ) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()');
+	if (function_exists('imagerotate')) {
 		$rotated = imagerotate($img, $angle, 0);
-		if ( is_resource($rotated) ) {
+		if (is_resource($rotated)) {
 			imagedestroy($img);
 			$img = $rotated;
 		}
@@ -410,17 +410,17 @@ 
  * @return resource (maybe) flipped image resource.
  */
 function _flip_image_resource($img, $horz, $vert) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()' );
+	_deprecated_function(__FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()');
 	$w = imagesx($img);
 	$h = imagesy($img);
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
+	if (is_resource($dst)) {
 		$sx = $vert ? ($w - 1) : 0;
 		$sy = $horz ? ($h - 1) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh) ) {
+		if (imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -443,8 +443,8 @@ 
  */
 function _crop_image_resource($img, $x, $y, $w, $h) {
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		if ( imagecopy($dst, $img, 0, 0, $x, $y, $w, $h) ) {
+	if (is_resource($dst)) {
+		if (imagecopy($dst, $img, 0, 0, $x, $y, $w, $h)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -461,24 +461,24 @@ 
  * @param array           $changes Array of change operations.
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
-function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+function image_edit_apply_changes($image, $changes) {
+	if (is_resource($image))
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
-	if ( !is_array($changes) )
+	if ( ! is_array($changes))
 		return $image;
 
 	// Expand change operations.
-	foreach ( $changes as $key => $obj ) {
-		if ( isset($obj->r) ) {
+	foreach ($changes as $key => $obj) {
+		if (isset($obj->r)) {
 			$obj->type = 'rotate';
 			$obj->angle = $obj->r;
 			unset($obj->r);
-		} elseif ( isset($obj->f) ) {
+		} elseif (isset($obj->f)) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
 			unset($obj->f);
-		} elseif ( isset($obj->c) ) {
+		} elseif (isset($obj->c)) {
 			$obj->type = 'crop';
 			$obj->sel = $obj->c;
 			unset($obj->c);
@@ -487,12 +487,12 @@ 
 	}
 
 	// Combine operations.
-	if ( count($changes) > 1 ) {
+	if (count($changes) > 1) {
 		$filtered = array($changes[0]);
-		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
+		for ($i = 0, $j = 1, $c = count($changes); $j < $c; $j++) {
 			$combined = false;
-			if ( $filtered[$i]->type == $changes[$j]->type ) {
-				switch ( $filtered[$i]->type ) {
+			if ($filtered[$i]->type == $changes[$j]->type) {
+				switch ($filtered[$i]->type) {
 					case 'rotate':
 						$filtered[$i]->angle += $changes[$j]->angle;
 						$combined = true;
@@ -503,7 +503,7 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
+			if ( ! $combined)
 				$filtered[++$i] = $changes[$j];
 		}
 		$changes = $filtered;
@@ -511,7 +511,7 @@ 
 	}
 
 	// Image resource before applying the changes.
-	if ( $image instanceof WP_Image_Editor ) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance before applying changes to the image.
@@ -521,8 +521,8 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
  		 * @param array           $changes Array of change operations.
 		 */
-		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-	} elseif ( is_resource( $image ) ) {
+		$image = apply_filters('wp_image_editor_before_change', $image, $changes);
+	} elseif (is_resource($image)) {
 
 		/**
 		 * Filters the GD image resource before applying changes to the image.
@@ -533,39 +533,39 @@ 
 		 * @param resource $image   GD image resource.
  		 * @param array    $changes Array of change operations.
 		 */
-		$image = apply_filters( 'image_edit_before_change', $image, $changes );
+		$image = apply_filters('image_edit_before_change', $image, $changes);
 	}
 
-	foreach ( $changes as $operation ) {
-		switch ( $operation->type ) {
+	foreach ($changes as $operation) {
+		switch ($operation->type) {
 			case 'rotate':
-				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
+				if ($operation->angle != 0) {
+					if ($image instanceof WP_Image_Editor)
+						$image->rotate($operation->angle);
 					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+						$image = _rotate_image_resource($image, $operation->angle);
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
-						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+				if ($operation->axis != 0)
+					if ($image instanceof WP_Image_Editor)
+						$image->flip(($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource($image, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
-				if ( $image instanceof WP_Image_Editor ) {
+				if ($image instanceof WP_Image_Editor) {
 					$size = $image->get_size();
 					$w = $size['width'];
 					$h = $size['height'];
 
-					$scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
-					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio($w, $h); // discard preview scaling
+					$image->crop($sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				} else {
-					$scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
-					$image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio(imagesx($image), imagesy($image)); // discard preview scaling
+					$image = _crop_image_resource($image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				}
 				break;
 		}
@@ -582,34 +582,34 @@ 
  * @param int $post_id
  * @return bool
  */
-function stream_preview_image( $post_id ) {
-	$post = get_post( $post_id );
+function stream_preview_image($post_id) {
+	$post = get_post($post_id);
 
-	wp_raise_memory_limit( 'admin' );
+	wp_raise_memory_limit('admin');
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id));
 
-	if ( is_wp_error( $img ) ) {
+	if (is_wp_error($img)) {
 		return false;
 	}
 
-	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	$changes = ! empty($_REQUEST['history']) ? json_decode(wp_unslash($_REQUEST['history'])) : null;
+	if ($changes)
+		$img = image_edit_apply_changes($img, $changes);
 
 	// Scale the image.
 	$size = $img->get_size();
 	$w = $size['width'];
 	$h = $size['height'];
 
-	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2 = max ( 1, $w * $ratio );
-	$h2 = max ( 1, $h * $ratio );
+	$ratio = _image_get_preview_ratio($w, $h);
+	$w2 = max(1, $w * $ratio);
+	$h2 = max(1, $h * $ratio);
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+	if (is_wp_error($img->resize($w2, $h2)))
 		return false;
 
-	return wp_stream_image( $img, $post->post_mime_type, $post_id );
+	return wp_stream_image($img, $post->post_mime_type, $post_id);
 }
 
 /**
@@ -623,30 +623,30 @@ 
 function wp_restore_image($post_id) {
 	$meta = wp_get_attachment_metadata($post_id);
 	$file = get_attached_file($post_id);
-	$backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = $old_backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$restored = false;
 	$msg = new stdClass;
 
-	if ( !is_array($backup_sizes) ) {
+	if ( ! is_array($backup_sizes)) {
 		$msg->error = __('Cannot load image metadata.');
 		return $msg;
 	}
 
 	$parts = pathinfo($file);
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
+	if (isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig'])) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+		if ($parts['basename'] != $data['file']) {
+			if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 				// Delete only if it's an edited image.
-				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-					wp_delete_file( $file );
+				if (preg_match('/-e[0-9]{13}\./', $parts['basename'])) {
+					wp_delete_file($file);
 				}
-			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
+			} elseif (isset($meta['width'], $meta['height'])) {
 				$backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
 			}
 		}
@@ -654,21 +654,21 @@ 
 		$restored_file = path_join($parts['dirname'], $data['file']);
 		$restored = update_attached_file($post_id, $restored_file);
 
-		$meta['file'] = _wp_relative_upload_path( $restored_file );
+		$meta['file'] = _wp_relative_upload_path($restored_file);
 		$meta['width'] = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
-	foreach ( $default_sizes as $default_size ) {
-		if ( isset($backup_sizes["$default_size-orig"]) ) {
+	foreach ($default_sizes as $default_size) {
+		if (isset($backup_sizes["$default_size-orig"])) {
 			$data = $backup_sizes["$default_size-orig"];
-			if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
-				if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+			if (isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file']) {
+				if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 					// Delete only if it's an edited image.
-					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
-						wp_delete_file( $delete_file );
+					if (preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file'])) {
+						$delete_file = path_join($parts['dirname'], $meta['sizes'][$default_size]['file']);
+						wp_delete_file($delete_file);
 					}
 				} else {
 					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
@@ -681,14 +681,14 @@ 
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+	if ( ! wp_update_attachment_metadata($post_id, $meta) ||
+		($old_backup_sizes !== $backup_sizes && ! update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes))) {
 
 		$msg->error = __('Cannot save image metadata.');
 		return $msg;
 	}
 
-	if ( !$restored )
+	if ( ! $restored)
 		$msg->error = __('Image metadata is inconsistent.');
 	else
 		$msg->msg = __('Image restored successfully.');
@@ -703,25 +703,25 @@ 
  * @param int $post_id
  * @return \stdClass
  */
-function wp_save_image( $post_id ) {
+function wp_save_image($post_id) {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
 	$return = new stdClass;
 	$success = $delete = $scaled = $nocrop = false;
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
-	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __('Unable to create new image.') );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id, 'full'));
+	if (is_wp_error($img)) {
+		$return->error = esc_js(__('Unable to create new image.'));
 		return $return;
 	}
 
-	$fwidth = !empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
-	$fheight = !empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
-	$target = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
-	$scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
+	$fwidth = ! empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
+	$fheight = ! empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
+	$target = ! empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
+	$scale = ! empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+	if ($scale && $fwidth > 0 && $fheight > 0) {
 		$size = $img->get_size();
 		$sX = $size['width'];
 		$sY = $size['height'];
@@ -730,58 +730,58 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
+			if ($img->resize($fwidth, $fheight))
 				$scaled = true;
 		}
 
-		if ( !$scaled ) {
-			$return->error = esc_js( __('Error while saving the scaled image. Please reload the page and try again.') );
+		if ( ! $scaled) {
+			$return->error = esc_js(__('Error while saving the scaled image. Please reload the page and try again.'));
 			return $return;
 		}
-	} elseif ( !empty($_REQUEST['history']) ) {
-		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
+	} elseif ( ! empty($_REQUEST['history'])) {
+		$changes = json_decode(wp_unslash($_REQUEST['history']));
+		if ($changes)
 			$img = image_edit_apply_changes($img, $changes);
 	} else {
-		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
+		$return->error = esc_js(__('Nothing to save, the image has not changed.'));
 		return $return;
 	}
 
 	$meta = wp_get_attachment_metadata($post_id);
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
 
-	if ( !is_array($meta) ) {
-		$return->error = esc_js( __('Image data does not exist. Please re-upload the image.') );
+	if ( ! is_array($meta)) {
+		$return->error = esc_js(__('Image data does not exist. Please re-upload the image.'));
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
+	if ( ! is_array($backup_sizes))
 		$backup_sizes = array();
 
 	// Generate new filename.
-	$path = get_attached_file( $post_id );
+	$path = get_attached_file($post_id);
 
-	$basename = pathinfo( $path, PATHINFO_BASENAME );
-	$dirname = pathinfo( $path, PATHINFO_DIRNAME );
-	$ext = pathinfo( $path, PATHINFO_EXTENSION );
-	$filename = pathinfo( $path, PATHINFO_FILENAME );
-	$suffix = time() . rand(100, 999);
+	$basename = pathinfo($path, PATHINFO_BASENAME);
+	$dirname = pathinfo($path, PATHINFO_DIRNAME);
+	$ext = pathinfo($path, PATHINFO_EXTENSION);
+	$filename = pathinfo($path, PATHINFO_FILENAME);
+	$suffix = time().rand(100, 999);
 
-	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename ) {
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
+		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename) {
 
-		if ( 'thumbnail' == $target ) {
+		if ('thumbnail' == $target) {
 			$new_path = "{$dirname}/{$filename}-temp.{$ext}";
 		} else {
 			$new_path = $path;
 		}
 	} else {
-		while ( true ) {
-			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
+		while (true) {
+			$filename = preg_replace('/-e([0-9]+)$/', '', $filename);
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$ext}";
 			$new_path = "{$dirname}/$new_filename";
-			if ( file_exists($new_path) ) {
+			if (file_exists($new_path)) {
 				$suffix++;
 			} else {
 				break;
@@ -790,42 +790,42 @@ 
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
-		$return->error = esc_js( __('Unable to save the image.') );
+	if ( ! wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id)) {
+		$return->error = esc_js(__('Unable to save the image.'));
 		return $return;
 	}
 
-	if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
+	if ('nothumb' === $target || 'all' === $target || 'full' === $target || $scaled) {
 		$tag = false;
-		if ( isset( $backup_sizes['full-orig'] ) ) {
-			if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
+		if (isset($backup_sizes['full-orig'])) {
+			if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes['full-orig']['file'] !== $basename) {
 				$tag = "full-$suffix";
 			}
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag ) {
-			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $basename );
+		if ($tag) {
+			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $basename);
 		}
-		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
+		$success = ($path === $new_path) || update_attached_file($post_id, $new_path);
 
-		$meta['file'] = _wp_relative_upload_path( $new_path );
+		$meta['file'] = _wp_relative_upload_path($new_path);
 
 		$size = $img->get_size();
 		$meta['width'] = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
+		if ($success && ('nothumb' == $target || 'all' == $target)) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ('nothumb' == $target)
+				$sizes = array_diff($sizes, array('thumbnail'));
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' == $target ) {
-		$sizes = array( 'thumbnail' );
+	} elseif ('thumbnail' == $target) {
+		$sizes = array('thumbnail');
 		$success = $delete = $nocrop = true;
 	}
 
@@ -835,63 +835,63 @@ 
 	 * keeping the new resized images from overwriting the existing image files.
 	 * https://core.trac.wordpress.org/ticket/32171
 	 */
-	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size ) {
-			if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
-				$delete_file = path_join( $dirname, $size['file'] );
-				wp_delete_file( $delete_file );
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE && ! empty($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size) {
+			if ( ! empty($size['file']) && preg_match('/-e[0-9]{13}-/', $size['file'])) {
+				$delete_file = path_join($dirname, $size['file']);
+				wp_delete_file($delete_file);
 			}
 		}
 	}
 
-	if ( isset( $sizes ) ) {
+	if (isset($sizes)) {
 		$_sizes = array();
 
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$tag = false;
-			if ( isset( $meta['sizes'][$size] ) ) {
-				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+			if (isset($meta['sizes'][$size])) {
+				if (isset($backup_sizes["$size-orig"])) {
+					if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'])
 						$tag = "$size-$suffix";
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
+				if ($tag)
 					$backup_sizes[$tag] = $meta['sizes'][$size];
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
-				$height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
-				$crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+			if (isset($_wp_additional_image_sizes[$size])) {
+				$width  = intval($_wp_additional_image_sizes[$size]['width']);
+				$height = intval($_wp_additional_image_sizes[$size]['height']);
+				$crop   = ($nocrop) ? false : $_wp_additional_image_sizes[$size]['crop'];
 			} else {
-				$height = get_option( "{$size}_size_h" );
-				$width  = get_option( "{$size}_size_w" );
-				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+				$height = get_option("{$size}_size_h");
+				$width  = get_option("{$size}_size_w");
+				$crop   = ($nocrop) ? false : get_option("{$size}_crop");
 			}
 
-			$_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
+			$_sizes[$size] = array('width' => $width, 'height' => $height, 'crop' => $crop);
 		}
 
-		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
+		$meta['sizes'] = array_merge($meta['sizes'], $img->multi_resize($_sizes));
 	}
 
-	unset( $img );
+	unset($img);
 
-	if ( $success ) {
-		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
+	if ($success) {
+		wp_update_attachment_metadata($post_id, $meta);
+		update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-		if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
+		if ($target == 'thumbnail' || $target == 'all' || $target == 'full') {
 			// Check if it's an image edit from attachment edit screen
-			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
-				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+			if ( ! empty($_REQUEST['context']) && 'edit-attachment' == $_REQUEST['context']) {
+				$thumb_url = wp_get_attachment_image_src($post_id, array(900, 600), true);
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url($post_id);
-				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
-					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+				if ( ! empty($meta['sizes']['thumbnail']) && $thumb = $meta['sizes']['thumbnail']) {
+					$return->thumbnail = path_join(dirname($file_url), $thumb['file']);
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -901,10 +901,10 @@ 
 		$delete = true;
 	}
 
-	if ( $delete ) {
-		wp_delete_file( $new_path );
+	if ($delete) {
+		wp_delete_file($new_path);
 	}
 
-	$return->msg = esc_js( __('Image saved') );
+	$return->msg = esc_js(__('Image saved'));
 	return $return;
 }

Braces +73 added lines, -52 removed lines

@@ -20,23 +20,26 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
-	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$big = max( $meta['width'], $meta['height'] );
+	} else {
+			die( __('Image data does not exist. Please re-upload the image.') );
+	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
+			$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	}
 
 	if ( $msg ) {
-		if ( isset($msg->error) )
-			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
-			$note = "<div class='updated'><p>$msg->msg</p></div>";
+		if ( isset($msg->error) ) {
+					$note = "<div class='error'><p>$msg->error</p></div>";
+		} elseif ( isset($msg->msg) ) {
+					$note = "<div class='updated'><p>$msg->msg</p></div>";
+		}
 	}
 
 	?>
@@ -83,8 +86,9 @@ 
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-			echo ' '.__('Previously edited copies of the image will not be deleted.');
+		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) {
+					echo ' '.__('Previously edited copies of the image will not be deleted.');
+		}
 
 		?></p>
 		<div class="imgedit-submit">
@@ -251,8 +255,9 @@ 
 		 */
 		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
-			return false;
+		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
+					return false;
+		}
 
 		return true;
 	} else {
@@ -316,8 +321,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		return $image->save( $filename, $mime_type );
 	} else {
@@ -343,8 +349,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		switch ( $mime_type ) {
 			case 'image/jpeg':
@@ -462,11 +469,13 @@ 
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+	if ( is_resource( $image ) ) {
+			_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+	}
 
-	if ( !is_array($changes) )
-		return $image;
+	if ( !is_array($changes) ) {
+			return $image;
+	}
 
 	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
@@ -503,8 +512,9 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
-				$filtered[++$i] = $changes[$j];
+			if ( !$combined ) {
+							$filtered[++$i] = $changes[$j];
+			}
 		}
 		$changes = $filtered;
 		unset($filtered);
@@ -540,18 +550,20 @@ 
 		switch ( $operation->type ) {
 			case 'rotate':
 				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
-					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+					if ( $image instanceof WP_Image_Editor ) {
+											$image->rotate( $operation->angle );
+					} else {
+											$image = _rotate_image_resource( $image, $operation->angle );
+					}
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
+				if ( $operation->axis != 0 ) {
+									if ( $image instanceof WP_Image_Editor )
 						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+				} else {
+											$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
@@ -594,8 +606,9 @@ 
 	}
 
 	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	if ( $changes ) {
+			$img = image_edit_apply_changes( $img, $changes );
+	}
 
 	// Scale the image.
 	$size = $img->get_size();
@@ -606,8 +619,9 @@ 
 	$w2 = max ( 1, $w * $ratio );
 	$h2 = max ( 1, $h * $ratio );
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
-		return false;
+	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
+			return false;
+	}
 
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
@@ -688,10 +702,11 @@ 
 		return $msg;
 	}
 
-	if ( !$restored )
-		$msg->error = __('Image metadata is inconsistent.');
-	else
-		$msg->msg = __('Image restored successfully.');
+	if ( !$restored ) {
+			$msg->error = __('Image metadata is inconsistent.');
+	} else {
+			$msg->msg = __('Image restored successfully.');
+	}
 
 	return $msg;
 }
@@ -730,8 +745,9 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
-				$scaled = true;
+			if ( $img->resize( $fwidth, $fheight ) ) {
+							$scaled = true;
+			}
 		}
 
 		if ( !$scaled ) {
@@ -740,8 +756,9 @@ 
 		}
 	} elseif ( !empty($_REQUEST['history']) ) {
 		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
-			$img = image_edit_apply_changes($img, $changes);
+		if ( $changes ) {
+					$img = image_edit_apply_changes($img, $changes);
+		}
 	} else {
 		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
 		return $return;
@@ -755,8 +772,9 @@ 
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
-		$backup_sizes = array();
+	if ( !is_array($backup_sizes) ) {
+			$backup_sizes = array();
+	}
 
 	// Generate new filename.
 	$path = get_attached_file( $post_id );
@@ -818,8 +836,9 @@ 
 
 		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ( 'nothumb' == $target ) {
+							$sizes = array_diff( $sizes, array('thumbnail') );
+			}
 		}
 
 		$return->fw = $meta['width'];
@@ -851,14 +870,16 @@ 
 			$tag = false;
 			if ( isset( $meta['sizes'][$size] ) ) {
 				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
-						$tag = "$size-$suffix";
+					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] ) {
+											$tag = "$size-$suffix";
+					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
-					$backup_sizes[$tag] = $meta['sizes'][$size];
+				if ( $tag ) {
+									$backup_sizes[$tag] = $meta['sizes'][$size];
+				}
 			}
 
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {

src/wp-admin/includes/class-language-pack-upgrader-skin.php

Spacing +14 added lines, -14 removed lines

@@ -23,35 +23,35 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
-		$args = wp_parse_args( $args, $defaults );
-		if ( $args['skip_header_footer'] ) {
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'nonce' => '', 'title' => __('Update Translations'), 'skip_header_footer' => false);
+		$args = wp_parse_args($args, $defaults);
+		if ($args['skip_header_footer']) {
 			$this->done_header = true;
 			$this->done_footer = true;
 			$this->display_footer_actions = false;
 		}
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function before() {
-		$name = $this->upgrader->get_name_for_update( $this->language_update );
+		$name = $this->upgrader->get_name_for_update($this->language_update);
 
 		echo '<div class="update-messages lp-show-latest">';
 
-		printf( '<h2>' . __( 'Updating translations for %1$s (%2$s)&#8230;' ) . '</h2>', $name, $this->language_update->language );
+		printf('<h2>'.__('Updating translations for %1$s (%2$s)&#8230;').'</h2>', $name, $this->language_update->language);
 	}
 
 	/**
 	 *
 	 * @param string|WP_Error $error
 	 */
-	public function error( $error ) {
+	public function error($error) {
 		echo '<div class="lp-error">';
-		parent::error( $error );
+		parent::error($error);
 		echo '</div>';
 	}
 
@@ -66,9 +66,9 @@ 
 	 * @access public
 	 */
 	public function bulk_footer() {
-		$this->decrement_update_count( 'translation' );
+		$this->decrement_update_count('translation');
 		$update_actions = array();
-		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
+		$update_actions['updates_page'] = '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>';
 
 		/**
 		 * Filters the list of action links available following a translations update.
@@ -77,9 +77,9 @@ 
 		 *
 		 * @param array $update_actions Array of translations update links.
 		 */
-		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
+		$update_actions = apply_filters('update_translations_complete_actions', $update_actions);
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ($update_actions && $this->display_footer_actions)
+			$this->feedback(implode(' | ', $update_actions));
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -79,7 +79,8 @@
 		 */
 		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ( $update_actions && $this->display_footer_actions ) {
+					$this->feedback( implode( ' | ', $update_actions ) );
+		}
 	}
 }

src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php

Spacing +9 added lines, -9 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public function after($title = '') {
 		parent::after($this->plugin_info['Title']);
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 	}
 
 	/**
@@ -43,12 +43,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can('activate_plugins'))
+			unset($update_actions['plugins_page']);
 
 		/**
 		 * Filters the list of action links available following bulk plugin updates.
@@ -58,9 +58,9 @@ 
 		 * @param array $update_actions Array of plugin action links.
 		 * @param array $plugin_info    Array of information for the last-updated plugin.
 		 */
-		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+		$update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['plugins_page'] );
+		}
 
 		/**
 		 * Filters the list of action links available following bulk plugin updates.
@@ -60,7 +61,8 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }

src/wp-admin/includes/class-plugin-upgrader-skin.php

Spacing +15 added lines, -15 removed lines

@@ -22,14 +22,14 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->plugin = $args['plugin'];
 
-		$this->plugin_active = is_plugin_active( $this->plugin );
-		$this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
+		$this->plugin_active = is_plugin_active($this->plugin);
+		$this->plugin_network_active = is_plugin_active_for_network($this->plugin);
 
 		parent::__construct($args);
 	}
@@ -39,19 +39,19 @@ 
 	 */
 	public function after() {
 		$this->plugin = $this->upgrader->plugin_info();
-		if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
+		if ( ! empty($this->plugin) && ! is_wp_error($this->result) && $this->plugin_active) {
 			// Currently used only when JS is off for a single plugin update?
-			echo '<iframe title="' . esc_attr__( 'Update progress' ) . '" style="border:0;overflow:hidden" width="100%" height="170" src="' . wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '"></iframe>';
+			echo '<iframe title="'.esc_attr__('Update progress').'" style="border:0;overflow:hidden" width="100%" height="170" src="'.wp_nonce_url('update.php?action=activate-plugin&networkwide='.$this->plugin_network_active.'&plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'"></iframe>';
 		}
 
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 
-		$update_actions =  array(
-			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
+		$update_actions = array(
+			'activate_plugin' => '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'" target="_parent">'.__('Activate Plugin').'</a>',
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ($this->plugin_active || ! $this->result || is_wp_error($this->result) || ! current_user_can('activate_plugins'))
+			unset($update_actions['activate_plugin']);
 
 		/**
 		 * Filters the list of action links available following a single plugin update.
@@ -61,9 +61,9 @@ 
 		 * @param array  $update_actions Array of plugin action links.
 		 * @param string $plugin         Path to the plugin file.
 		 */
-		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
+		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -50,8 +50,9 @@ 
 			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['activate_plugin'] );
+		}
 
 		/**
 		 * Filters the list of action links available following a single plugin update.
@@ -63,7 +64,8 @@ 
 		 */
 		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }