ntwb / wordpress

src/wp-admin/update.php

Spacing +112 added lines, -112 removed lines

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

Braces +52 added lines, -37 removed lines

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

src/wp-admin/plugins.php

Braces +52 added lines, -36 removed lines

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

Spacing +202 added lines, -202 removed lines

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

src/wp-admin/import.php

Braces +8 added lines, -5 removed lines

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

Spacing +67 added lines, -67 removed lines

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

src/wp-admin/media.php

Braces +24 added lines, -13 removed lines

@@ -19,16 +19,18 @@ 
 	$attachment_id = (int) $_POST['attachment_id'];
 	check_admin_referer('media-form');
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $attachment_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$errors = media_upload_form_handler();
 
 	if ( empty($errors) ) {
 		$location = 'media.php';
 		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
+			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  ) {
+							$location = $referer;
+			}
 		}
 		if ( false !== strpos($location, 'upload.php') ) {
 			$location = remove_query_arg('message', $location);
@@ -44,8 +46,9 @@ 
 case 'edit' :
 	$title = __('Edit Media');
 
-	if ( empty($errors) )
-		$errors = null;
+	if ( empty($errors) ) {
+			$errors = null;
+	}
 
 	if ( empty( $_GET['attachment_id'] ) ) {
 		wp_redirect( admin_url('upload.php') );
@@ -53,14 +56,21 @@ 
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $att_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$att = get_post($att_id);
 
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	if ( empty($att->ID) ) {
+		wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
+	}
+	if ( 'attachment' !== $att->post_type ) {
+		wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
+	}
+	if ( $att->post_status == 'trash' ) {
+		wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	}
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
@@ -97,8 +107,9 @@ 
 				break;
 		}
 	}
-	if ( $message )
-		echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	if ( $message ) {
+			echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	}
 
 ?>
 

Switch Indentation +76 added lines, -76 removed lines

@@ -15,87 +15,87 @@ 
 wp_reset_vars(array('action'));
 
 switch ( $action ) {
-case 'editattachment' :
-	$attachment_id = (int) $_POST['attachment_id'];
-	check_admin_referer('media-form');
-
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$errors = media_upload_form_handler();
-
-	if ( empty($errors) ) {
-		$location = 'media.php';
-		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
-		}
-		if ( false !== strpos($location, 'upload.php') ) {
-			$location = remove_query_arg('message', $location);
-			$location = add_query_arg('posted',	$attachment_id, $location);
-		} elseif ( false !== strpos($location, 'media.php') ) {
-			$location = add_query_arg('message', 'updated', $location);
+	case 'editattachment' :
+		$attachment_id = (int) $_POST['attachment_id'];
+		check_admin_referer('media-form');
+
+		if ( !current_user_can('edit_post', $attachment_id) )
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+		$errors = media_upload_form_handler();
+
+		if ( empty($errors) ) {
+			$location = 'media.php';
+			if ( $referer = wp_get_original_referer() ) {
+				if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
+					$location = $referer;
+			}
+			if ( false !== strpos($location, 'upload.php') ) {
+				$location = remove_query_arg('message', $location);
+				$location = add_query_arg('posted',	$attachment_id, $location);
+			} elseif ( false !== strpos($location, 'media.php') ) {
+				$location = add_query_arg('message', 'updated', $location);
+			}
+			wp_redirect($location);
+			exit;
 		}
-		wp_redirect($location);
-		exit;
-	}
 
-	// No break.
-case 'edit' :
-	$title = __('Edit Media');
+		// No break.
+	case 'edit' :
+		$title = __('Edit Media');
 
-	if ( empty($errors) )
-		$errors = null;
+		if ( empty($errors) )
+			$errors = null;
 
-	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
-		exit();
-	}
-	$att_id = (int) $_GET['attachment_id'];
-
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$att = get_post($att_id);
-
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
-
-	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-
-	wp_enqueue_script( 'wp-ajax-response' );
-	wp_enqueue_script('image-edit');
-	wp_enqueue_style('imgareaselect');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
-	);
-
-	require( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$parent_file = 'upload.php';
-	$message = '';
-	$class = '';
-	if ( isset($_GET['message']) ) {
-		switch ( $_GET['message'] ) {
+		if ( empty( $_GET['attachment_id'] ) ) {
+			wp_redirect( admin_url('upload.php') );
+			exit();
+		}
+		$att_id = (int) $_GET['attachment_id'];
+
+		if ( !current_user_can('edit_post', $att_id) )
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+		$att = get_post($att_id);
+
+		if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?') );
+		if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn&#8217;t an attachment. Please go back and try again.') );
+		if ( $att->post_status == 'trash' ) wp_die( __('You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+
+		add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+
+		wp_enqueue_script( 'wp-ajax-response' );
+		wp_enqueue_script('image-edit');
+		wp_enqueue_style('imgareaselect');
+
+		get_current_screen()->add_help_tab( array(
+			'id'      => 'overview',
+			'title'   => __('Overview'),
+			'content' =>
+				'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+				'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+				'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+				'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
+		) );
+
+		get_current_screen()->set_help_sidebar(
+		'<p><strong>' . __('For more information:') . '</strong></p>' .
+		'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
+		'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+		);
+
+		require( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$parent_file = 'upload.php';
+		$message = '';
+		$class = '';
+		if ( isset($_GET['message']) ) {
+			switch ( $_GET['message'] ) {
 			case 'updated' :
 				$message = __('Media file updated.');
 				$class = 'updated';
 				break;
-		}
+			}
 	}
 	if ( $message )
 		echo "<div id='message' class='$class'><p>$message</p></div>\n";
@@ -142,8 +142,8 @@ 
 
 	exit;
 
-default:
-	wp_redirect( admin_url('upload.php') );
-	exit;
+	default:
+		wp_redirect( admin_url('upload.php') );
+		exit;
 
 }

Spacing +39 added lines, -39 removed lines

@@ -7,33 +7,33 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'upload.php';
 $submenu_file = 'upload.php';
 
 wp_reset_vars(array('action'));
 
-switch ( $action ) {
+switch ($action) {
 case 'editattachment' :
 	$attachment_id = (int) $_POST['attachment_id'];
 	check_admin_referer('media-form');
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( ! current_user_can('edit_post', $attachment_id))
+		wp_die(__('Sorry, you are not allowed to edit this attachment.'));
 
 	$errors = media_upload_form_handler();
 
-	if ( empty($errors) ) {
+	if (empty($errors)) {
 		$location = 'media.php';
-		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
+		if ($referer = wp_get_original_referer()) {
+			if (false !== strpos($referer, 'upload.php') || (url_to_postid($referer) == $attachment_id))
 				$location = $referer;
 		}
-		if ( false !== strpos($location, 'upload.php') ) {
+		if (false !== strpos($location, 'upload.php')) {
 			$location = remove_query_arg('message', $location);
-			$location = add_query_arg('posted',	$attachment_id, $location);
-		} elseif ( false !== strpos($location, 'media.php') ) {
+			$location = add_query_arg('posted', $attachment_id, $location);
+		} elseif (false !== strpos($location, 'media.php')) {
 			$location = add_query_arg('message', 'updated', $location);
 		}
 		wp_redirect($location);
@@ -44,71 +44,71 @@ 
 case 'edit' :
 	$title = __('Edit Media');
 
-	if ( empty($errors) )
+	if (empty($errors))
 		$errors = null;
 
-	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
+	if (empty($_GET['attachment_id'])) {
+		wp_redirect(admin_url('upload.php'));
 		exit();
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( ! current_user_can('edit_post', $att_id))
+		wp_die(__('Sorry, you are not allowed to edit this attachment.'));
 
 	$att = get_post($att_id);
 
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	if (empty($att->ID)) wp_die(__('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?'));
+	if ('attachment' !== $att->post_type) wp_die(__('You attempted to edit an item that isn’t an attachment. Please go back and try again.'));
+	if ($att->post_status == 'trash') wp_die(__('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.'));
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
-	wp_enqueue_script( 'wp-ajax-response' );
+	wp_enqueue_script('wp-ajax-response');
 	wp_enqueue_script('image-edit');
 	wp_enqueue_style('imgareaselect');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
+			'<p>'.__('This screen allows you to edit five fields for metadata in a file within the media library.').'</p>'.
+			'<p>'.__('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.').'</p>'.
+			'<p>'.__('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.').'</p>'.
+			'<p>'.__('Remember to click Update Media to save metadata entered or changed.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 
-	require( ABSPATH . 'wp-admin/admin-header.php' );
+	require(ABSPATH.'wp-admin/admin-header.php');
 
 	$parent_file = 'upload.php';
 	$message = '';
 	$class = '';
-	if ( isset($_GET['message']) ) {
-		switch ( $_GET['message'] ) {
+	if (isset($_GET['message'])) {
+		switch ($_GET['message']) {
 			case 'updated' :
 				$message = __('Media file updated.');
 				$class = 'updated';
 				break;
 		}
 	}
-	if ( $message )
+	if ($message)
 		echo "<div id='message' class='$class'><p>$message</p></div>\n";
 
 ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
 <?php
-if ( current_user_can( 'upload_files' ) ) { ?>
+if (current_user_can('upload_files')) { ?>
 	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a>
 <?php } ?>
 
@@ -116,16 +116,16 @@ 
 
 <form method="post" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
-<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
+<?php submit_button(__('Update Media'), 'primary', 'save', false); ?>
 </p>
 
 <div class="media-single">
 <div id="media-item-<?php echo $att_id; ?>" class="media-item">
-<?php echo get_media_item( $att_id, array( 'toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => !empty($errors[$att_id]) ? $errors[$att_id] : null ) ); ?>
+<?php echo get_media_item($att_id, array('toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => ! empty($errors[$att_id]) ? $errors[$att_id] : null)); ?>
 </div>
 </div>
 
-<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
+<?php submit_button(__('Update Media'), 'primary', 'save'); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? esc_attr($post_id) : ''; ?>" />
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($att_id); ?>" />
 <input type="hidden" name="action" value="editattachment" />
@@ -138,12 +138,12 @@ 
 
 <?php
 
-	require( ABSPATH . 'wp-admin/admin-footer.php' );
+	require(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit;
 
 default:
-	wp_redirect( admin_url('upload.php') );
+	wp_redirect(admin_url('upload.php'));
 	exit;
 
 }

src/wp-admin/upgrade-functions.php

Spacing +2 added lines, -2 removed lines

@@ -8,5 +8,5 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/upgrade.php' );
-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+_deprecated_file(basename(__FILE__), '2.5.0', 'wp-admin/includes/upgrade.php');
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');

src/wp-admin/includes/import.php

Spacing +50 added lines, -50 removed lines

@@ -16,8 +16,8 @@ 
  */
 function get_importers() {
 	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
+	if (is_array($wp_importers)) {
+		uasort($wp_importers, '_usort_by_first_member');
 	}
 	return $wp_importers;
 }
@@ -34,8 +34,8 @@ 
  * @param array $b
  * @return int
  */
-function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+function _usort_by_first_member($a, $b) {
+	return strnatcasecmp($a[0], $b[0]);
 }
 
 /**
@@ -51,11 +51,11 @@ 
  * @param callable $callback    Callback to run.
  * @return WP_Error Returns WP_Error when $callback is WP_Error.
  */
-function register_importer( $id, $name, $description, $callback ) {
+function register_importer($id, $name, $description, $callback) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
+	if (is_wp_error($callback))
 		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
+	$wp_importers[$id] = array($name, $description, $callback);
 }
 
 /**
@@ -67,8 +67,8 @@ 
  *
  * @param string $id Importer ID.
  */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+function wp_import_cleanup($id) {
+	wp_delete_attachment($id);
 }
 
 /**
@@ -79,23 +79,23 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
+	if ( ! isset($_FILES['import'])) {
 		return array(
-			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+			'error' => __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.')
 		);
 	}
 
-	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$overrides = array('test_form' => false, 'test_type' => false);
 	$_FILES['import']['name'] .= '.txt';
-	$upload = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload = wp_handle_upload($_FILES['import'], $overrides);
 
-	if ( isset( $upload['error'] ) ) {
+	if (isset($upload['error'])) {
 		return $upload;
 	}
 
 	// Construct the object array
 	$object = array(
-		'post_title' => basename( $upload['file'] ),
+		'post_title' => basename($upload['file']),
 		'post_content' => $upload['url'],
 		'post_mime_type' => $upload['type'],
 		'guid' => $upload['url'],
@@ -104,15 +104,15 @@ 
 	);
 
 	// Save the data
-	$id = wp_insert_attachment( $object, $upload['file'] );
+	$id = wp_insert_attachment($object, $upload['file']);
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+	wp_schedule_single_event(time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array($id));
 
-	return array( 'file' => $upload['file'], 'id' => $id );
+	return array('file' => $upload['file'], 'id' => $id);
 }
 
 /**
@@ -123,37 +123,37 @@ 
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
 	$locale = get_locale();
-	$cache_key = 'popular_importers_' . md5( $locale . $wp_version );
-	$popular_importers = get_site_transient( $cache_key );
+	$cache_key = 'popular_importers_'.md5($locale.$wp_version);
+	$popular_importers = get_site_transient($cache_key);
 
-	if ( ! $popular_importers ) {
-		$url = add_query_arg( array(
+	if ( ! $popular_importers) {
+		$url = add_query_arg(array(
 			'locale'  => get_locale(),
 			'version' => $wp_version,
-		), 'http://api.wordpress.org/core/importers/1.1/' );
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
-		$response = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+		), 'http://api.wordpress.org/core/importers/1.1/');
+		$options = array('user-agent' => 'WordPress/'.$wp_version.'; '.home_url());
+		$response = wp_remote_get($url, $options);
+		$popular_importers = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( is_array( $popular_importers ) ) {
-			set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+		if (is_array($popular_importers)) {
+			set_site_transient($cache_key, $popular_importers, 2 * DAY_IN_SECONDS);
 		} else {
 			$popular_importers = false;
 		}
 	}
 
-	if ( is_array( $popular_importers ) ) {
+	if (is_array($popular_importers)) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
+		if ($popular_importers['translated'])
 			return $popular_importers['importers'];
 
-		foreach ( $popular_importers['importers'] as &$importer ) {
-			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+		foreach ($popular_importers['importers'] as &$importer) {
+			$importer['description'] = translate($importer['description']);
+			if ($importer['name'] != 'WordPress')
+				$importer['name'] = translate($importer['name']);
 		}
 		return $popular_importers['importers'];
 	}
@@ -161,50 +161,50 @@ 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug
 		'blogger' => array(
-			'name' => __( 'Blogger' ),
-			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
+			'name' => __('Blogger'),
+			'description' => __('Import posts, comments, and users from a Blogger blog.'),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
 		'wpcat2tag' => array(
-			'name' => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+			'name' => __('Categories and Tags Converter'),
+			'description' => __('Convert existing categories to tags or tags to categories, selectively.'),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name' => __( 'LiveJournal' ),
-			'description' => __( 'Import posts from LiveJournal using their API.' ),
+			'name' => __('LiveJournal'),
+			'description' => __('Import posts from LiveJournal using their API.'),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name' => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
+			'name' => __('Movable Type and TypePad'),
+			'description' => __('Import posts and comments from a Movable Type or TypePad blog.'),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
 		'opml' => array(
-			'name' => __( 'Blogroll' ),
-			'description' => __( 'Import links in OPML format.' ),
+			'name' => __('Blogroll'),
+			'description' => __('Import links in OPML format.'),
 			'plugin-slug' => 'opml-importer',
 			'importer-id' => 'opml',
 		),
 		'rss' => array(
-			'name' => __( 'RSS' ),
-			'description' => __( 'Import posts from an RSS feed.' ),
+			'name' => __('RSS'),
+			'description' => __('Import posts from an RSS feed.'),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
 		'tumblr' => array(
-			'name' => __( 'Tumblr' ),
-			'description' => __( 'Import posts & media from Tumblr using their API.' ),
+			'name' => __('Tumblr'),
+			'description' => __('Import posts & media from Tumblr using their API.'),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
 		'wordpress' => array(
 			'name' => 'WordPress',
-			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+			'description' => __('Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
 		),

Braces +9 added lines, -6 removed lines

@@ -53,8 +53,9 @@ 
  */
 function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
+	if ( is_wp_error( $callback ) ) {
+			return $callback;
+	}
 	$wp_importers[$id] = array ( $name, $description, $callback );
 }
 
@@ -147,13 +148,15 @@ 
 
 	if ( is_array( $popular_importers ) ) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
-			return $popular_importers['importers'];
+		if ( $popular_importers['translated'] ) {
+					return $popular_importers['importers'];
+		}
 
 		foreach ( $popular_importers['importers'] as &$importer ) {
 			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+			if ( $importer['name'] != 'WordPress' ) {
+							$importer['name'] = translate( $importer['name'] );
+			}
 		}
 		return $popular_importers['importers'];
 	}

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

Spacing +26 added lines, -26 removed lines

@@ -35,8 +35,8 @@ 
 	 *
 	 * @param array $args Options for the upgrader, see WP_Upgrader_Skin::__construct().
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
+	public function __construct($args = array()) {
+		parent::__construct($args);
 
 		$this->errors = new WP_Error();
 	}
@@ -64,15 +64,15 @@ 
 	public function get_error_messages() {
 		$messages = array();
 
-		foreach ( $this->errors->get_error_codes() as $error_code ) {
-			if ( $this->errors->get_error_data( $error_code ) && is_string( $this->errors->get_error_data( $error_code ) ) ) {
-				$messages[] = $this->errors->get_error_message( $error_code ) . ' ' . esc_html( strip_tags( $this->errors->get_error_data( $error_code ) ) );
+		foreach ($this->errors->get_error_codes() as $error_code) {
+			if ($this->errors->get_error_data($error_code) && is_string($this->errors->get_error_data($error_code))) {
+				$messages[] = $this->errors->get_error_message($error_code).' '.esc_html(strip_tags($this->errors->get_error_data($error_code)));
 			} else {
-				$messages[] = $this->errors->get_error_message( $error_code );
+				$messages[] = $this->errors->get_error_message($error_code);
 			}
 		}
 
-		return implode( ', ', $messages );
+		return implode(', ', $messages);
 	}
 
 	/**
@@ -83,32 +83,32 @@ 
 	 *
 	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $errors ) {
-		if ( is_string( $errors ) ) {
+	public function error($errors) {
+		if (is_string($errors)) {
 			$string = $errors;
-			if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
-				$string = $this->upgrader->strings[ $string ];
+			if ( ! empty($this->upgrader->strings[$string])) {
+				$string = $this->upgrader->strings[$string];
 			}
 
-			if ( false !== strpos( $string, '%' ) ) {
+			if (false !== strpos($string, '%')) {
 				$args = func_get_args();
-				$args = array_splice( $args, 1 );
-				if ( ! empty( $args ) ) {
-					$string = vsprintf( $string, $args );
+				$args = array_splice($args, 1);
+				if ( ! empty($args)) {
+					$string = vsprintf($string, $args);
 				}
 			}
 
 			// Count existing errors to generate an unique error code.
-			$errors_count = count( $errors->get_error_codes() );
-			$this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1 , $string );
-		} elseif ( is_wp_error( $errors ) ) {
-			foreach ( $errors->get_error_codes() as $error_code ) {
-				$this->errors->add( $error_code, $errors->get_error_message( $error_code ), $errors->get_error_data( $error_code ) );
+			$errors_count = count($errors->get_error_codes());
+			$this->errors->add('unknown_upgrade_error_'.$errors_count + 1, $string);
+		} elseif (is_wp_error($errors)) {
+			foreach ($errors->get_error_codes() as $error_code) {
+				$this->errors->add($error_code, $errors->get_error_message($error_code), $errors->get_error_data($error_code));
 			}
 		}
 
 		$args = func_get_args();
-		call_user_func_array( array( $this, 'parent::error' ), $args );
+		call_user_func_array(array($this, 'parent::error'), $args);
 	}
 
 	/**
@@ -119,14 +119,14 @@ 
 	 *
 	 * @param string|array|WP_Error $data Log entry data.
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
-			foreach ( $data->get_error_codes() as $error_code ) {
-				$this->errors->add( $error_code, $data->get_error_message( $error_code ), $data->get_error_data( $error_code ) );
+	public function feedback($data) {
+		if (is_wp_error($data)) {
+			foreach ($data->get_error_codes() as $error_code) {
+				$this->errors->add($error_code, $data->get_error_message($error_code), $data->get_error_data($error_code));
 			}
 		}
 
 		$args = func_get_args();
-		call_user_func_array( array( $this, 'parent::feedback' ), $args );
+		call_user_func_array(array($this, 'parent::feedback'), $args);
 	}
 }

src/wp-admin/includes/class-wp-automatic-updater.php

Braces +125 added lines, -86 removed lines

@@ -31,11 +31,13 @@ 
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			return true;
+		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+					return true;
+		}
 
-		if ( wp_installing() )
-			return true;
+		if ( wp_installing() ) {
+					return true;
+		}
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
 		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
@@ -74,8 +76,9 @@ 
 	 */
 	public function is_vcs_checkout( $context ) {
 		$context_dirs = array( untrailingslashit( $context ) );
-		if ( $context !== ABSPATH )
-			$context_dirs[] = untrailingslashit( ABSPATH );
+		if ( $context !== ABSPATH ) {
+					$context_dirs[] = untrailingslashit( ABSPATH );
+		}
 
 		$vcs_dirs = array( '.svn', '.git', '.hg', '.bzr' );
 		$check_dirs = array();
@@ -86,8 +89,9 @@ 
 				$check_dirs[] = $context_dir;
 
 				// Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
-				if ( $context_dir == dirname( $context_dir ) )
-					break;
+				if ( $context_dir == dirname( $context_dir ) ) {
+									break;
+				}
 
 			// Continue one level at a time.
 			} while ( $context_dir = dirname( $context_dir ) );
@@ -98,8 +102,9 @@ 
 		// Search all directories we've found for evidence of version control.
 		foreach ( $vcs_dirs as $vcs_dir ) {
 			foreach ( $check_dirs as $check_dir ) {
-				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
-					break 2;
+				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) ) {
+									break 2;
+				}
 			}
 		}
 
@@ -135,8 +140,9 @@ 
 		// Used to see if WP_Filesystem is set up to allow unattended updates.
 		$skin = new Automatic_Upgrader_Skin;
 
-		if ( $this->is_disabled() )
-			return false;
+		if ( $this->is_disabled() ) {
+					return false;
+		}
 
 		// Only relax the filesystem checks when the update doesn't include new files
 		$allow_relaxed_file_ownership = false;
@@ -146,16 +152,18 @@ 
 
 		// If we can't do an auto core update, we may still be able to email the user.
 		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
-			if ( 'core' == $type )
-				$this->send_core_update_notification_email( $item );
+			if ( 'core' == $type ) {
+							$this->send_core_update_notification_email( $item );
+			}
 			return false;
 		}
 
 		// Next up, is this an item we can update?
-		if ( 'core' == $type )
-			$update = Core_Upgrader::should_update_to_version( $item->current );
-		else
-			$update = ! empty( $item->autoupdate );
+		if ( 'core' == $type ) {
+					$update = Core_Upgrader::should_update_to_version( $item->current );
+		} else {
+					$update = ! empty( $item->autoupdate );
+		}
 
 		/**
 		 * Filters whether to automatically update core, a plugin, a theme, or a language.
@@ -179,8 +187,9 @@ 
 		$update = apply_filters( 'auto_update_' . $type, $update, $item );
 
 		if ( ! $update ) {
-			if ( 'core' == $type )
-				$this->send_core_update_notification_email( $item );
+			if ( 'core' == $type ) {
+							$this->send_core_update_notification_email( $item );
+			}
 			return false;
 		}
 
@@ -189,13 +198,15 @@ 
 			global $wpdb;
 
 			$php_compat = version_compare( phpversion(), $item->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
-				$mysql_compat = true;
-			else
-				$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+							$mysql_compat = true;
+			} else {
+							$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+			}
 
-			if ( ! $php_compat || ! $mysql_compat )
-				return false;
+			if ( ! $php_compat || ! $mysql_compat ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -213,8 +224,9 @@ 
 		$notified = get_site_option( 'auto_core_update_notified' );
 
 		// Don't notify if we've already notified the same email address of the same version.
-		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
-			return false;
+		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current ) {
+					return false;
+		}
 
 		// See if we need to notify users of a core update.
 		$notify = ! empty( $item->notify_email );
@@ -238,8 +250,9 @@ 
 		 * @param bool   $notify Whether the site administrator is notified.
 		 * @param object $item   The update offer.
 		 */
-		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) )
-			return false;
+		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) ) {
+					return false;
+		}
 
 		$this->send_email( 'manual', $item );
 		return true;
@@ -281,8 +294,9 @@ 
 		}
 
 		// Determine whether we can and should perform this update.
-		if ( ! $this->should_update( $type, $item, $context ) )
-			return false;
+		if ( ! $this->should_update( $type, $item, $context ) ) {
+					return false;
+		}
 
 		/**
 		 * Fires immediately prior to an auto-update.
@@ -378,14 +392,17 @@ 
 	public function run() {
 		global $wpdb, $wp_version;
 
-		if ( $this->is_disabled() )
-			return;
+		if ( $this->is_disabled() ) {
+					return;
+		}
 
-		if ( ! is_main_network() || ! is_main_site() )
-			return;
+		if ( ! is_main_network() || ! is_main_site() ) {
+					return;
+		}
 
-		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) )
-			return;
+		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) ) {
+					return;
+		}
 
 		// Don't automatically run these thins, as we'll handle it ourselves
 		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@@ -419,8 +436,9 @@ 
 		wp_version_check(); // Check for Core updates
 		$core_update = find_core_auto_update();
 
-		if ( $core_update )
-			$this->update( 'core', $core_update );
+		if ( $core_update ) {
+					$this->update( 'core', $core_update );
+		}
 
 		// Clean up, and check for any pending translations
 		// (Core_Upgrader checks for core updates)
@@ -468,11 +486,13 @@ 
 			 *                                  install is a development version.
 			 *                                  Return false to avoid the email.
 			 */
-			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) )
-				$this->send_debug_email();
+			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) ) {
+							$this->send_debug_email();
+			}
 
-			if ( ! empty( $this->update_results['core'] ) )
-				$this->after_core_update( $this->update_results['core'][0] );
+			if ( ! empty( $this->update_results['core'] ) ) {
+							$this->after_core_update( $this->update_results['core'][0] );
+			}
 
 			/**
 			 * Fires after all automatic updates have run.
@@ -562,8 +582,9 @@ 
 
   		$n = get_site_option( 'auto_core_update_notified' );
 		// Don't notify if we've already notified the same email address of the same version of the same notification type.
-		if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
-			$send = false;
+		if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current ) {
+					$send = false;
+		}
 
 		update_site_option( 'auto_core_update_failed', array(
 			'attempted'  => $core_update->current,
@@ -574,8 +595,9 @@ 
 			'retry'      => in_array( $error_code, $transient_failures ),
 		) );
 
-		if ( $send )
-			$this->send_email( 'fail', $core_update, $result );
+		if ( $send ) {
+					$this->send_email( 'fail', $core_update, $result );
+		}
 	}
 
 	/**
@@ -600,8 +622,9 @@ 
 
 		$next_user_core_update = get_preferred_from_update_core();
 		// If the update transient is empty, use the update we just performed
-		if ( ! $next_user_core_update )
-			$next_user_core_update = $core_update;
+		if ( ! $next_user_core_update ) {
+					$next_user_core_update = $core_update;
+		}
 		$newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
 
 		/**
@@ -615,8 +638,9 @@ 
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
-			return;
+		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) ) {
+					return;
+		}
 
 		switch ( $type ) {
 			case 'success' : // We updated.
@@ -649,8 +673,9 @@ 
 			case 'success' :
 				$body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
 				$body .= "\n\n";
-				if ( ! $newer_version_available )
-					$body .= __( 'No further action is needed on your part.' ) . ' ';
+				if ( ! $newer_version_available ) {
+									$body .= __( 'No further action is needed on your part.' ) . ' ';
+				}
 
 				// Can only reference the About screen if their update was successful.
 				list( $about_version ) = explode( '-', $core_update->current, 2 );
@@ -673,18 +698,20 @@ 
 
 				// Don't show this message if there is a newer version available.
 				// Potential for confusion, and also not useful for them to know at this point.
-				if ( 'fail' == $type && ! $newer_version_available )
-					$body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
+				if ( 'fail' == $type && ! $newer_version_available ) {
+									$body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
+				}
 
 				$body .= __( 'Updating is easy and only takes a few moments:' );
 				$body .= "\n" . network_admin_url( 'update-core.php' );
 				break;
 
 			case 'critical' :
-				if ( $newer_version_available )
-					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
-				else
-					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
+				if ( $newer_version_available ) {
+									$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
+				} else {
+									$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
+				}
 
 				$body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
 
@@ -728,23 +755,28 @@ 
 
 			// If we had a rollback and we're still critical, then the rollback failed too.
 			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-			if ( 'rollback_was_required' == $result->get_error_code() )
-				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
-			else
-				$errors = array( $result );
+			if ( 'rollback_was_required' == $result->get_error_code() ) {
+							$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
+			} else {
+							$errors = array( $result );
+			}
 
 			foreach ( $errors as $error ) {
-				if ( ! is_wp_error( $error ) )
-					continue;
+				if ( ! is_wp_error( $error ) ) {
+									continue;
+				}
 				$error_code = $error->get_error_code();
 				$body .= "\n\n" . sprintf( __( "Error code: %s" ), $error_code );
-				if ( 'rollback_was_required' == $error_code )
-					continue;
-				if ( $error->get_error_message() )
-					$body .= "\n" . $error->get_error_message();
+				if ( 'rollback_was_required' == $error_code ) {
+									continue;
+				}
+				if ( $error->get_error_message() ) {
+									$body .= "\n" . $error->get_error_message();
+				}
 				$error_data = $error->get_error_data();
-				if ( $error_data )
-					$body .= "\n" . implode( ', ', (array) $error_data );
+				if ( $error_data ) {
+									$body .= "\n" . implode( ', ', (array) $error_data );
+				}
 			}
 			$body .= "\n";
 		}
@@ -786,8 +818,9 @@ 
 	 */
 	protected function send_debug_email() {
 		$update_count = 0;
-		foreach ( $this->update_results as $type => $updates )
-			$update_count += count( $updates );
+		foreach ( $this->update_results as $type => $updates ) {
+					$update_count += count( $updates );
+		}
 
 		$body = array();
 		$failures = 0;
@@ -808,8 +841,9 @@ 
 
 		// Plugins, Themes, Translations
 		foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
-				continue;
+			if ( ! isset( $this->update_results[ $type ] ) ) {
+							continue;
+			}
 			$success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
 			if ( $success_items ) {
 				$messages = array(
@@ -868,21 +902,25 @@ 
 		$body[] = '';
 
 		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
-				continue;
+			if ( ! isset( $this->update_results[ $type ] ) ) {
+							continue;
+			}
 			foreach ( $this->update_results[ $type ] as $update ) {
 				$body[] = $update->name;
 				$body[] = str_repeat( '-', strlen( $update->name ) );
-				foreach ( $update->messages as $message )
-					$body[] = "  " . html_entity_decode( str_replace( '…', '...', $message ) );
+				foreach ( $update->messages as $message ) {
+									$body[] = "  " . html_entity_decode( str_replace( '…', '...', $message ) );
+				}
 				if ( is_wp_error( $update->result ) ) {
 					$results = array( 'update' => $update->result );
 					// If we rolled back, we want to know an error that occurred then too.
-					if ( 'rollback_was_required' === $update->result->get_error_code() )
-						$results = (array) $update->result->get_error_data();
+					if ( 'rollback_was_required' === $update->result->get_error_code() ) {
+											$results = (array) $update->result->get_error_data();
+					}
 					foreach ( $results as $result_type => $result ) {
-						if ( ! is_wp_error( $result ) )
-							continue;
+						if ( ! is_wp_error( $result ) ) {
+													continue;
+						}
 
 						if ( 'rollback' === $result_type ) {
 							/* translators: 1: Error code, 2: Error message. */
@@ -892,8 +930,9 @@ 
 							$body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
 						}
 
-						if ( $result->get_error_data() )
-							$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+						if ( $result->get_error_data() ) {
+													$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+						}
 					}
 				}
 				$body[] = '';

Spacing +252 added lines, -252 removed lines

@@ -31,14 +31,14 @@ 
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS)
 			return true;
 
-		if ( wp_installing() )
+		if (wp_installing())
 			return true;
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
-		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
+		$disabled = defined('AUTOMATIC_UPDATER_DISABLED') && AUTOMATIC_UPDATER_DISABLED;
 
 		/**
 		 * Filters whether to entirely disable background updates.
@@ -52,7 +52,7 @@ 
 		 *
 		 * @param bool $disabled Whether the updater should be disabled.
 		 */
-		return apply_filters( 'automatic_updater_disabled', $disabled );
+		return apply_filters('automatic_updater_disabled', $disabled);
 	}
 
 	/**
@@ -72,33 +72,33 @@ 
 	 *
 	 * @param string $context The filesystem path to check, in addition to ABSPATH.
 	 */
-	public function is_vcs_checkout( $context ) {
-		$context_dirs = array( untrailingslashit( $context ) );
-		if ( $context !== ABSPATH )
-			$context_dirs[] = untrailingslashit( ABSPATH );
+	public function is_vcs_checkout($context) {
+		$context_dirs = array(untrailingslashit($context));
+		if ($context !== ABSPATH)
+			$context_dirs[] = untrailingslashit(ABSPATH);
 
-		$vcs_dirs = array( '.svn', '.git', '.hg', '.bzr' );
+		$vcs_dirs = array('.svn', '.git', '.hg', '.bzr');
 		$check_dirs = array();
 
-		foreach ( $context_dirs as $context_dir ) {
+		foreach ($context_dirs as $context_dir) {
 			// Walk up from $context_dir to the root.
 			do {
 				$check_dirs[] = $context_dir;
 
 				// Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
-				if ( $context_dir == dirname( $context_dir ) )
+				if ($context_dir == dirname($context_dir))
 					break;
 
 			// Continue one level at a time.
-			} while ( $context_dir = dirname( $context_dir ) );
+			} while ($context_dir = dirname($context_dir));
 		}
 
-		$check_dirs = array_unique( $check_dirs );
+		$check_dirs = array_unique($check_dirs);
 
 		// Search all directories we've found for evidence of version control.
-		foreach ( $vcs_dirs as $vcs_dir ) {
-			foreach ( $check_dirs as $check_dir ) {
-				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
+		foreach ($vcs_dirs as $vcs_dir) {
+			foreach ($check_dirs as $check_dir) {
+				if ($checkout = @is_dir(rtrim($check_dir, '\\/')."/$vcs_dir"))
 					break 2;
 			}
 		}
@@ -114,7 +114,7 @@ 
 		 * @param string $context The filesystem context (a path) against which
 		 *                        filesystem status should be checked.
 		 */
-		return apply_filters( 'automatic_updates_is_vcs_checkout', $checkout, $context );
+		return apply_filters('automatic_updates_is_vcs_checkout', $checkout, $context);
 	}
 
 	/**
@@ -131,31 +131,31 @@ 
 	 * @param string $context The filesystem context (a path) against which filesystem
 	 *                        access and status should be checked.
 	 */
-	public function should_update( $type, $item, $context ) {
+	public function should_update($type, $item, $context) {
 		// Used to see if WP_Filesystem is set up to allow unattended updates.
 		$skin = new Automatic_Upgrader_Skin;
 
-		if ( $this->is_disabled() )
+		if ($this->is_disabled())
 			return false;
 
 		// Only relax the filesystem checks when the update doesn't include new files
 		$allow_relaxed_file_ownership = false;
-		if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+		if ('core' == $type && isset($item->new_files) && ! $item->new_files) {
 			$allow_relaxed_file_ownership = true;
 		}
 
 		// If we can't do an auto core update, we may still be able to email the user.
-		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
-			if ( 'core' == $type )
-				$this->send_core_update_notification_email( $item );
+		if ( ! $skin->request_filesystem_credentials(false, $context, $allow_relaxed_file_ownership) || $this->is_vcs_checkout($context)) {
+			if ('core' == $type)
+				$this->send_core_update_notification_email($item);
 			return false;
 		}
 
 		// Next up, is this an item we can update?
-		if ( 'core' == $type )
-			$update = Core_Upgrader::should_update_to_version( $item->current );
+		if ('core' == $type)
+			$update = Core_Upgrader::should_update_to_version($item->current);
 		else
-			$update = ! empty( $item->autoupdate );
+			$update = ! empty($item->autoupdate);
 
 		/**
 		 * Filters whether to automatically update core, a plugin, a theme, or a language.
@@ -176,25 +176,25 @@ 
 		 * @param bool   $update Whether to update.
 		 * @param object $item   The update offer.
 		 */
-		$update = apply_filters( "auto_update_{$type}", $update, $item );
+		$update = apply_filters("auto_update_{$type}", $update, $item);
 
-		if ( ! $update ) {
-			if ( 'core' == $type )
-				$this->send_core_update_notification_email( $item );
+		if ( ! $update) {
+			if ('core' == $type)
+				$this->send_core_update_notification_email($item);
 			return false;
 		}
 
 		// If it's a core update, are we actually compatible with its requirements?
-		if ( 'core' == $type ) {
+		if ('core' == $type) {
 			global $wpdb;
 
-			$php_compat = version_compare( phpversion(), $item->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+			$php_compat = version_compare(phpversion(), $item->php_version, '>=');
+			if (file_exists(WP_CONTENT_DIR.'/db.php') && empty($wpdb->is_mysql))
 				$mysql_compat = true;
 			else
-				$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+				$mysql_compat = version_compare($wpdb->db_version(), $item->mysql_version, '>=');
 
-			if ( ! $php_compat || ! $mysql_compat )
+			if ( ! $php_compat || ! $mysql_compat)
 				return false;
 		}
 
@@ -209,15 +209,15 @@ 
 	 *
 	 * @param object $item The update offer.
 	 */
-	protected function send_core_update_notification_email( $item ) {
-		$notified = get_site_option( 'auto_core_update_notified' );
+	protected function send_core_update_notification_email($item) {
+		$notified = get_site_option('auto_core_update_notified');
 
 		// Don't notify if we've already notified the same email address of the same version.
-		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
+		if ($notified && $notified['email'] == get_site_option('admin_email') && $notified['version'] == $item->current)
 			return false;
 
 		// See if we need to notify users of a core update.
-		$notify = ! empty( $item->notify_email );
+		$notify = ! empty($item->notify_email);
 
 		/**
 		 * Filters whether to notify the site administrator of a new core update.
@@ -238,10 +238,10 @@ 
 		 * @param bool   $notify Whether the site administrator is notified.
 		 * @param object $item   The update offer.
 		 */
-		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) )
+		if ( ! apply_filters('send_core_update_notification_email', $notify, $item))
 			return false;
 
-		$this->send_email( 'manual', $item );
+		$this->send_email('manual', $item);
 		return true;
 	}
 
@@ -256,32 +256,32 @@ 
 	 *
 	 * @return null|WP_Error
 	 */
-	public function update( $type, $item ) {
+	public function update($type, $item) {
 		$skin = new Automatic_Upgrader_Skin;
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				// The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter.
-				add_filter( 'update_feedback', array( $skin, 'feedback' ) );
-				$upgrader = new Core_Upgrader( $skin );
+				add_filter('update_feedback', array($skin, 'feedback'));
+				$upgrader = new Core_Upgrader($skin);
 				$context  = ABSPATH;
 				break;
 			case 'plugin':
-				$upgrader = new Plugin_Upgrader( $skin );
+				$upgrader = new Plugin_Upgrader($skin);
 				$context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR
 				break;
 			case 'theme':
-				$upgrader = new Theme_Upgrader( $skin );
-				$context  = get_theme_root( $item->theme );
+				$upgrader = new Theme_Upgrader($skin);
+				$context  = get_theme_root($item->theme);
 				break;
 			case 'translation':
-				$upgrader = new Language_Pack_Upgrader( $skin );
+				$upgrader = new Language_Pack_Upgrader($skin);
 				$context  = WP_CONTENT_DIR; // WP_LANG_DIR;
 				break;
 		}
 
 		// Determine whether we can and should perform this update.
-		if ( ! $this->should_update( $type, $item, $context ) )
+		if ( ! $this->should_update($type, $item, $context))
 			return false;
 
 		/**
@@ -294,40 +294,40 @@ 
 		 * @param string $context The filesystem context (a path) against which filesystem access and status
 		 *                        should be checked.
 		 */
-		do_action( 'pre_auto_update', $type, $item, $context );
+		do_action('pre_auto_update', $type, $item, $context);
 
 		$upgrader_item = $item;
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
-				$skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
-				$item_name = sprintf( __( 'WordPress %s' ), $item->version );
+				$skin->feedback(__('Updating to WordPress %s'), $item->version);
+				$item_name = sprintf(__('WordPress %s'), $item->version);
 				break;
 			case 'theme':
 				$upgrader_item = $item->theme;
-				$theme = wp_get_theme( $upgrader_item );
-				$item_name = $theme->Get( 'Name' );
-				$skin->feedback( __( 'Updating theme: %s' ), $item_name );
+				$theme = wp_get_theme($upgrader_item);
+				$item_name = $theme->Get('Name');
+				$skin->feedback(__('Updating theme: %s'), $item_name);
 				break;
 			case 'plugin':
 				$upgrader_item = $item->plugin;
-				$plugin_data = get_plugin_data( $context . '/' . $upgrader_item );
+				$plugin_data = get_plugin_data($context.'/'.$upgrader_item);
 				$item_name = $plugin_data['Name'];
-				$skin->feedback( __( 'Updating plugin: %s' ), $item_name );
+				$skin->feedback(__('Updating plugin: %s'), $item_name);
 				break;
 			case 'translation':
-				$language_item_name = $upgrader->get_name_for_update( $item );
-				$item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
-				$skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)…' ), $language_item_name, $item->language ) );
+				$language_item_name = $upgrader->get_name_for_update($item);
+				$item_name = sprintf(__('Translations for %s'), $language_item_name);
+				$skin->feedback(sprintf(__('Updating translations for %1$s (%2$s)…'), $language_item_name, $item->language));
 				break;
 		}
 
 		$allow_relaxed_file_ownership = false;
-		if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+		if ('core' == $type && isset($item->new_files) && ! $item->new_files) {
 			$allow_relaxed_file_ownership = true;
 		}
 
 		// Boom, This sites about to get a whole new splash of paint!
-		$upgrade_result = $upgrader->upgrade( $upgrader_item, array(
+		$upgrade_result = $upgrader->upgrade($upgrader_item, array(
 			'clear_update_cache' => false,
 			// Always use partial builds if possible for core updates.
 			'pre_check_md5'      => false,
@@ -335,28 +335,28 @@ 
 			'attempt_rollback'   => true,
 			// Allow relaxed file ownership in some scenarios
 			'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
-		) );
+		));
 
 		// If the filesystem is unavailable, false is returned.
-		if ( false === $upgrade_result ) {
-			$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+		if (false === $upgrade_result) {
+			$upgrade_result = new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 		}
 
-		if ( 'core' == $type ) {
-			if ( is_wp_error( $upgrade_result ) && ( 'up_to_date' == $upgrade_result->get_error_code() || 'locked' == $upgrade_result->get_error_code() ) ) {
+		if ('core' == $type) {
+			if (is_wp_error($upgrade_result) && ('up_to_date' == $upgrade_result->get_error_code() || 'locked' == $upgrade_result->get_error_code())) {
 				// These aren't actual errors, treat it as a skipped-update instead to avoid triggering the post-core update failure routines.
 				return false;
 			}
 
 			// Core doesn't output this, so let's append it so we don't get confused.
-			if ( is_wp_error( $upgrade_result ) ) {
-				$skin->error( __( 'Installation Failed' ), $upgrade_result );
+			if (is_wp_error($upgrade_result)) {
+				$skin->error(__('Installation Failed'), $upgrade_result);
 			} else {
-				$skin->feedback( __( 'WordPress updated successfully' ) );
+				$skin->feedback(__('WordPress updated successfully'));
 			}
 		}
 
-		$this->update_results[ $type ][] = (object) array(
+		$this->update_results[$type][] = (object) array(
 			'item'     => $item,
 			'result'   => $upgrade_result,
 			'name'     => $item_name,
@@ -373,38 +373,38 @@ 
 	 * @access public
 	 */
 	public function run() {
-		if ( $this->is_disabled() )
+		if ($this->is_disabled())
 			return;
 
-		if ( ! is_main_network() || ! is_main_site() )
+		if ( ! is_main_network() || ! is_main_site())
 			return;
 
-		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) )
+		if ( ! WP_Upgrader::create_lock('auto_updater'))
 			return;
 
 		// Don't automatically run these thins, as we'll handle it ourselves
-		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');
 
 		// Next, Plugins
 		wp_update_plugins(); // Check for Plugin updates
-		$plugin_updates = get_site_transient( 'update_plugins' );
-		if ( $plugin_updates && !empty( $plugin_updates->response ) ) {
-			foreach ( $plugin_updates->response as $plugin ) {
-				$this->update( 'plugin', $plugin );
+		$plugin_updates = get_site_transient('update_plugins');
+		if ($plugin_updates && ! empty($plugin_updates->response)) {
+			foreach ($plugin_updates->response as $plugin) {
+				$this->update('plugin', $plugin);
 			}
 			// Force refresh of plugin update information
 			wp_clean_plugins_cache();
 		}
 
 		// Next, those themes we all love
-		wp_update_themes();  // Check for Theme updates
-		$theme_updates = get_site_transient( 'update_themes' );
-		if ( $theme_updates && !empty( $theme_updates->response ) ) {
-			foreach ( $theme_updates->response as $theme ) {
-				$this->update( 'theme', (object) $theme );
+		wp_update_themes(); // Check for Theme updates
+		$theme_updates = get_site_transient('update_themes');
+		if ($theme_updates && ! empty($theme_updates->response)) {
+			foreach ($theme_updates->response as $theme) {
+				$this->update('theme', (object) $theme);
 			}
 			// Force refresh of theme update information
 			wp_clean_themes_cache();
@@ -414,45 +414,45 @@ 
 		wp_version_check(); // Check for Core updates
 		$core_update = find_core_auto_update();
 
-		if ( $core_update )
-			$this->update( 'core', $core_update );
+		if ($core_update)
+			$this->update('core', $core_update);
 
 		// Clean up, and check for any pending translations
 		// (Core_Upgrader checks for core updates)
 		$theme_stats = array();
-		if ( isset( $this->update_results['theme'] ) ) {
-			foreach ( $this->update_results['theme'] as $upgrade ) {
-				$theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
+		if (isset($this->update_results['theme'])) {
+			foreach ($this->update_results['theme'] as $upgrade) {
+				$theme_stats[$upgrade->item->theme] = (true === $upgrade->result);
 			}
 		}
-		wp_update_themes( $theme_stats );  // Check for Theme updates
+		wp_update_themes($theme_stats); // Check for Theme updates
 
 		$plugin_stats = array();
-		if ( isset( $this->update_results['plugin'] ) ) {
-			foreach ( $this->update_results['plugin'] as $upgrade ) {
-				$plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
+		if (isset($this->update_results['plugin'])) {
+			foreach ($this->update_results['plugin'] as $upgrade) {
+				$plugin_stats[$upgrade->item->plugin] = (true === $upgrade->result);
 			}
 		}
-		wp_update_plugins( $plugin_stats ); // Check for Plugin updates
+		wp_update_plugins($plugin_stats); // Check for Plugin updates
 
 		// Finally, Process any new translations
 		$language_updates = wp_get_translation_updates();
-		if ( $language_updates ) {
-			foreach ( $language_updates as $update ) {
-				$this->update( 'translation', $update );
+		if ($language_updates) {
+			foreach ($language_updates as $update) {
+				$this->update('translation', $update);
 			}
 
 			// Clear existing caches
 			wp_clean_update_cache();
 
-			wp_version_check();  // check for Core updates
-			wp_update_themes();  // Check for Theme updates
+			wp_version_check(); // check for Core updates
+			wp_update_themes(); // Check for Theme updates
 			wp_update_plugins(); // Check for Plugin updates
 		}
 
 		// Send debugging email to all development installs.
-		if ( ! empty( $this->update_results ) ) {
-			$development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
+		if ( ! empty($this->update_results)) {
+			$development_version = false !== strpos(get_bloginfo('version'), '-');
 
 			/**
 			 * Filters whether to send a debugging email for each automatic background update.
@@ -463,11 +463,11 @@ 
 			 *                                  install is a development version.
 			 *                                  Return false to avoid the email.
 			 */
-			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) )
+			if (apply_filters('automatic_updates_send_debug_email', $development_version))
 				$this->send_debug_email();
 
-			if ( ! empty( $this->update_results['core'] ) )
-				$this->after_core_update( $this->update_results['core'][0] );
+			if ( ! empty($this->update_results['core']))
+				$this->after_core_update($this->update_results['core'][0]);
 
 			/**
 			 * Fires after all automatic updates have run.
@@ -476,10 +476,10 @@ 
 			 *
 			 * @param array $update_results The results of all attempted updates.
 			 */
-			do_action( 'automatic_updates_complete', $this->update_results );
+			do_action('automatic_updates_complete', $this->update_results);
 		}
 
-		WP_Upgrader::release_lock( 'auto_updater' );
+		WP_Upgrader::release_lock('auto_updater');
 	}
 
 	/**
@@ -491,14 +491,14 @@ 
 	 *
 	 * @param object $update_result The result of the core update. Includes the update offer and result.
 	 */
-	protected function after_core_update( $update_result ) {
-		$wp_version = get_bloginfo( 'version' );
+	protected function after_core_update($update_result) {
+		$wp_version = get_bloginfo('version');
 
 		$core_update = $update_result->item;
 		$result      = $update_result->result;
 
-		if ( ! is_wp_error( $result ) ) {
-			$this->send_email( 'success', $core_update );
+		if ( ! is_wp_error($result)) {
+			$this->send_email('success', $core_update);
 			return;
 		}
 
@@ -507,17 +507,17 @@ 
 		// Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
 		// We should not try to perform a background update again until there is a successful one-click update performed by the user.
 		$critical = false;
-		if ( $error_code === 'disk_full' || false !== strpos( $error_code, '__copy_dir' ) ) {
+		if ($error_code === 'disk_full' || false !== strpos($error_code, '__copy_dir')) {
 			$critical = true;
-		} elseif ( $error_code === 'rollback_was_required' && is_wp_error( $result->get_error_data()->rollback ) ) {
+		} elseif ($error_code === 'rollback_was_required' && is_wp_error($result->get_error_data()->rollback)) {
 			// A rollback is only critical if it failed too.
 			$critical = true;
 			$rollback_result = $result->get_error_data()->rollback;
-		} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
+		} elseif (false !== strpos($error_code, 'do_rollback')) {
 			$critical = true;
 		}
 
-		if ( $critical ) {
+		if ($critical) {
 			$critical_data = array(
 				'attempted'  => $core_update->current,
 				'current'    => $wp_version,
@@ -526,12 +526,12 @@ 
 				'timestamp'  => time(),
 				'critical'   => true,
 			);
-			if ( isset( $rollback_result ) ) {
+			if (isset($rollback_result)) {
 				$critical_data['rollback_code'] = $rollback_result->get_error_code();
 				$critical_data['rollback_data'] = $rollback_result->get_error_data();
 			}
-			update_site_option( 'auto_core_update_failed', $critical_data );
-			$this->send_email( 'critical', $core_update, $result );
+			update_site_option('auto_core_update_failed', $critical_data);
+			$this->send_email('critical', $core_update, $result);
 			return;
 		}
 
@@ -547,28 +547,28 @@ 
 		 * the issue could actually be on WordPress.org's side.) If that one fails, then email.
 		 */
 		$send = true;
-  		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
-  		if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
-  			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
+  		$transient_failures = array('incompatible_archive', 'download_failed', 'insane_distro', 'locked');
+  		if (in_array($error_code, $transient_failures) && ! get_site_option('auto_core_update_failed')) {
+  			wp_schedule_single_event(time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update');
   			$send = false;
   		}
 
-  		$n = get_site_option( 'auto_core_update_notified' );
+  		$n = get_site_option('auto_core_update_notified');
 		// Don't notify if we've already notified the same email address of the same version of the same notification type.
-		if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
+		if ($n && 'fail' == $n['type'] && $n['email'] == get_site_option('admin_email') && $n['version'] == $core_update->current)
 			$send = false;
 
-		update_site_option( 'auto_core_update_failed', array(
+		update_site_option('auto_core_update_failed', array(
 			'attempted'  => $core_update->current,
 			'current'    => $wp_version,
 			'error_code' => $error_code,
 			'error_data' => $result->get_error_data(),
 			'timestamp'  => time(),
-			'retry'      => in_array( $error_code, $transient_failures ),
-		) );
+			'retry'      => in_array($error_code, $transient_failures),
+		));
 
-		if ( $send )
-			$this->send_email( 'fail', $core_update, $result );
+		if ($send)
+			$this->send_email('fail', $core_update, $result);
 	}
 
 	/**
@@ -581,19 +581,19 @@ 
 	 * @param object $core_update The update offer that was attempted.
 	 * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
 	 */
-	protected function send_email( $type, $core_update, $result = null ) {
-		update_site_option( 'auto_core_update_notified', array(
+	protected function send_email($type, $core_update, $result = null) {
+		update_site_option('auto_core_update_notified', array(
 			'type'      => $type,
-			'email'     => get_site_option( 'admin_email' ),
+			'email'     => get_site_option('admin_email'),
 			'version'   => $core_update->current,
 			'timestamp' => time(),
-		) );
+		));
 
 		$next_user_core_update = get_preferred_from_update_core();
 		// If the update transient is empty, use the update we just performed
-		if ( ! $next_user_core_update )
+		if ( ! $next_user_core_update)
 			$next_user_core_update = $core_update;
-		$newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
+		$newer_version_available = ('upgrade' == $next_user_core_update->response && version_compare($next_user_core_update->version, $core_update->version, '>'));
 
 		/**
 		 * Filters whether to send an email following an automatic background core update.
@@ -606,24 +606,24 @@ 
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
+		if ('manual' !== $type && ! apply_filters('auto_core_update_send_email', true, $type, $core_update, $result))
 			return;
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success' : // We updated.
 				/* translators: 1: Site name, 2: WordPress version number. */
-				$subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
+				$subject = __('[%1$s] Your site has updated to WordPress %2$s');
 				break;
 
 			case 'fail' :   // We tried to update but couldn't.
 			case 'manual' : // We can't update (and made no attempt).
 				/* translators: 1: Site name, 2: WordPress version number. */
-				$subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
+				$subject = __('[%1$s] WordPress %2$s is available. Please update!');
 				break;
 
 			case 'critical' : // We tried to update, started to copy files, then things went wrong.
 				/* translators: 1: Site name. */
-				$subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
+				$subject = __('[%1$s] URGENT: Your site may be down due to a failed update');
 				break;
 
 			default :
@@ -632,118 +632,118 @@ 
 
 		// If the auto update is not to the latest version, say that the current version of WP is available instead.
 		$version = 'success' === $type ? $core_update->current : $next_user_core_update->current;
-		$subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $version );
+		$subject = sprintf($subject, wp_specialchars_decode(get_option('blogname'), ENT_QUOTES), $version);
 
 		$body = '';
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success' :
-				$body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
+				$body .= sprintf(__('Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.'), home_url(), $core_update->current);
 				$body .= "\n\n";
-				if ( ! $newer_version_available )
-					$body .= __( 'No further action is needed on your part.' ) . ' ';
+				if ( ! $newer_version_available)
+					$body .= __('No further action is needed on your part.').' ';
 
 				// Can only reference the About screen if their update was successful.
-				list( $about_version ) = explode( '-', $core_update->current, 2 );
-				$body .= sprintf( __( "For more on version %s, see the About WordPress screen:" ), $about_version );
-				$body .= "\n" . admin_url( 'about.php' );
-
-				if ( $newer_version_available ) {
-					$body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
-					$body .= __( 'Updating is easy and only takes a few moments:' );
-					$body .= "\n" . network_admin_url( 'update-core.php' );
+				list($about_version) = explode('-', $core_update->current, 2);
+				$body .= sprintf(__("For more on version %s, see the About WordPress screen:"), $about_version);
+				$body .= "\n".admin_url('about.php');
+
+				if ($newer_version_available) {
+					$body .= "\n\n".sprintf(__('WordPress %s is also now available.'), $next_user_core_update->current).' ';
+					$body .= __('Updating is easy and only takes a few moments:');
+					$body .= "\n".network_admin_url('update-core.php');
 				}
 
 				break;
 
 			case 'fail' :
 			case 'manual' :
-				$body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
+				$body .= sprintf(__('Please update your site at %1$s to WordPress %2$s.'), home_url(), $next_user_core_update->current);
 
 				$body .= "\n\n";
 
 				// Don't show this message if there is a newer version available.
 				// Potential for confusion, and also not useful for them to know at this point.
-				if ( 'fail' == $type && ! $newer_version_available )
-					$body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
+				if ('fail' == $type && ! $newer_version_available)
+					$body .= __('We tried but were unable to update your site automatically.').' ';
 
-				$body .= __( 'Updating is easy and only takes a few moments:' );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
+				$body .= __('Updating is easy and only takes a few moments:');
+				$body .= "\n".network_admin_url('update-core.php');
 				break;
 
 			case 'critical' :
-				if ( $newer_version_available )
-					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
+				if ($newer_version_available)
+					$body .= sprintf(__('Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.'), home_url(), $core_update->current);
 				else
-					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
+					$body .= sprintf(__('Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.'), home_url(), $core_update->current);
 
-				$body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
+				$body .= "\n\n".__("This means your site may be offline or broken. Don't panic; this can be fixed.");
 
-				$body .= "\n\n" . __( "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
+				$body .= "\n\n".__("Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:");
+				$body .= "\n".network_admin_url('update-core.php');
 				break;
 		}
 
-		$critical_support = 'critical' === $type && ! empty( $core_update->support_email );
-		if ( $critical_support ) {
+		$critical_support = 'critical' === $type && ! empty($core_update->support_email);
+		if ($critical_support) {
 			// Support offer if available.
-			$body .= "\n\n" . sprintf( __( "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." ), $core_update->support_email );
+			$body .= "\n\n".sprintf(__("The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working."), $core_update->support_email);
 		} else {
 			// Add a note about the support forums.
-			$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-			$body .= "\n" . __( 'https://wordpress.org/support/' );
+			$body .= "\n\n".__('If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.');
+			$body .= "\n".__('https://wordpress.org/support/');
 		}
 
 		// Updates are important!
-		if ( $type != 'success' || $newer_version_available ) {
-			$body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
+		if ($type != 'success' || $newer_version_available) {
+			$body .= "\n\n".__('Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.');
 		}
 
-		if ( $critical_support ) {
-			$body .= " " . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
+		if ($critical_support) {
+			$body .= " ".__("If you reach out to us, we'll also ensure you'll never have this problem again.");
 		}
 
 		// If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
-		if ( $type == 'success' && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
-			$body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
-			$body .= "\n" . network_admin_url();
+		if ($type == 'success' && ! $newer_version_available && (get_plugin_updates() || get_theme_updates())) {
+			$body .= "\n\n".__('You also have some plugins or themes with updates available. Update them now:');
+			$body .= "\n".network_admin_url();
 		}
 
-		$body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
+		$body .= "\n\n".__('The WordPress Team')."\n";
 
-		if ( 'critical' == $type && is_wp_error( $result ) ) {
+		if ('critical' == $type && is_wp_error($result)) {
 			$body .= "\n***\n\n";
-			$body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
-			$body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
-			$body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
+			$body .= sprintf(__('Your site was running version %s.'), get_bloginfo('version'));
+			$body .= ' '.__('We have some data that describes the error your site encountered.');
+			$body .= ' '.__('Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:');
 
 			// If we had a rollback and we're still critical, then the rollback failed too.
 			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-			if ( 'rollback_was_required' == $result->get_error_code() )
-				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
+			if ('rollback_was_required' == $result->get_error_code())
+				$errors = array($result, $result->get_error_data()->update, $result->get_error_data()->rollback);
 			else
-				$errors = array( $result );
+				$errors = array($result);
 
-			foreach ( $errors as $error ) {
-				if ( ! is_wp_error( $error ) )
+			foreach ($errors as $error) {
+				if ( ! is_wp_error($error))
 					continue;
 				$error_code = $error->get_error_code();
-				$body .= "\n\n" . sprintf( __( "Error code: %s" ), $error_code );
-				if ( 'rollback_was_required' == $error_code )
+				$body .= "\n\n".sprintf(__("Error code: %s"), $error_code);
+				if ('rollback_was_required' == $error_code)
 					continue;
-				if ( $error->get_error_message() )
-					$body .= "\n" . $error->get_error_message();
+				if ($error->get_error_message())
+					$body .= "\n".$error->get_error_message();
 				$error_data = $error->get_error_data();
-				if ( $error_data )
-					$body .= "\n" . implode( ', ', (array) $error_data );
+				if ($error_data)
+					$body .= "\n".implode(', ', (array) $error_data);
 			}
 			$body .= "\n";
 		}
 
-		$to  = get_site_option( 'admin_email' );
+		$to = get_site_option('admin_email');
 		$headers = '';
 
-		$email = compact( 'to', 'subject', 'body', 'headers' );
+		$email = compact('to', 'subject', 'body', 'headers');
 
 		/**
 		 * Filters the email sent following an automatic background core update.
@@ -764,9 +764,9 @@ 
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		$email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
+		$email = apply_filters('auto_core_update_email', $email, $type, $core_update, $result);
 
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+		wp_mail($email['to'], wp_specialchars_decode($email['subject']), $email['body'], $email['headers']);
 	}
 
 	/**
@@ -777,55 +777,55 @@ 
 	 */
 	protected function send_debug_email() {
 		$update_count = 0;
-		foreach ( $this->update_results as $type => $updates )
-			$update_count += count( $updates );
+		foreach ($this->update_results as $type => $updates)
+			$update_count += count($updates);
 
 		$body = array();
 		$failures = 0;
 
-		$body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
+		$body[] = sprintf(__('WordPress site: %s'), network_home_url('/'));
 
 		// Core
-		if ( isset( $this->update_results['core'] ) ) {
+		if (isset($this->update_results['core'])) {
 			$result = $this->update_results['core'][0];
-			if ( $result->result && ! is_wp_error( $result->result ) ) {
-				$body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
+			if ($result->result && ! is_wp_error($result->result)) {
+				$body[] = sprintf(__('SUCCESS: WordPress was successfully updated to %s'), $result->name);
 			} else {
-				$body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
+				$body[] = sprintf(__('FAILED: WordPress failed to update to %s'), $result->name);
 				$failures++;
 			}
 			$body[] = '';
 		}
 
 		// Plugins, Themes, Translations
-		foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
+		foreach (array('plugin', 'theme', 'translation') as $type) {
+			if ( ! isset($this->update_results[$type]))
 				continue;
-			$success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
-			if ( $success_items ) {
+			$success_items = wp_list_filter($this->update_results[$type], array('result' => true));
+			if ($success_items) {
 				$messages = array(
-					'plugin'      => __( 'The following plugins were successfully updated:' ),
-					'theme'       => __( 'The following themes were successfully updated:' ),
-					'translation' => __( 'The following translations were successfully updated:' ),
+					'plugin'      => __('The following plugins were successfully updated:'),
+					'theme'       => __('The following themes were successfully updated:'),
+					'translation' => __('The following translations were successfully updated:'),
 				);
 
-				$body[] = $messages[ $type ];
-				foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
-					$body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
+				$body[] = $messages[$type];
+				foreach (wp_list_pluck($success_items, 'name') as $name) {
+					$body[] = ' * '.sprintf(__('SUCCESS: %s'), $name);
 				}
 			}
-			if ( $success_items != $this->update_results[ $type ] ) {
+			if ($success_items != $this->update_results[$type]) {
 				// Failed updates
 				$messages = array(
-					'plugin'      => __( 'The following plugins failed to update:' ),
-					'theme'       => __( 'The following themes failed to update:' ),
-					'translation' => __( 'The following translations failed to update:' ),
+					'plugin'      => __('The following plugins failed to update:'),
+					'theme'       => __('The following themes failed to update:'),
+					'translation' => __('The following translations failed to update:'),
 				);
 
-				$body[] = $messages[ $type ];
-				foreach ( $this->update_results[ $type ] as $item ) {
-					if ( ! $item->result || is_wp_error( $item->result ) ) {
-						$body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
+				$body[] = $messages[$type];
+				foreach ($this->update_results[$type] as $item) {
+					if ( ! $item->result || is_wp_error($item->result)) {
+						$body[] = ' * '.sprintf(__('FAILED: %s'), $item->name);
 						$failures++;
 					}
 				}
@@ -833,9 +833,9 @@ 
 			$body[] = '';
 		}
 
-		$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
-		if ( $failures ) {
-			$body[] = trim( __(
+		$site_title = wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
+		if ($failures) {
+			$body[] = trim(__(
 "BETA TESTING?
 =============
 
@@ -845,46 +845,46 @@ 
  * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta
  * Or, if you're comfortable writing a bug report: https://core.trac.wordpress.org/
 
-Thanks! -- The WordPress Team" ) );
+Thanks! -- The WordPress Team" ));
 			$body[] = '';
 
-			$subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
+			$subject = sprintf(__('[%s] There were failures during background updates'), $site_title);
 		} else {
-			$subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
+			$subject = sprintf(__('[%s] Background updates have finished'), $site_title);
 		}
 
-		$body[] = trim( __(
+		$body[] = trim(__(
 'UPDATE LOG
-==========' ) );
+==========' ));
 		$body[] = '';
 
-		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
+		foreach (array('core', 'plugin', 'theme', 'translation') as $type) {
+			if ( ! isset($this->update_results[$type]))
 				continue;
-			foreach ( $this->update_results[ $type ] as $update ) {
+			foreach ($this->update_results[$type] as $update) {
 				$body[] = $update->name;
-				$body[] = str_repeat( '-', strlen( $update->name ) );
-				foreach ( $update->messages as $message )
-					$body[] = "  " . html_entity_decode( str_replace( '…', '...', $message ) );
-				if ( is_wp_error( $update->result ) ) {
-					$results = array( 'update' => $update->result );
+				$body[] = str_repeat('-', strlen($update->name));
+				foreach ($update->messages as $message)
+					$body[] = "  ".html_entity_decode(str_replace('…', '...', $message));
+				if (is_wp_error($update->result)) {
+					$results = array('update' => $update->result);
 					// If we rolled back, we want to know an error that occurred then too.
-					if ( 'rollback_was_required' === $update->result->get_error_code() )
+					if ('rollback_was_required' === $update->result->get_error_code())
 						$results = (array) $update->result->get_error_data();
-					foreach ( $results as $result_type => $result ) {
-						if ( ! is_wp_error( $result ) )
+					foreach ($results as $result_type => $result) {
+						if ( ! is_wp_error($result))
 							continue;
 
-						if ( 'rollback' === $result_type ) {
+						if ('rollback' === $result_type) {
 							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Rollback Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+							$body[] = '  '.sprintf(__('Rollback Error: [%1$s] %2$s'), $result->get_error_code(), $result->get_error_message());
 						} else {
 							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+							$body[] = '  '.sprintf(__('Error: [%1$s] %2$s'), $result->get_error_code(), $result->get_error_message());
 						}
 
-						if ( $result->get_error_data() )
-							$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+						if ($result->get_error_data())
+							$body[] = '         '.implode(', ', (array) $result->get_error_data());
 					}
 				}
 				$body[] = '';
@@ -892,9 +892,9 @@ 
 		}
 
 		$email = array(
-			'to'      => get_site_option( 'admin_email' ),
+			'to'      => get_site_option('admin_email'),
 			'subject' => $subject,
-			'body'    => implode( "\n", $body ),
+			'body'    => implode("\n", $body),
 			'headers' => ''
 		);
 
@@ -916,8 +916,8 @@ 
 		 * @param int   $failures The number of failures encountered while upgrading.
 		 * @param mixed $results  The results of all attempted updates.
 		 */
-		$email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
+		$email = apply_filters('automatic_updates_debug_email', $email, $failures, $this->update_results);
 
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+		wp_mail($email['to'], wp_specialchars_decode($email['subject']), $email['body'], $email['headers']);
 	}
 }

src/wp-admin/includes/admin-filters.php

Spacing +61 added lines, -61 removed lines

@@ -8,83 +8,83 @@ 
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action('activity_box_end', 'wp_dashboard_quota');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Misc hooks.
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', '_ipad_meta');
 
 // Prerendering.
-if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+if ( ! is_customize_preview()) {
+	add_filter('admin_print_styles', 'wp_resource_hints', 1);
 }
 
-add_action( 'admin_print_scripts-post.php',     'wp_page_reload_on_back_button_js' );
-add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' );
+add_action('admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js');
+add_action('admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js');
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'whitelist_options', 'option_update_filter' );
+add_filter('whitelist_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
@@ -93,29 +93,29 @@ 
 // add_action('install_themes_featured', 'display_themes');
 // add_action('install_themes_new', 'display_themes');
 // add_action('install_themes_updated', 'display_themes');
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
+add_action('admin_notices', 'default_password_nag');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
 // Update hooks.
-add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
-add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
+add_action('load-plugins.php', 'wp_plugin_update_rows', 20); // After wp_update_plugins() is called.
+add_action('load-themes.php', 'wp_theme_update_rows', 20); // After wp_update_themes() is called.
 
-add_action( 'admin_notices', 'update_nag',      3  );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'maintenance_nag', 10);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // 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);