ntwb / wordpress

src/wp-content/themes/twentyeleven/inc/widgets.php

Spacing +42 added lines, -42 removed lines

@@ -18,16 +18,16 @@ 
 	 * @since Twenty Eleven 2.2
 	 */
 	function __construct() {
-		parent::__construct( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), array(
+		parent::__construct('widget_twentyeleven_ephemera', __('Twenty Eleven Ephemera', 'twentyeleven'), array(
 			'classname'   => 'widget_twentyeleven_ephemera',
-			'description' => __( 'Use this widget to list your recent Aside, Status, Quote, and Link posts', 'twentyeleven' ),
+			'description' => __('Use this widget to list your recent Aside, Status, Quote, and Link posts', 'twentyeleven'),
 			'customize_selective_refresh' => true,
-		) );
+		));
 		$this->alt_option_name = 'widget_twentyeleven_ephemera';
 
-		add_action( 'save_post', array( &$this, 'flush_widget_cache' ) );
-		add_action( 'deleted_post', array( &$this, 'flush_widget_cache' ) );
-		add_action( 'switch_theme', array( &$this, 'flush_widget_cache' ) );
+		add_action('save_post', array(&$this, 'flush_widget_cache'));
+		add_action('deleted_post', array(&$this, 'flush_widget_cache'));
+		add_action('switch_theme', array(&$this, 'flush_widget_cache'));
 	}
 
 	/**
@@ -47,30 +47,30 @@ 
 	 * @param array $args     An array of standard parameters for widgets in this theme.
 	 * @param array $instance An array of settings for this widget instance.
 	 **/
-	function widget( $args, $instance ) {
-		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
+	function widget($args, $instance) {
+		$cache = wp_cache_get('widget_twentyeleven_ephemera', 'widget');
 
-		if ( ! is_array( $cache ) )
+		if ( ! is_array($cache))
 			$cache = array();
 
-		if ( ! isset( $args['widget_id'] ) )
+		if ( ! isset($args['widget_id']))
 			$args['widget_id'] = null;
 
-		if ( ! is_customize_preview() && isset( $cache[ $args['widget_id'] ] ) ) {
-			echo $cache[ $args['widget_id'] ];
+		if ( ! is_customize_preview() && isset($cache[$args['widget_id']])) {
+			echo $cache[$args['widget_id']];
 			return;
 		}
 
 		ob_start();
-		extract( $args, EXTR_SKIP );
+		extract($args, EXTR_SKIP);
 
 		/** This filter is documented in wp-includes/default-widgets.php */
-		$args['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base );
+		$args['title'] = apply_filters('widget_title', empty($instance['title']) ? __('Ephemera', 'twentyeleven') : $instance['title'], $instance, $this->id_base);
 
-		if ( ! isset( $instance['number'] ) )
+		if ( ! isset($instance['number']))
 			$instance['number'] = '10';
 
-		if ( ! $args['number'] = absint( $instance['number'] ) )
+		if ( ! $args['number'] = absint($instance['number']))
 			$args['number'] = 10;
 
 		$ephemera_args = array(
@@ -78,42 +78,42 @@ 
 			'posts_per_page' => $args['number'],
 			'no_found_rows'  => true,
 			'post_status'    => 'publish',
-			'post__not_in'   => get_option( 'sticky_posts' ),
+			'post__not_in'   => get_option('sticky_posts'),
 			'tax_query'      => array(
 				array(
 					'taxonomy' => 'post_format',
-					'terms'    => array( 'post-format-aside', 'post-format-link', 'post-format-status', 'post-format-quote' ),
+					'terms'    => array('post-format-aside', 'post-format-link', 'post-format-status', 'post-format-quote'),
 					'field'    => 'slug',
 					'operator' => 'IN',
 				),
 			),
 		);
-		$ephemera = new WP_Query( $ephemera_args );
+		$ephemera = new WP_Query($ephemera_args);
 
-		if ( $ephemera->have_posts() ) :
+		if ($ephemera->have_posts()) :
 			echo $args['before_widget'];
 			echo $args['before_title'];
 			echo $args['title'];
 			echo $args['after_title'];
 			?>
 			<ol>
-			<?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
+			<?php while ($ephemera->have_posts()) : $ephemera->the_post(); ?>
 
-				<?php if ( 'link' != get_post_format() ) : ?>
+				<?php if ('link' != get_post_format()) : ?>
 
 				<li class="widget-entry-title">
-					<a href="<?php echo esc_url( get_permalink() ); ?>" rel="bookmark"><?php the_title(); ?></a>
+					<a href="<?php echo esc_url(get_permalink()); ?>" rel="bookmark"><?php the_title(); ?></a>
 					<span class="comments-link">
-						<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+						<?php comments_popup_link(__('0 <span class="reply">comments &rarr;</span>', 'twentyeleven'), __('1 <span class="reply">comment &rarr;</span>', 'twentyeleven'), __('% <span class="reply">comments &rarr;</span>', 'twentyeleven')); ?>
 					</span>
 				</li>
 
 				<?php else : ?>
 
 				<li class="widget-entry-title">
-					<a href="<?php echo esc_url( twentyeleven_get_first_url() ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
+					<a href="<?php echo esc_url(twentyeleven_get_first_url()); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
 					<span class="comments-link">
-						<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+						<?php comments_popup_link(__('0 <span class="reply">comments &rarr;</span>', 'twentyeleven'), __('1 <span class="reply">comment &rarr;</span>', 'twentyeleven'), __('% <span class="reply">comments &rarr;</span>', 'twentyeleven')); ?>
 					</span>
 				</li>
 
@@ -131,9 +131,9 @@ 
 		// end check for ephemeral posts
 		endif;
 
-		$cache[ $args['widget_id'] ] = ob_get_flush();
-		if ( ! is_customize_preview() ) {
-			wp_cache_set( 'widget_twentyeleven_ephemera', $cache, 'widget' );
+		$cache[$args['widget_id']] = ob_get_flush();
+		if ( ! is_customize_preview()) {
+			wp_cache_set('widget_twentyeleven_ephemera', $cache, 'widget');
 		}
 
 	}
@@ -146,15 +146,15 @@ 
 	 *
 	 * @since Twenty Eleven 1.0
 	 **/
-	function update( $new_instance, $old_instance ) {
+	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance['title'] = strip_tags($new_instance['title']);
 		$instance['number'] = (int) $new_instance['number'];
 		$this->flush_widget_cache();
 
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
-		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) )
-			delete_option( 'widget_twentyeleven_ephemera' );
+		$alloptions = wp_cache_get('alloptions', 'options');
+		if (isset($alloptions['widget_twentyeleven_ephemera']))
+			delete_option('widget_twentyeleven_ephemera');
 
 		return $instance;
 	}
@@ -165,7 +165,7 @@ 
 	 * @since Twenty Eleven 1.0
 	 */
 	function flush_widget_cache() {
-		wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
+		wp_cache_delete('widget_twentyeleven_ephemera', 'widget');
 	}
 
 	/**
@@ -175,15 +175,15 @@ 
 	 *
 	 * @since Twenty Eleven 1.0
 	 **/
-	function form( $instance ) {
-		$title = isset( $instance['title']) ? esc_attr( $instance['title'] ) : '';
-		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
+	function form($instance) {
+		$title = isset($instance['title']) ? esc_attr($instance['title']) : '';
+		$number = isset($instance['number']) ? absint($instance['number']) : 10;
 ?>
-			<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+			<p><label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title:', 'twentyeleven'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-			<p><label for="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>"><?php _e( 'Number of posts to show:', 'twentyeleven' ); ?></label>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'number' ) ); ?>" type="text" value="<?php echo esc_attr( $number ); ?>" size="3" /></p>
+			<p><label for="<?php echo esc_attr($this->get_field_id('number')); ?>"><?php _e('Number of posts to show:', 'twentyeleven'); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('number')); ?>" name="<?php echo esc_attr($this->get_field_name('number')); ?>" type="text" value="<?php echo esc_attr($number); ?>" size="3" /></p>
 		<?php
 	}
 }

Braces +20 added lines, -12 removed lines

@@ -50,11 +50,13 @@ 
 	function widget( $args, $instance ) {
 		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
 
-		if ( ! is_array( $cache ) )
-			$cache = array();
+		if ( ! is_array( $cache ) ) {
+					$cache = array();
+		}
 
-		if ( ! isset( $args['widget_id'] ) )
-			$args['widget_id'] = null;
+		if ( ! isset( $args['widget_id'] ) ) {
+					$args['widget_id'] = null;
+		}
 
 		if ( ! is_customize_preview() && isset( $cache[ $args['widget_id'] ] ) ) {
 			echo $cache[ $args['widget_id'] ];
@@ -67,11 +69,13 @@ 
 		/** This filter is documented in wp-includes/default-widgets.php */
 		$args['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base );
 
-		if ( ! isset( $instance['number'] ) )
-			$instance['number'] = '10';
+		if ( ! isset( $instance['number'] ) ) {
+					$instance['number'] = '10';
+		}
 
-		if ( ! $args['number'] = absint( $instance['number'] ) )
-			$args['number'] = 10;
+		if ( ! $args['number'] = absint( $instance['number'] ) ) {
+					$args['number'] = 10;
+		}
 
 		$ephemera_args = array(
 			'order'          => 'DESC',
@@ -108,10 +112,13 @@ 
 					</span>
 				</li>
 
-				<?php else : ?>
+				<?php else {
+	: ?>
 
 				<li class="widget-entry-title">
-					<a href="<?php echo esc_url( twentyeleven_get_first_url() ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
+					<a href="<?php echo esc_url( twentyeleven_get_first_url() );
+}
+?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
 					<span class="comments-link">
 						<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
 					</span>
@@ -153,8 +160,9 @@ 
 		$this->flush_widget_cache();
 
 		$alloptions = wp_cache_get( 'alloptions', 'options' );
-		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) )
-			delete_option( 'widget_twentyeleven_ephemera' );
+		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) ) {
+					delete_option( 'widget_twentyeleven_ephemera' );
+		}
 
 		return $instance;
 	}

src/wp-admin/options-general.php

Indentation +14 added lines, -14 removed lines

@@ -193,7 +193,7 @@ 
 		$right_now = time();
 		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
 			if ( $tr['ts'] > $right_now ) {
-			    $found = true;
+				$found = true;
 				break;
 			}
 		}
@@ -231,13 +231,13 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 	/**
-	* Filters the default date formats.
-	*
-	* @since 2.7.0
-	* @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-	*
-	* @param array $default_date_formats Array of default date formats.
-	*/
+	 * Filters the default date formats.
+	 *
+	 * @since 2.7.0
+	 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+	 *
+	 * @param array $default_date_formats Array of default date formats.
+	 */
 	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
 
 	$custom = true;
@@ -268,12 +268,12 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 	/**
-	* Filters the default time formats.
-	*
-	* @since 2.7.0
-	*
-	* @param array $default_time_formats Array of default time formats.
-	*/
+	 * Filters the default time formats.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param array $default_time_formats Array of default time formats.
+	 */
 	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
 
 	$custom = true;

Spacing +98 added lines, -99 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';
@@ -22,35 +22,35 @@ 
 
 add_action('admin_head', 'options_general_add_js');
 
-$options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
-	'<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
+$options_help = '<p>'.__('The fields on this screen determine some of the basics of your site setup.').'</p>'.
+	'<p>'.__('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.').'</p>';
 
-if ( ! is_multisite() ) {
-	$options_help .= '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
-		'<p>' . __('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.') . '</p>';
+if ( ! is_multisite()) {
+	$options_help .= '<p>'.__('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.').'</p>'.
+		'<p>'.__('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.').'</p>';
 }
 
-$options_help .= '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
-	'<p>' . __( 'UTC means Coordinated Universal Time.' ) . '</p>' .
-	'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
+$options_help .= '<p>'.__('You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).').'</p>'.
+	'<p>'.__('UTC means Coordinated Universal Time.').'</p>'.
+	'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $options_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen">Documentation on General Settings</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/Settings_General_Screen">Documentation on General Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields('general'); ?>
@@ -63,24 +63,24 @@ 
 <tr>
 <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
 <td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
+<p class="description" id="tagline-description"><?php _e('In a few words, explain what this site is about.') ?></p></td>
 </tr>
-<?php if ( !is_multisite() ) { ?>
+<?php if ( ! is_multisite()) { ?>
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled(defined('WP_SITEURL')); ?> class="regular-text code<?php if (defined('WP_SITEURL')) echo ' disabled' ?>" /></td>
 </tr>
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option('home'); ?>"<?php disabled(defined('WP_HOME')); ?> class="regular-text code<?php if (defined('WP_HOME')) echo ' disabled' ?>" />
+<?php if ( ! defined('WP_HOME')) : ?>
+<p class="description" id="home-description"><?php _e('Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>'); ?></p></td>
 <?php endif; ?>
 </tr>
 <tr>
 <th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
+<td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<p class="description" id="admin-email-description"><?php _e('This address is used for admin purposes, like new user notification.') ?></p></td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Membership') ?></th>
@@ -92,28 +92,28 @@ 
 <tr>
 <th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
 <td>
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles(get_option('default_role')); ?></select>
 </td>
 </tr>
 <?php } else { ?>
 <tr>
 <th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
+<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<p class="description" id="new-admin-email-description"><?php _e('This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
 <?php
-$new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
+$new_admin_email = get_option('new_admin_email');
+if ($new_admin_email && $new_admin_email != get_option('admin_email')) : ?>
 <div class="updated inline">
 <p><?php
 	printf(
 		/* translators: %s: new admin email */
-		__( 'There is a pending change of the admin email to %s.' ),
-		'<code>' . esc_html( $new_admin_email ) . '</code>'
+		__('There is a pending change of the admin email to %s.'),
+		'<code>'.esc_html($new_admin_email).'</code>'
 	);
 	printf(
 		' <a href="%1$s">%2$s</a>',
-		esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
-		__( 'Cancel' )
+		esc_url(wp_nonce_url(admin_url('options.php?dismiss=new_admin_email'), 'dismiss-'.get_current_blog_id().'-new_admin_email')),
+		__('Cancel')
 	);
 ?></p>
 </div>
@@ -124,40 +124,40 @@ 
 
 $languages = get_available_languages();
 $translations = wp_get_available_translations();
-if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
+if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array(WPLANG, $languages)) {
 	$languages[] = WPLANG;
 }
-if ( ! empty( $languages ) || ! empty( $translations ) ) {
+if ( ! empty($languages) || ! empty($translations)) {
 	?>
 	<tr>
-		<th scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
+		<th scope="row"><label for="WPLANG"><?php _e('Site Language'); ?></label></th>
 		<td>
 			<?php
 			$locale = get_locale();
-			if ( ! in_array( $locale, $languages ) ) {
+			if ( ! in_array($locale, $languages)) {
 				$locale = '';
 			}
 
-			wp_dropdown_languages( array(
+			wp_dropdown_languages(array(
 				'name'         => 'WPLANG',
 				'id'           => 'WPLANG',
 				'selected'     => $locale,
 				'languages'    => $languages,
 				'translations' => $translations,
-				'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
-			) );
+				'show_available_translations' => ( ! is_multisite() || is_super_admin()) && wp_can_install_language_pack(),
+			));
 
 			// Add note about deprecated WPLANG constant.
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-				if ( is_multisite() && current_user_can( 'manage_network_options' )
-					|| ! is_multisite() && current_user_can( 'manage_options' ) ) {
+			if (defined('WPLANG') && ('' !== WPLANG) && $locale !== WPLANG) {
+				if (is_multisite() && current_user_can('manage_network_options')
+					|| ! is_multisite() && current_user_can('manage_options')) {
 					?>
 					<p class="description">
-						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
+						<strong><?php _e('Note:'); ?></strong> <?php printf(__('The %s constant in your %s file is no longer needed.'), '<code>WPLANG</code>', '<code>wp-config.php</code>'); ?>
 					</p>
 					<?php
 				}
-				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+				_deprecated_argument('define()', '4.0.0', sprintf(__('The %s constant in your %s file is no longer needed.'), 'WPLANG', 'wp-config.php'));
 			}
 			?>
 		</td>
@@ -173,17 +173,17 @@ 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if (false !== strpos($tzstring, 'Etc/GMT'))
 	$tzstring = '';
 
-if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
+	if (0 == $current_offset)
 		$tzstring = 'UTC+0';
 	elseif ($current_offset < 0)
-		$tzstring = 'UTC' . $current_offset;
+		$tzstring = 'UTC'.$current_offset;
 	else
-		$tzstring = 'UTC+' . $current_offset;
+		$tzstring = 'UTC+'.$current_offset;
 }
 
 ?>
@@ -191,37 +191,37 @@ 
 <td>
 
 <select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
-	<?php echo wp_timezone_choice( $tzstring, get_user_locale() ); ?>
+	<?php echo wp_timezone_choice($tzstring, get_user_locale()); ?>
 </select>
 
-<p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
+<p class="description" id="timezone-description"><?php _e('Choose either a city in the same timezone as you or a UTC timezone offset.'); ?></p>
 
 <p class="timezone-info">
 	<span id="utc-time"><?php
 		/* translators: 1: UTC abbreviation, 2: UTC time */
-		printf( __( 'Universal time (%1$s) is %2$s.' ),
-			'<abbr>' . __( 'UTC' ) . '</abbr>',
-			'<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
+		printf(__('Universal time (%1$s) is %2$s.'),
+			'<abbr>'.__('UTC').'</abbr>',
+			'<code>'.date_i18n($timezone_format, false, true).'</code>'
 		);
 	?></span>
-<?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
+<?php if (get_option('timezone_string') || ! empty($current_offset)) : ?>
 	<span id="local-time"><?php
 		/* translators: %s: local time */
-		printf( __( 'Local time is %s.' ),
-			'<code>' . date_i18n( $timezone_format ) . '</code>'
+		printf(__('Local time is %s.'),
+			'<code>'.date_i18n($timezone_format).'</code>'
 		);
 	?></span>
 <?php endif; ?>
 </p>
 
-<?php if ( $check_zone_info && $tzstring ) : ?>
+<?php if ($check_zone_info && $tzstring) : ?>
 <p class="timezone-info">
 <span>
 	<?php
 	// Set TZ so localtime works.
 	date_default_timezone_set($tzstring);
 	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
+	if ($now['tm_isdst'])
 		_e('This timezone is currently in daylight saving time.');
 	else
 		_e('This timezone is currently in standard time.');
@@ -230,34 +230,33 @@ 
 	<?php
 	$allowed_zones = timezone_identifiers_list();
 
-	if ( in_array( $tzstring, $allowed_zones) ) {
+	if (in_array($tzstring, $allowed_zones)) {
 		$found = false;
 		$date_time_zone_selected = new DateTimeZone($tzstring);
 		$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
 		$right_now = time();
-		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
-			if ( $tr['ts'] > $right_now ) {
+		foreach (timezone_transitions_get($date_time_zone_selected) as $tr) {
+			if ($tr['ts'] > $right_now) {
 			    $found = true;
 				break;
 			}
 		}
 
-		if ( $found ) {
+		if ($found) {
 			echo ' ';
 			$message = $tr['isdst'] ?
 				/* translators: %s: date and time  */
-				__( 'Daylight saving time begins on: %s.')  :
-				/* translators: %s: date and time  */
-				__( 'Standard time begins on: %s.' );
+				__('Daylight saving time begins on: %s.') : /* translators: %s: date and time  */
+				__('Standard time begins on: %s.');
 			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-			printf( $message,
-				'<code>' . date_i18n(
-					__( 'F j, Y' ) . ' ' . __( 'g:i a' ),
-					$tr['ts'] + ( $tz_offset - $tr['offset'] )
-				) . '</code>'
+			printf($message,
+				'<code>'.date_i18n(
+					__('F j, Y').' '.__('g:i a'),
+					$tr['ts'] + ($tz_offset - $tr['offset'])
+				).'</code>'
 			);
 		} else {
-			_e( 'This timezone does not observe daylight saving time.' );
+			_e('This timezone does not observe daylight saving time.');
 		}
 	}
 	// Set back to UTC.
@@ -282,25 +281,25 @@ 
 	*
 	* @param array $default_date_formats Array of default date formats.
 	*/
-	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
+	$date_formats = array_unique(apply_filters('date_formats', array(__('F j, Y'), 'Y-m-d', 'm/d/Y', 'd/m/Y')));
 
 	$custom = true;
 
-	foreach ( $date_formats as $format ) {
-		echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
+	foreach ($date_formats as $format) {
+		echo "\t<label><input type='radio' name='date_format' value='".esc_attr($format)."'";
+		if (get_option('date_format') === $format) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">'.date_i18n($format).'</span><code>'.esc_html($format)."</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
-	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></span></label>' .
-		'<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
-		'<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" />' .
-		'<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
+	checked($custom);
+	echo '/> <span class="date-time-text date-time-custom-text">'.__('Custom:').'<span class="screen-reader-text"> '.__('enter a custom date format in the following field').'</span></span></label>'.
+		'<label for="date_format_custom" class="screen-reader-text">'.__('Custom date format:').'</label>'.
+		'<input type="text" name="date_format_custom" id="date_format_custom" value="'.esc_attr(get_option('date_format')).'" class="small-text" />'.
+		'<span class="screen-reader-text">'.__('example:').' </span> <span class="example">'.date_i18n(get_option('date_format')).'</span>'.
 		"<span class='spinner'></span>\n";
 ?>
 	</fieldset>
@@ -318,28 +317,28 @@ 
 	*
 	* @param array $default_time_formats Array of default time formats.
 	*/
-	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
+	$time_formats = array_unique(apply_filters('time_formats', array(__('g:i a'), 'g:i A', 'H:i')));
 
 	$custom = true;
 
-	foreach ( $time_formats as $format ) {
-		echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
+	foreach ($time_formats as $format) {
+		echo "\t<label><input type='radio' name='time_format' value='".esc_attr($format)."'";
+		if (get_option('time_format') === $format) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">'.date_i18n($format).'</span><code>'.esc_html($format)."</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
-	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></span></label>' .
-		'<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
-		'<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" />' .
-		'<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
+	checked($custom);
+	echo '/> <span class="date-time-text date-time-custom-text">'.__('Custom:').'<span class="screen-reader-text"> '.__('enter a custom time format in the following field').'</span></span></label>'.
+		'<label for="time_format_custom" class="screen-reader-text">'.__('Custom time format:').'</label>'.
+		'<input type="text" name="time_format_custom" id="time_format_custom" value="'.esc_attr(get_option('time_format')).'" class="small-text" />'.
+		'<span class="screen-reader-text">'.__('example:').' </span> <span class="example">'.date_i18n(get_option('time_format')).'</span>'.
 		"<span class='spinner'></span>\n";
 
-	echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+	echo "\t<p class='date-time-doc'>".__('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.')."</p>\n";
 ?>
 	</fieldset>
 </td>
@@ -355,7 +354,7 @@ 
 
 for ($day_index = 0; $day_index <= 6; $day_index++) :
 	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+	echo "\n\t<option value='".esc_attr($day_index)."' $selected>".$wp_locale->get_weekday($day_index).'</option>';
 endfor;
 ?>
 </select></td>
@@ -370,4 +369,4 @@ 
 
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +26 added lines, -16 removed lines

@@ -12,8 +12,9 @@ 
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';
@@ -68,13 +69,19 @@ 
 <?php if ( !is_multisite() ) { ?>
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) {
+	echo ' disabled' ?>" /></td>
 </tr>
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' );
+}
+?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) {
+	echo ' disabled' ?>" />
 <?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
+<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' );
+}
+?></p></td>
 <?php endif; ?>
 </tr>
 <tr>
@@ -173,18 +180,20 @@ 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if ( false !== strpos($tzstring,'Etc/GMT') ) {
 	$tzstring = '';
+}
 
 if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
-		$tzstring = 'UTC+0';
-	elseif ($current_offset < 0)
-		$tzstring = 'UTC' . $current_offset;
-	else
-		$tzstring = 'UTC+' . $current_offset;
-}
+	if ( 0 == $current_offset ) {
+			$tzstring = 'UTC+0';
+	} elseif ($current_offset < 0) {
+			$tzstring = 'UTC' . $current_offset;
+	} else {
+			$tzstring = 'UTC+' . $current_offset;
+	}
+	}
 
 ?>
 <th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
@@ -221,10 +230,11 @@ 
 	// Set TZ so localtime works.
 	date_default_timezone_set($tzstring);
 	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
-		_e('This timezone is currently in daylight saving time.');
-	else
-		_e('This timezone is currently in standard time.');
+	if ( $now['tm_isdst'] ) {
+			_e('This timezone is currently in daylight saving time.');
+	} else {
+			_e('This timezone is currently in standard time.');
+	}
 	?>
 	<br />
 	<?php

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

Braces +60 added lines, -37 removed lines

@@ -99,8 +99,9 @@ 
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
-		if ( ! $theme_info->parent() )
-			return $install_result;
+		if ( ! $theme_info->parent() ) {
+					return $install_result;
+		}
 
 		$this->skin->feedback( 'parent_theme_search' );
 
@@ -140,8 +141,9 @@ 
 			'clear_working' => true
 		) );
 
-		if ( is_wp_error($parent_result) )
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		if ( is_wp_error($parent_result) ) {
+					add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		}
 
 		// Start cleaning up after the parents installation
 		remove_filter('install_theme_complete_actions', '__return_false', 999);
@@ -219,8 +221,9 @@ 
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Refresh the Theme Update information
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
@@ -289,8 +292,9 @@ 
 		remove_filter('upgrader_post_install', array($this, 'current_after'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
 
@@ -348,10 +352,12 @@ 
 		// - a theme with an update available is currently in use.
 		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		$maintenance = ( is_multisite() && ! empty( $themes ) );
-		foreach ( $themes as $theme )
-			$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		foreach ( $themes as $theme ) {
+					$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
+		}
+		if ( $maintenance ) {
+					$this->maintenance_mode(true);
+		}
 
 		$results = array();
 
@@ -388,8 +394,9 @@ 
 			$results[$theme] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
-				break;
+			if ( false === $result ) {
+							break;
+			}
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
@@ -436,13 +443,16 @@ 
 	public function check_package( $source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
-			return $source;
+		if ( is_wp_error($source) ) {
+					return $source;
+		}
 
 		// Check the folder contains a valid theme
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		if ( ! is_dir($working_directory) ) {
+			// Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// A proper archive should have a style.css file in the single subdirectory
 		if ( ! file_exists( $working_directory . 'style.css' ) ) {
@@ -492,16 +502,20 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_before($return, $theme) {
-		if ( is_wp_error($return) )
-			return $return;
+		if ( is_wp_error($return) ) {
+					return $return;
+		}
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) //If not current
+		if ( $theme != get_stylesheet() ) {
+			//If not current
 			return $return;
+		}
 		//Change to maintenance mode now.
-		if ( ! $this->bulk )
-			$this->maintenance_mode(true);
+		if ( ! $this->bulk ) {
+					$this->maintenance_mode(true);
+		}
 
 		return $return;
 	}
@@ -520,13 +534,16 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_after($return, $theme) {
-		if ( is_wp_error($return) )
-			return $return;
+		if ( is_wp_error($return) ) {
+					return $return;
+		}
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) // If not current
+		if ( $theme != get_stylesheet() ) {
+			// If not current
 			return $return;
+		}
 
 		// Ensure stylesheet name hasn't changed after the upgrade:
 		if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
@@ -536,8 +553,9 @@ 
 		}
 
 		//Time to remove maintenance mode
-		if ( ! $this->bulk )
-			$this->maintenance_mode(false);
+		if ( ! $this->bulk ) {
+					$this->maintenance_mode(false);
+		}
 		return $return;
 	}
 
@@ -561,17 +579,21 @@ 
 	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) )
-			return $removed; // Pass errors through.
+		if ( is_wp_error( $removed ) ) {
+					return $removed;
+		}
+		// Pass errors through.
 
-		if ( ! isset( $theme['theme'] ) )
-			return $removed;
+		if ( ! isset( $theme['theme'] ) ) {
+					return $removed;
+		}
 
 		$theme = $theme['theme'];
 		$themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
 		if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
-			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
-				return false;
+			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -592,10 +614,11 @@ 
 	public function theme_info($theme = null) {
 
 		if ( empty($theme) ) {
-			if ( !empty($this->result['destination_name']) )
-				$theme = $this->result['destination_name'];
-			else
-				return false;
+			if ( !empty($this->result['destination_name']) ) {
+							$theme = $this->result['destination_name'];
+			} else {
+							return false;
+			}
 		}
 		return wp_get_theme( $theme );
 	}

Spacing +90 added lines, -90 removed lines

@@ -95,28 +95,28 @@ 
 	 * @param array $child_result
 	 * @return type
 	 */
-	public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) {
+	public function check_parent_theme_filter($install_result, $hook_extra, $child_result) {
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
-		if ( ! $theme_info->parent() )
+		if ( ! $theme_info->parent())
 			return $install_result;
 
-		$this->skin->feedback( 'parent_theme_search' );
+		$this->skin->feedback('parent_theme_search');
 
-		if ( ! $theme_info->parent()->errors() ) {
-			$this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') );
+		if ( ! $theme_info->parent()->errors()) {
+			$this->skin->feedback('parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version'));
 			// We already have the theme, fall through.
 			return $install_result;
 		}
 
 		// We don't have the parent theme, let's install it.
-		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false))); //Save on a bit of bandwidth.
 
-		if ( ! $api || is_wp_error($api) ) {
-			$this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
+		if ( ! $api || is_wp_error($api)) {
+			$this->skin->feedback('parent_theme_not_found', $theme_info->get('Template'));
 			// Don't show activate or preview actions after install
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions'));
 			return $install_result;
 		}
 
@@ -126,22 +126,22 @@ 
 
 		// Override them
 		$this->skin->api = $api;
-		$this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version);
+		$this->strings['process_success_specific'] = $this->strings['parent_theme_install_success']; //, $api->name, $api->version);
 
 		$this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
 
 		add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
 
 		// Install the parent theme
-		$parent_result = $this->run( array(
+		$parent_result = $this->run(array(
 			'package' => $api->download_link,
 			'destination' => get_theme_root(),
 			'clear_destination' => false, //Do not overwrite files.
 			'clear_working' => true
-		) );
+		));
 
-		if ( is_wp_error($parent_result) )
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		if (is_wp_error($parent_result))
+			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions'));
 
 		// Start cleaning up after the parents installation
 		remove_filter('install_theme_complete_actions', '__return_false', 999);
@@ -167,7 +167,7 @@ 
 	 * @param array $actions Preview actions.
 	 * @return array
 	 */
-	public function hide_activate_preview_actions( $actions ) {
+	public function hide_activate_preview_actions($actions) {
 		unset($actions['activate'], $actions['preview']);
 		return $actions;
 	}
@@ -189,24 +189,24 @@ 
 	 *
 	 * @return bool|WP_Error True if the install was successful, false or a WP_Error object otherwise.
 	 */
-	public function install( $package, $args = array() ) {
+	public function install($package, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
 		add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_themes() knows about the new theme.
-			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_themes_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $package,
 			'destination' => get_theme_root(),
 			'clear_destination' => false, //Do not overwrite files.
@@ -215,17 +215,17 @@ 
 				'type' => 'theme',
 				'action' => 'install',
 			),
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
+		remove_action('upgrader_process_complete', 'wp_clean_themes_cache', 9);
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Refresh the Theme Update information
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -246,39 +246,39 @@ 
 	 * }
 	 * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
 	 */
-	public function upgrade( $theme, $args = array() ) {
+	public function upgrade($theme, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
 		// Is an update available?
-		$current = get_site_transient( 'update_themes' );
-		if ( !isset( $current->response[ $theme ] ) ) {
+		$current = get_site_transient('update_themes');
+		if ( ! isset($current->response[$theme])) {
 			$this->skin->before();
 			$this->skin->set_result(false);
-			$this->skin->error( 'up_to_date' );
+			$this->skin->error('up_to_date');
 			$this->skin->after();
 			return false;
 		}
 
-		$r = $current->response[ $theme ];
+		$r = $current->response[$theme];
 
 		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
 		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_themes() knows about the new theme.
-			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_themes_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $r['package'],
-			'destination' => get_theme_root( $theme ),
+			'destination' => get_theme_root($theme),
 			'clear_destination' => true,
 			'clear_working' => true,
 			'hook_extra' => array(
@@ -286,17 +286,17 @@ 
 				'type' => 'theme',
 				'action' => 'update',
 			),
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
+		remove_action('upgrader_process_complete', 'wp_clean_themes_cache', 9);
 		remove_filter('upgrader_pre_install', array($this, 'current_before'));
 		remove_filter('upgrader_post_install', array($this, 'current_after'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -317,18 +317,18 @@ 
 	 * }
 	 * @return array[]|false An array of results, or false if unable to connect to the filesystem.
 	 */
-	public function bulk_upgrade( $themes, $args = array() ) {
+	public function bulk_upgrade($themes, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->bulk = true;
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_themes' );
+		$current = get_site_transient('update_themes');
 
 		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
 		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
@@ -337,8 +337,8 @@ 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR));
+		if ( ! $res) {
 			$this->skin->footer();
 			return false;
 		}
@@ -349,63 +349,63 @@ 
 		// - running Multisite and there are one or more themes specified, OR
 		// - a theme with an update available is currently in use.
 		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
-		$maintenance = ( is_multisite() && ! empty( $themes ) );
-		foreach ( $themes as $theme )
+		$maintenance = (is_multisite() && ! empty($themes));
+		foreach ($themes as $theme)
 			$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-		if ( $maintenance )
+		if ($maintenance)
 			$this->maintenance_mode(true);
 
 		$results = array();
 
 		$this->update_count = count($themes);
 		$this->update_current = 0;
-		foreach ( $themes as $theme ) {
+		foreach ($themes as $theme) {
 			$this->update_current++;
 
 			$this->skin->theme_info = $this->theme_info($theme);
 
-			if ( !isset( $current->response[ $theme ] ) ) {
+			if ( ! isset($current->response[$theme])) {
 				$this->skin->set_result(true);
 				$this->skin->before();
-				$this->skin->feedback( 'up_to_date' );
+				$this->skin->feedback('up_to_date');
 				$this->skin->after();
 				$results[$theme] = true;
 				continue;
 			}
 
 			// Get the URL to the zip file
-			$r = $current->response[ $theme ];
+			$r = $current->response[$theme];
 
-			$result = $this->run( array(
+			$result = $this->run(array(
 				'package' => $r['package'],
-				'destination' => get_theme_root( $theme ),
+				'destination' => get_theme_root($theme),
 				'clear_destination' => true,
 				'clear_working' => true,
 				'is_multi' => true,
 				'hook_extra' => array(
 					'theme' => $theme
 				),
-			) );
+			));
 
 			$results[$theme] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if (false === $result)
 				break;
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
 
 		// Refresh the Theme Update information
-		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_themes_cache($parsed_args['clear_update_cache']);
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
+		do_action('upgrader_process_complete', $this, array(
 			'action' => 'update',
 			'type' => 'theme',
 			'bulk' => true,
 			'themes' => $themes,
-		) );
+		));
 
 		$this->skin->bulk_footer();
 
@@ -434,43 +434,43 @@ 
 	 * @param string $source The full path to the package source.
 	 * @return string|WP_Error The source or a WP_Error.
 	 */
-	public function check_package( $source ) {
+	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if (is_wp_error($source))
 			return $source;
 
 		// Check the folder contains a valid theme
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+		if ( ! is_dir($working_directory)) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// A proper archive should have a style.css file in the single subdirectory
-		if ( ! file_exists( $working_directory . 'style.css' ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
+		if ( ! file_exists($working_directory.'style.css')) {
+			return new WP_Error('incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
-				sprintf( __( 'The theme is missing the %s stylesheet.' ),
+				sprintf(__('The theme is missing the %s stylesheet.'),
 					'<code>style.css</code>'
 				)
 			);
 		}
 
-		$info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
+		$info = get_file_data($working_directory.'style.css', array('Name' => 'Theme Name', 'Template' => 'Template'));
 
-		if ( empty( $info['Name'] ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
+		if (empty($info['Name'])) {
+			return new WP_Error('incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
-				sprintf( __( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
+				sprintf(__('The %s stylesheet doesn&#8217;t contain a valid theme header.'),
 					'<code>style.css</code>'
 				)
 			);
 		}
 
 		// If it's not a child theme, it must have at least an index.php to be legit.
-		if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
+		if (empty($info['Template']) && ! file_exists($working_directory.'index.php')) {
+			return new WP_Error('incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
 				/* translators: %s: index.php */
-				sprintf( __( 'The theme is missing the %s file.' ),
+				sprintf(__('The theme is missing the %s file.'),
 					'<code>index.php</code>'
 				)
 			);
@@ -493,15 +493,15 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_before($return, $theme) {
-		if ( is_wp_error($return) )
+		if (is_wp_error($return))
 			return $return;
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) //If not current
+		if ($theme != get_stylesheet()) //If not current
 			return $return;
 		//Change to maintenance mode now.
-		if ( ! $this->bulk )
+		if ( ! $this->bulk)
 			$this->maintenance_mode(true);
 
 		return $return;
@@ -521,23 +521,23 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function current_after($return, $theme) {
-		if ( is_wp_error($return) )
+		if (is_wp_error($return))
 			return $return;
 
 		$theme = isset($theme['theme']) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) // If not current
+		if ($theme != get_stylesheet()) // If not current
 			return $return;
 
 		// Ensure stylesheet name hasn't changed after the upgrade:
-		if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
+		if ($theme == get_stylesheet() && $theme != $this->result['destination_name']) {
 			wp_clean_themes_cache();
 			$stylesheet = $this->result['destination_name'];
-			switch_theme( $stylesheet );
+			switch_theme($stylesheet);
 		}
 
 		//Time to remove maintenance mode
-		if ( ! $this->bulk )
+		if ( ! $this->bulk)
 			$this->maintenance_mode(false);
 		return $return;
 	}
@@ -559,19 +559,19 @@ 
 	 * @param array  $theme
 	 * @return bool
 	 */
-	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
+	public function delete_old_theme($removed, $local_destination, $remote_destination, $theme) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) )
+		if (is_wp_error($removed))
 			return $removed; // Pass errors through.
 
-		if ( ! isset( $theme['theme'] ) )
+		if ( ! isset($theme['theme']))
 			return $removed;
 
 		$theme = $theme['theme'];
-		$themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
-		if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
-			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
+		$themes_dir = trailingslashit($wp_filesystem->wp_themes_dir($theme));
+		if ($wp_filesystem->exists($themes_dir.$theme)) {
+			if ( ! $wp_filesystem->delete($themes_dir.$theme, true))
 				return false;
 		}
 
@@ -592,13 +592,13 @@ 
 	 */
 	public function theme_info($theme = null) {
 
-		if ( empty($theme) ) {
-			if ( !empty($this->result['destination_name']) )
+		if (empty($theme)) {
+			if ( ! empty($this->result['destination_name']))
 				$theme = $this->result['destination_name'];
 			else
 				return false;
 		}
-		return wp_get_theme( $theme );
+		return wp_get_theme($theme);
 	}
 
 }

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

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param string $title
 	 */
 	public function before($title = '') {
-		parent::before( $this->theme_info->display('Name') );
+		parent::before($this->theme_info->display('Name'));
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 * @param string $title
 	 */
 	public function after($title = '') {
-		parent::after( $this->theme_info->display('Name') );
-		$this->decrement_update_count( 'theme' );
+		parent::after($this->theme_info->display('Name'));
+		$this->decrement_update_count('theme');
 	}
 
 	/**
@@ -43,12 +43,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'themes_page' => '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can('switch_themes') && ! current_user_can('edit_theme_options'))
+			unset($update_actions['themes_page']);
 
 		/**
 		 * Filters the list of action links available following bulk theme updates.
@@ -58,9 +58,9 @@ 
 		 * @param array $update_actions Array of theme action links.
 		 * @param array $theme_info     Array of information for the last-updated theme.
 		 */
-		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
+		$update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
+					unset( $update_actions['themes_page'] );
+		}
 
 		/**
 		 * Filters the list of action links available following bulk theme updates.
@@ -60,7 +61,8 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }

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

Braces +28 added lines, -20 removed lines

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

Spacing +82 added lines, -82 removed lines

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

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

Spacing +21 added lines, -21 removed lines

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

Braces +6 added lines, -4 removed lines

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

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

Indentation +2 added lines, -2 removed lines

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

Spacing +230 added lines, -230 removed lines

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

Braces +73 added lines, -52 removed lines

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

Doc Comments +1 added lines, -1 removed lines

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

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

Spacing +14 added lines, -14 removed lines

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

Braces +3 added lines, -2 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

Braces +6 added lines, -4 removed lines

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