ntwb / wordpress

src/wp-admin/admin-footer.php

Indentation +6 added lines, -6 removed lines

@@ -58,12 +58,12 @@
 </div>
 <?php
 /**
- * Print scripts or data before the default footer scripts.
- *
- * @since 1.2.0
- *
- * @param string $data The data to print.
- */
+		 * Print scripts or data before the default footer scripts.
+		 *
+		 * @since 1.2.0
+		 *
+		 * @param string $data The data to print.
+		 */
 do_action( 'admin_footer', '' );
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 ?>
 
@@ -22,11 +22,11 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'in_admin_footer' );
+	do_action('in_admin_footer');
 	?>
 	<p id="footer-left" class="alignleft">
 		<?php
-		$text = sprintf( __( 'Thank you for creating with <a href="%s">WordPress</a>.' ), __( 'https://wordpress.org/' ) );
+		$text = sprintf(__('Thank you for creating with <a href="%s">WordPress</a>.'), __('https://wordpress.org/'));
 		/**
 		 * Filter the "Thank you" text displayed in the admin footer.
 		 *
@@ -34,7 +34,7 @@ 
 		 *
 		 * @param string $text The content that will be printed.
 		 */
-		echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . $text . '</span>' );
+		echo apply_filters('admin_footer_text', '<span id="footer-thankyou">'.$text.'</span>');
 		?>
 	</p>
 	<p id="footer-upgrade" class="alignright">
@@ -51,7 +51,7 @@ 
 		 *
 		 * @param string $content The content that will be printed.
 		 */
-		echo apply_filters( 'update_footer', '' );
+		echo apply_filters('update_footer', '');
 		?>
 	</p>
 	<div class="clear"></div>
@@ -64,14 +64,14 @@ 
  *
  * @param string $data The data to print.
  */
-do_action( 'admin_footer', '' );
+do_action('admin_footer', '');
 
 /**
  * Prints any scripts and data queued for the footer.
  *
  * @since 2.8.0
  */
-do_action( 'admin_print_footer_scripts' );
+do_action('admin_print_footer_scripts');
 
 /**
  * Print scripts or data after the default footer scripts.
@@ -84,11 +84,11 @@ 
  * @global string $hook_suffix
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );
+do_action("admin_footer-".$GLOBALS['hook_suffix']);
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
+if (function_exists('get_site_option')) {
+	if (false === get_site_option('can_compress_scripts'))
 		compression_test();
 }
 

Braces +6 added lines, -4 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 ?>
 
 <div class="clear"></div></div><!-- wpbody-content -->
@@ -88,9 +89,10 @@ 
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
-		compression_test();
-}
+	if ( false === get_site_option('can_compress_scripts') ) {
+			compression_test();
+	}
+	}
 
 ?>
 

src/wp-admin/custom-background.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * The custom background script.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * The custom background script.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * The custom background class.

Spacing +113 added lines, -113 removed lines

@@ -47,12 +47,12 @@ 
 		$this->admin_header_callback = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
-		add_action( 'admin_menu', array( $this, 'init' ) );
+		add_action('admin_menu', array($this, 'init'));
 
-		add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
+		add_action('wp_ajax_custom-background-add', array($this, 'ajax_background_add'));
 
 		// Unused since 3.5.0.
-		add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
+		add_action('wp_ajax_set-background-image', array($this, 'wp_set_background_image'));
 	}
 
 	/**
@@ -61,17 +61,17 @@ 
 	 * @since 3.0.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
-		if ( ! $page ) {
+		$page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
+		if ( ! $page) {
 			return;
 		}
 
-		add_action( "load-$page", array( $this, 'admin_load' ) );
-		add_action( "load-$page", array( $this, 'take_action' ), 49 );
-		add_action( "load-$page", array( $this, 'handle_upload' ), 49 );
+		add_action("load-$page", array($this, 'admin_load'));
+		add_action("load-$page", array($this, 'take_action'), 49);
+		add_action("load-$page", array($this, 'handle_upload'), 49);
 
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+		if ($this->admin_header_callback) {
+			add_action("admin_head-$page", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -81,20 +81,20 @@ 
 	 * @since 3.0.0
 	 */
 	public function admin_load() {
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'overview',
 			'title'   => __('Overview'),
 			'content' =>
-				'<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
-				'<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
-				'<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-				'<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
-		) );
+				'<p>'.__('You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.').'</p>'.
+				'<p>'.__('To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.').'</p>'.
+				'<p>'.__('You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.').'</p>'.
+				'<p>'.__('Don&#8217;t forget to click on the Save Changes button when you are finished.').'</p>'
+		));
 
 		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 		);
 
 		wp_enqueue_media();
@@ -108,10 +108,10 @@ 
 	 * @since 3.0.0
 	 */
 	public function take_action() {
-		if ( empty($_POST) )
+		if (empty($_POST))
 			return;
 
-		if ( isset($_POST['reset-background']) ) {
+		if (isset($_POST['reset-background'])) {
 			check_admin_referer('custom-background-reset', '_wpnonce-custom-background-reset');
 			remove_theme_mod('background_image');
 			remove_theme_mod('background_image_thumb');
@@ -119,47 +119,47 @@ 
 			return;
 		}
 
-		if ( isset($_POST['remove-background']) ) {
+		if (isset($_POST['remove-background'])) {
 			// @TODO: Uploaded files are not removed here.
 			check_admin_referer('custom-background-remove', '_wpnonce-custom-background-remove');
 			set_theme_mod('background_image', '');
 			set_theme_mod('background_image_thumb', '');
 			$this->updated = true;
-			wp_safe_redirect( $_POST['_wp_http_referer'] );
+			wp_safe_redirect($_POST['_wp_http_referer']);
 			return;
 		}
 
-		if ( isset($_POST['background-repeat']) ) {
+		if (isset($_POST['background-repeat'])) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')) )
+			if (in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')))
 				$repeat = $_POST['background-repeat'];
 			else
 				$repeat = 'repeat';
 			set_theme_mod('background_repeat', $repeat);
 		}
 
-		if ( isset($_POST['background-position-x']) ) {
+		if (isset($_POST['background-position-x'])) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-position-x'], array('center', 'right', 'left')) )
+			if (in_array($_POST['background-position-x'], array('center', 'right', 'left')))
 				$position = $_POST['background-position-x'];
 			else
 				$position = 'left';
 			set_theme_mod('background_position_x', $position);
 		}
 
-		if ( isset($_POST['background-attachment']) ) {
+		if (isset($_POST['background-attachment'])) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) )
+			if (in_array($_POST['background-attachment'], array('fixed', 'scroll')))
 				$attachment = $_POST['background-attachment'];
 			else
 				$attachment = 'fixed';
 			set_theme_mod('background_attachment', $attachment);
 		}
 
-		if ( isset($_POST['background-color']) ) {
+		if (isset($_POST['background-color'])) {
 			check_admin_referer('custom-background');
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
+			if (strlen($color) == 6 || strlen($color) == 3)
 				set_theme_mod('background_color', $color);
 			else
 				set_theme_mod('background_color', '');
@@ -176,54 +176,54 @@ 
 	public function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
-<h1><?php _e( 'Custom Background' ); ?></h1>
+<h1><?php _e('Custom Background'); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 		<?php
 		printf(
-			__( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=background_image' )
+			__('You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.'),
+			admin_url('customize.php?autofocus[control]=background_image')
 		);
 		?>
 	</p>
 </div>
 <?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+<?php if ( ! empty($this->updated)) { ?>
 <div id="message" class="updated">
-<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+<p><?php printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/')); ?></p>
 </div>
 <?php } ?>
 
-<h3><?php _e( 'Background Image' ); ?></h3>
+<h3><?php _e('Background Image'); ?></h3>
 
 <table class="form-table">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
+	if ($this->admin_image_div_callback) {
+		call_user_func($this->admin_image_div_callback);
 	} else {
 		$background_styles = '';
-		if ( $bgcolor = get_background_color() )
-			$background_styles .= 'background-color: #' . $bgcolor . ';';
+		if ($bgcolor = get_background_color())
+			$background_styles .= 'background-color: #'.$bgcolor.';';
 
 		$background_image_thumb = get_background_image();
-		if ( $background_image_thumb ) {
-			$background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
+		if ($background_image_thumb) {
+			$background_image_thumb = esc_url(set_url_scheme(get_theme_mod('background_image_thumb', str_replace('%', '%%', $background_image_thumb))));
 
 			// Background-image URL must be single quote, see below.
-			$background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
-				. ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
-				. ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+			$background_styles .= ' background-image: url(\''.$background_image_thumb.'\');'
+				. ' background-repeat: '.get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat')).';'
+				. ' background-position: top '.get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'));
 		}
 	?>
 	<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
-		<?php if ( $background_image_thumb ) { ?>
+		<?php if ($background_image_thumb) { ?>
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
 		<?php } ?>
@@ -232,49 +232,49 @@ 
 </td>
 </tr>
 
-<?php if ( get_background_image() ) : ?>
+<?php if (get_background_image()) : ?>
 <tr>
 <th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
 <form method="post">
 <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
-<?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
+<?php submit_button(__('Remove Background Image'), 'button', 'remove-background', false); ?><br/>
 <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
 </form>
 </td>
 </tr>
 <?php endif; ?>
 
-<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
-<?php if ( $default_image && get_background_image() != $default_image ) : ?>
+<?php $default_image = get_theme_support('custom-background', 'default-image'); ?>
+<?php if ($default_image && get_background_image() != $default_image) : ?>
 <tr>
 <th scope="row"><?php _e('Restore Original Image'); ?></th>
 <td>
 <form method="post">
 <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
-<?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
+<?php submit_button(__('Restore Original Image'), 'button', 'reset-background', false); ?><br/>
 <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
 </form>
 </td>
 </tr>
 <?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) ): ?>
+<?php if (current_user_can('upload_files')): ?>
 <tr>
 <th scope="row"><?php _e('Select Image'); ?></th>
 <td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
 	<p>
-		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+		<?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload'); ?>
+		<?php submit_button(__('Upload'), 'button', 'submit', false); ?>
 	</p>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-choose="<?php esc_attr_e('Choose a Background Image'); ?>"
+			data-update="<?php esc_attr_e('Set as background'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -287,65 +287,65 @@ 
 <form method="post">
 <table class="form-table">
 <tbody>
-<?php if ( get_background_image() ) : ?>
+<?php if (get_background_image()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
+<th scope="row"><?php _e('Position'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Background Position'); ?></span></legend>
 <label>
-<input name="background-position-x" type="radio" value="left"<?php checked( 'left', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ) ); ?> />
+<input name="background-position-x" type="radio" value="left"<?php checked('left', get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'))); ?> />
 <?php _e('Left') ?>
 </label>
 <label>
-<input name="background-position-x" type="radio" value="center"<?php checked( 'center', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ) ); ?> />
+<input name="background-position-x" type="radio" value="center"<?php checked('center', get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'))); ?> />
 <?php _e('Center') ?>
 </label>
 <label>
-<input name="background-position-x" type="radio" value="right"<?php checked( 'right', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ) ); ?> />
+<input name="background-position-x" type="radio" value="right"<?php checked('right', get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'))); ?> />
 <?php _e('Right') ?>
 </label>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><?php _e( 'Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
-<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked( 'no-repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?> /> <?php _e('No Repeat'); ?></label>
-	<label><input type="radio" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?> /> <?php _e('Tile'); ?></label>
-	<label><input type="radio" name="background-repeat" value="repeat-x"<?php checked( 'repeat-x', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?> /> <?php _e('Tile Horizontally'); ?></label>
-	<label><input type="radio" name="background-repeat" value="repeat-y"<?php checked( 'repeat-y', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?> /> <?php _e('Tile Vertically'); ?></label>
+<th scope="row"><?php _e('Repeat'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Background Repeat'); ?></span></legend>
+<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'))); ?> /> <?php _e('No Repeat'); ?></label>
+	<label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'))); ?> /> <?php _e('Tile'); ?></label>
+	<label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'))); ?> /> <?php _e('Tile Horizontally'); ?></label>
+	<label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'))); ?> /> <?php _e('Tile Vertically'); ?></label>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><?php _ex( 'Attachment', 'Background Attachment' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
+<th scope="row"><?php _ex('Attachment', 'Background Attachment'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Background Attachment'); ?></span></legend>
 <label>
-<input name="background-attachment" type="radio" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?> />
-<?php _e( 'Scroll' ); ?>
+<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'))); ?> />
+<?php _e('Scroll'); ?>
 </label>
 <label>
-<input name="background-attachment" type="radio" value="fixed" <?php checked( 'fixed', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?> />
-<?php _e( 'Fixed' ); ?>
+<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'))); ?> />
+<?php _e('Fixed'); ?>
 </label>
 </fieldset></td>
 </tr>
 <?php endif; // get_background_image() ?>
 <tr>
-<th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<th scope="row"><?php _e('Background Color'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Background Color'); ?></span></legend>
 <?php
 $default_color = '';
-if ( current_theme_supports( 'custom-background', 'default-color' ) )
-	$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+if (current_theme_supports('custom-background', 'default-color'))
+	$default_color = ' data-default-color="#'.esc_attr(get_theme_support('custom-background', 'default-color')).'"';
 ?>
-<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color ?> />
+<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr(get_background_color()); ?>"<?php echo $default_color ?> />
 </fieldset></td>
 </tr>
 </tbody>
 </table>
 
 <?php wp_nonce_field('custom-background'); ?>
-<?php submit_button( null, 'primary', 'save-background-options' ); ?>
+<?php submit_button(null, 'primary', 'save-background-options'); ?>
 </form>
 
 </div>
@@ -358,21 +358,21 @@ 
 	 * @since 3.0.0
 	 */
 	public function handle_upload() {
-		if ( empty($_FILES) )
+		if (empty($_FILES))
 			return;
 
 		check_admin_referer('custom-background-upload', '_wpnonce-custom-background-upload');
 		$overrides = array('test_form' => false);
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		$wp_filetype = wp_check_filetype_and_ext($uploaded_file['tmp_name'], $uploaded_file['name']);
+		if ( ! wp_match_mime_types('image', $wp_filetype['type']))
+			wp_die(__('The uploaded file is not a valid image. Please try again.'));
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'] );
+		if (isset($file['error']))
+			wp_die($file['error']);
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -392,16 +392,16 @@ 
 		$id = wp_insert_attachment($object, $file);
 
 		// Add the meta-data
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-		update_post_meta( $id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $file));
+		update_post_meta($id, '_wp_attachment_is_custom_background', get_option('stylesheet'));
 
 		set_theme_mod('background_image', esc_url_raw($url));
 
-		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
-		set_theme_mod('background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+		$thumbnail = wp_get_attachment_image_src($id, 'thumbnail');
+		set_theme_mod('background_image_thumb', esc_url_raw($thumbnail[0]));
 
 		/** This action is documented in wp-admin/custom-header.php */
-		do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
+		do_action('wp_create_file_in_uploads', $file, $id); // For replication
 		$this->updated = true;
 	}
 
@@ -414,18 +414,18 @@ 
 	 * @since 4.1.0
 	 */
 	public function ajax_background_add() {
-		check_ajax_referer( 'background-add', 'nonce' );
+		check_ajax_referer('background-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_background', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -438,7 +438,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -450,7 +450,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -460,19 +460,19 @@ 
 	 * @deprecated 3.5.0
 	 */
 	public function wp_set_background_image() {
-		if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
+		if ( ! current_user_can('edit_theme_options') || ! isset($_POST['attachment_id'])) exit;
 		$attachment_id = absint($_POST['attachment_id']);
 		/** This filter is documented in wp-admin/includes/media.php */
-		$sizes = array_keys(apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) ));
+		$sizes = array_keys(apply_filters('image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size'))));
 		$size = 'thumbnail';
-		if ( in_array( $_POST['size'], $sizes ) )
-			$size = esc_attr( $_POST['size'] );
-
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
-		$url = wp_get_attachment_image_src( $attachment_id, $size );
-		$thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
-		set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
-		set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+		if (in_array($_POST['size'], $sizes))
+			$size = esc_attr($_POST['size']);
+
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet'));
+		$url = wp_get_attachment_image_src($attachment_id, $size);
+		$thumbnail = wp_get_attachment_image_src($attachment_id, 'thumbnail');
+		set_theme_mod('background_image', esc_url_raw($url[0]));
+		set_theme_mod('background_image_thumb', esc_url_raw($thumbnail[0]));
 		exit;
 	}
 }

Braces +43 added lines, -30 removed lines

@@ -108,8 +108,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function take_action() {
-		if ( empty($_POST) )
-			return;
+		if ( empty($_POST) ) {
+					return;
+		}
 
 		if ( isset($_POST['reset-background']) ) {
 			check_admin_referer('custom-background-reset', '_wpnonce-custom-background-reset');
@@ -131,38 +132,42 @@ 
 
 		if ( isset($_POST['background-repeat']) ) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')) )
-				$repeat = $_POST['background-repeat'];
-			else
-				$repeat = 'repeat';
+			if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')) ) {
+							$repeat = $_POST['background-repeat'];
+			} else {
+							$repeat = 'repeat';
+			}
 			set_theme_mod('background_repeat', $repeat);
 		}
 
 		if ( isset($_POST['background-position-x']) ) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-position-x'], array('center', 'right', 'left')) )
-				$position = $_POST['background-position-x'];
-			else
-				$position = 'left';
+			if ( in_array($_POST['background-position-x'], array('center', 'right', 'left')) ) {
+							$position = $_POST['background-position-x'];
+			} else {
+							$position = 'left';
+			}
 			set_theme_mod('background_position_x', $position);
 		}
 
 		if ( isset($_POST['background-attachment']) ) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) )
-				$attachment = $_POST['background-attachment'];
-			else
-				$attachment = 'fixed';
+			if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) ) {
+							$attachment = $_POST['background-attachment'];
+			} else {
+							$attachment = 'fixed';
+			}
 			set_theme_mod('background_attachment', $attachment);
 		}
 
 		if ( isset($_POST['background-color']) ) {
 			check_admin_referer('custom-background');
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('background_color', $color);
-			else
-				set_theme_mod('background_color', '');
+			if ( strlen($color) == 6 || strlen($color) == 3 ) {
+							set_theme_mod('background_color', $color);
+			} else {
+							set_theme_mod('background_color', '');
+			}
 		}
 
 		$this->updated = true;
@@ -209,8 +214,9 @@ 
 		call_user_func( $this->admin_image_div_callback );
 	} else {
 		$background_styles = '';
-		if ( $bgcolor = get_background_color() )
-			$background_styles .= 'background-color: #' . $bgcolor . ';';
+		if ( $bgcolor = get_background_color() ) {
+					$background_styles .= 'background-color: #' . $bgcolor . ';';
+		}
 
 		$background_image_thumb = get_background_image();
 		if ( $background_image_thumb ) {
@@ -335,8 +341,9 @@ 
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
 <?php
 $default_color = '';
-if ( current_theme_supports( 'custom-background', 'default-color' ) )
+if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
 	$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+}
 ?>
 <input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color ?> />
 </fieldset></td>
@@ -358,21 +365,24 @@ 
 	 * @since 3.0.0
 	 */
 	public function handle_upload() {
-		if ( empty($_FILES) )
-			return;
+		if ( empty($_FILES) ) {
+					return;
+		}
 
 		check_admin_referer('custom-background-upload', '_wpnonce-custom-background-upload');
 		$overrides = array('test_form' => false);
 
 		$uploaded_file = $_FILES['import'];
 		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+					wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'] );
+		if ( isset($file['error']) ) {
+					wp_die( $file['error'] );
+		}
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -460,13 +470,16 @@ 
 	 * @deprecated 3.5.0
 	 */
 	public function wp_set_background_image() {
-		if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
+		if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) {
+			exit;
+		}
 		$attachment_id = absint($_POST['attachment_id']);
 		/** This filter is documented in wp-admin/includes/media.php */
 		$sizes = array_keys(apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) ));
 		$size = 'thumbnail';
-		if ( in_array( $_POST['size'], $sizes ) )
-			$size = esc_attr( $_POST['size'] );
+		if ( in_array( $_POST['size'], $sizes ) ) {
+					$size = esc_attr( $_POST['size'] );
+		}
 
 		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
 		$url = wp_get_attachment_image_src( $attachment_id, $size );

src/wp-admin/upgrade.php

Braces +17 added lines, -12 removed lines

@@ -24,10 +24,11 @@ 
 
 delete_site_transient('update_core');
 
-if ( isset( $_GET['step'] ) )
+if ( isset( $_GET['step'] ) ) {
 	$step = $_GET['step'];
-else
+} else {
 	$step = 0;
+}
 
 // Do it. No output.
 if ( 'upgrade_db' === $step ) {
@@ -48,10 +49,11 @@ 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
 $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 	$mysql_compat = true;
-else
+} else {
 	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+}
 
 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 ?>
@@ -76,17 +78,20 @@ 
 <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
 <?php elseif ( !$php_compat || !$mysql_compat ) :
-	if ( !$mysql_compat && !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-	elseif ( !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-	elseif ( !$mysql_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
-?>
-<?php else :
+	if ( !$mysql_compat && !$php_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+	} elseif ( !$php_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
+	} elseif ( !$mysql_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+	}
+	?>
+<?php else {
+	:
 switch ( $step ) :
 	case 0:
 		$goback = wp_get_referer();
+}
 		if ( $goback ) {
 			$goback = esc_url_raw( $goback );
 			$goback = urlencode( $goback );

Spacing +42 added lines, -42 removed lines

@@ -12,27 +12,27 @@ 
  * @since 1.5.1
  * @var bool
  */
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Load WordPress Bootstrap */
-require( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require(dirname(dirname(__FILE__)).'/wp-load.php');
 
 nocache_headers();
 
 timer_start();
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 delete_site_transient('update_core');
 
-if ( isset( $_GET['step'] ) )
+if (isset($_GET['step']))
 	$step = $_GET['step'];
 else
 	$step = 0;
 
 // Do it. No output.
-if ( 'upgrade_db' === $step ) {
+if ('upgrade_db' === $step) {
 	wp_upgrade();
-	die( '0' );
+	die('0');
 }
 
 /**
@@ -47,74 +47,74 @@ 
 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+$php_compat     = version_compare($php_version, $required_php_version, '>=');
+if (file_exists(WP_CONTENT_DIR.'/db.php') && empty($wpdb->is_mysql))
 	$mysql_compat = true;
 else
-	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+	$mysql_compat = version_compare($mysql_version, $required_mysql_version, '>=');
 
-@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
-	<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Update' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Update'); ?></title>
 	<?php
-	wp_admin_css( 'install', true );
-	wp_admin_css( 'ie', true );
+	wp_admin_css('install', true);
+	wp_admin_css('ie', true);
 	?>
 </head>
 <body class="wp-core-ui">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 
-<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
+<?php if (get_option('db_version') == $wp_db_version || ! is_blog_installed()) : ?>
 
-<h1><?php _e( 'No Update Required' ); ?></h1>
-<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
-<p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
+<h1><?php _e('No Update Required'); ?></h1>
+<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
+<p class="step"><a class="button button-large" href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></p>
 
-<?php elseif ( !$php_compat || !$mysql_compat ) :
-	if ( !$mysql_compat && !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-	elseif ( !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-	elseif ( !$mysql_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+<?php elseif ( ! $php_compat || ! $mysql_compat) :
+	if ( ! $mysql_compat && ! $php_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version);
+	elseif ( ! $php_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version);
+	elseif ( ! $mysql_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version);
 ?>
 <?php else :
-switch ( $step ) :
+switch ($step) :
 	case 0:
 		$goback = wp_get_referer();
-		if ( $goback ) {
-			$goback = esc_url_raw( $goback );
-			$goback = urlencode( $goback );
+		if ($goback) {
+			$goback = esc_url_raw($goback);
+			$goback = urlencode($goback);
 		}
 ?>
-<h1><?php _e( 'Database Update Required' ); ?></h1>
-<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
-<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
-<p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
+<h1><?php _e('Database Update Required'); ?></h1>
+<p><?php _e('WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.'); ?></p>
+<p><?php _e('The database update process may take a little while, so please be patient.'); ?></p>
+<p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Update WordPress Database'); ?></a></p>
 <?php
 		break;
 	case 1:
 		wp_upgrade();
 
-			$backto = !empty($_GET['backto']) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
-			$backto = esc_url( $backto );
-			$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
+			$backto = ! empty($_GET['backto']) ? wp_unslash(urldecode($_GET['backto'])) : __get_option('home').'/';
+			$backto = esc_url($backto);
+			$backto = wp_validate_redirect($backto, __get_option('home').'/');
 ?>
-<h1><?php _e( 'Update Complete' ); ?></h1>
-	<p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
-	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
+<h1><?php _e('Update Complete'); ?></h1>
+	<p><?php _e('Your WordPress database has been successfully updated!'); ?></p>
+	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></p>
 
 <!--
 <pre>
-<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
+<?php printf(__('%s queries'), $wpdb->num_queries); ?>
 
-<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
+<?php printf(__('%s seconds'), timer_stop(0)); ?>
 </pre>
 -->
 

src/wp-admin/import.php

Braces +13 added lines, -8 removed lines

@@ -11,8 +11,9 @@ 
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('import') )
+if ( !current_user_can('import') ) {
 	wp_die(__('You do not have sufficient permissions to import content in this site.'));
+}
 
 $title = __('Import');
 
@@ -29,10 +30,11 @@ 
 	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-if ( current_user_can( 'install_plugins' ) )
+if ( current_user_can( 'install_plugins' ) ) {
 	$popular_importers = wp_get_popular_importers();
-else
+} else {
 	$popular_importers = array();
+}
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
 if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
@@ -64,10 +66,12 @@ 
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
-		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
-		continue;
+	if ( isset( $importers[ $pop_importer ] ) ) {
+			continue;
+	}
+	if ( isset( $importers[ $pop_data['importer-id'] ] ) ) {
+			continue;
+	}
 	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
 }
 
@@ -119,8 +123,9 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
+if ( current_user_can('install_plugins') ) {
 	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+}
 ?>
 
 </div>

Spacing +45 added lines, -45 removed lines

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

src/wp-admin/menu-header.php

Braces +29 added lines, -20 removed lines

@@ -81,12 +81,14 @@ 
 			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
-				$aria_attributes .= 'aria-haspopup="true"';
+			if ( ! empty( $submenu_items ) ) {
+							$aria_attributes .= 'aria-haspopup="true"';
+			}
 		}
 
-		if ( ! empty( $item[4] ) )
-			$class[] = esc_attr( $item[4] );
+		if ( ! empty( $item[4] ) ) {
+					$class[] = esc_attr( $item[4] );
+		}
 
 		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
@@ -134,8 +136,9 @@ 
 			$submenu_items = array_values( $submenu_items );  // Re-index.
 			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
 			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+							$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
@@ -145,8 +148,9 @@ 
 		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+							$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
@@ -163,8 +167,9 @@ 
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
-					continue;
+				if ( ! current_user_can( $sub_item[1] ) ) {
+									continue;
+				}
 
 				$class = array();
 				if ( $first ) {
@@ -174,15 +179,17 @@ 
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
+				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+									$menu_file = substr( $menu_file, 0, $pos );
+				}
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
 				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
 
 				if ( isset( $submenu_file ) ) {
-					if ( $submenu_file == $sub_item[2] )
-						$class[] = 'current';
+					if ( $submenu_file == $sub_item[2] ) {
+											$class[] = 'current';
+					}
 				// If plugin_page is set the parent must either match the current page or not physically exist.
 				// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
@@ -200,17 +207,19 @@ 
 
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
-					$sub_file = substr($sub_file, 0, $pos);
+				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) {
+									$sub_file = substr($sub_file, 0, $pos);
+				}
 
 				$title = wptexturize($sub_item[0]);
 
 				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
-					else
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {
+											$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					} else {
+											$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					}
 
 					$sub_item_url = esc_url( $sub_item_url );
 					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Displays Administration Menu.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Displays Administration Menu.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * The current page.

Spacing +61 added lines, -61 removed lines

@@ -35,7 +35,7 @@ 
  *
  * @param string $parent_file The parent file.
  */
-$parent_file = apply_filters( 'parent_file', $parent_file );
+$parent_file = apply_filters('parent_file', $parent_file);
 
 /**
  * Filter the file of an admin menu sub-menu item.
@@ -45,7 +45,7 @@ 
  * @param string $submenu_file The submenu file.
  * @param string $parent_file  The submenu item's parent file.
  */
-$submenu_file = apply_filters( 'submenu_file', $submenu_file, $parent_file );
+$submenu_file = apply_filters('submenu_file', $submenu_file, $parent_file);
 
 get_admin_page_parent();
 
@@ -65,46 +65,46 @@ 
  * @param array $submenu
  * @param bool  $submenu_as_parent
  */
-function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
+function _wp_menu_output($menu, $submenu, $submenu_as_parent = true) {
 	global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
 
 	$first = true;
 	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
-	foreach ( $menu as $key => $item ) {
+	foreach ($menu as $key => $item) {
 		$admin_is_parent = false;
 		$class = array();
 		$aria_attributes = '';
 		$aria_hidden = '';
 		$is_separator = false;
 
-		if ( $first ) {
+		if ($first) {
 			$class[] = 'wp-first-item';
 			$first = false;
 		}
 
 		$submenu_items = array();
-		if ( ! empty( $submenu[$item[2]] ) ) {
+		if ( ! empty($submenu[$item[2]])) {
 			$class[] = 'wp-has-submenu';
 			$submenu_items = $submenu[$item[2]];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
-			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+		if (($parent_file && $item[2] == $parent_file) || (empty($typenow) && $self == $item[2])) {
+			$class[] = ! empty($submenu_items) ? 'wp-has-current-submenu wp-menu-open' : 'current';
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
+			if ( ! empty($submenu_items))
 				$aria_attributes .= 'aria-haspopup="true"';
 		}
 
-		if ( ! empty( $item[4] ) )
-			$class[] = esc_attr( $item[4] );
+		if ( ! empty($item[4]))
+			$class[] = esc_attr($item[4]);
 
-		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$class = $class ? ' class="'.join(' ', $class).'"' : '';
+		$id = ! empty($item[5]) ? ' id="'.preg_replace('|[^a-zA-Z0-9_:.]|', '-', $item[5]).'"' : '';
 		$img = $img_style = '';
 		$img_class = ' dashicons-before';
 
-		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+		if (false !== strpos($class, 'wp-menu-separator')) {
 			$is_separator = true;
 		}
 
@@ -114,51 +114,51 @@ 
 		 * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
 		 * as special cases.
 		 */
-		if ( ! empty( $item[6] ) ) {
-			$img = '<img src="' . $item[6] . '" alt="" />';
+		if ( ! empty($item[6])) {
+			$img = '<img src="'.$item[6].'" alt="" />';
 
-			if ( 'none' === $item[6] || 'div' === $item[6] ) {
+			if ('none' === $item[6] || 'div' === $item[6]) {
 				$img = '<br />';
-			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+			} elseif (0 === strpos($item[6], 'data:image/svg+xml;base64,')) {
 				$img = '<br />';
-				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+				$img_style = ' style="background-image:url(\''.esc_attr($item[6]).'\')"';
 				$img_class = ' svg';
-			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+			} elseif (0 === strpos($item[6], 'dashicons-')) {
 				$img = '<br />';
-				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+				$img_class = ' dashicons-before '.sanitize_html_class($item[6]);
 			}
 		}
 		$arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
-		$title = wptexturize( $item[0] );
+		$title = wptexturize($item[0]);
 
 		// hide separators from screen readers
-		if ( $is_separator ) {
+		if ($is_separator) {
 			$aria_hidden = ' aria-hidden="true"';
 		}
 
 		echo "\n\t<li$class$id$aria_hidden>";
 
-		if ( $is_separator ) {
+		if ($is_separator) {
 			echo '<div class="separator"></div>';
-		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
-			$submenu_items = array_values( $submenu_items );  // Re-index.
-			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+		} elseif ($submenu_as_parent && ! empty($submenu_items)) {
+			$submenu_items = array_values($submenu_items); // Re-index.
+			$menu_hook = get_plugin_page_hook($submenu_items[0][2], $item[2]);
 			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $submenu_items[0][2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			} else {
 				echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			}
-		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
-			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
+		} elseif ( ! empty($item[2]) && current_user_can($item[1])) {
+			$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
 			} else {
@@ -166,64 +166,64 @@ 
 			}
 		}
 
-		if ( ! empty( $submenu_items ) ) {
+		if ( ! empty($submenu_items)) {
 			echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
 			echo "<li class='wp-submenu-head' aria-hidden='true'>{$item[0]}</li>";
 
 			$first = true;
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
-			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
+			foreach ($submenu_items as $sub_key => $sub_item) {
+				if ( ! current_user_can($sub_item[1]))
 					continue;
 
 				$class = array();
-				if ( $first ) {
+				if ($first) {
 					$class[] = 'wp-first-item';
 					$first = false;
 				}
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
+				if (false !== ($pos = strpos($menu_file, '?')))
+					$menu_file = substr($menu_file, 0, $pos);
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
-				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+				$self_type = ! empty($typenow) ? $self.'?post_type='.$typenow : 'nothing';
 
-				if ( isset( $submenu_file ) ) {
-					if ( $submenu_file == $sub_item[2] )
+				if (isset($submenu_file)) {
+					if ($submenu_file == $sub_item[2])
 						$class[] = 'current';
 				// If plugin_page is set the parent must either match the current page or not physically exist.
 				// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
-					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+					( ! isset($plugin_page) && $self == $sub_item[2]) ||
+					(isset($plugin_page) && $plugin_page == $sub_item[2] && ($item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false))
 				) {
 					$class[] = 'current';
 				}
 
-				if ( ! empty( $sub_item[4] ) ) {
-					$class[] = esc_attr( $sub_item[4] );
+				if ( ! empty($sub_item[4])) {
+					$class[] = esc_attr($sub_item[4]);
 				}
 
-				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+				$class = $class ? ' class="'.join(' ', $class).'"' : '';
 
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
+				if (false !== ($pos = strpos($sub_file, '?')))
 					$sub_file = substr($sub_file, 0, $pos);
 
 				$title = wptexturize($sub_item[0]);
 
-				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
+				if ( ! empty($menu_hook) || (('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR."/$sub_file") && ! file_exists(ABSPATH."/wp-admin/$sub_file"))) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					if (( ! $admin_is_parent && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! is_dir(WP_PLUGIN_DIR."/{$item[2]}")) || file_exists($menu_file))
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), $item[2]);
 					else
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), 'admin.php');
 
-					$sub_item_url = esc_url( $sub_item_url );
+					$sub_item_url = esc_url($sub_item_url);
 					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";
 				} else {
 					echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";
@@ -235,28 +235,28 @@ 
 	}
 
 	echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
-	echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
+	echo '<span>'.esc_html__('Collapse menu').'</span>';
 	echo '</li>';
 }
 
 ?>
 
-<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
-<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
-<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e('Main menu'); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e('Skip to toolbar'); ?></a>
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
 <ul id="adminmenu">
 
 <?php
 
-_wp_menu_output( $menu, $submenu );
+_wp_menu_output($menu, $submenu);
 /**
  * Fires after the admin menu has been output.
  *
  * @since 2.5.0
  */
-do_action( 'adminmenu' );
+do_action('adminmenu');
 
 ?>
 </ul>

src/wp-admin/edit-link-form.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 
 if ( ! empty($link_id) ) {
 	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
@@ -139,9 +140,12 @@ 
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
-<?php else: ?>
+<?php else {
+	: ?>
 <input type="hidden" name="action" value="add" />
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 </div>
 </div>

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Edit links form for inclusion in administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Edit links form for inclusion in administration panels.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 // don't load directly
 if ( !defined('ABSPATH') )

Spacing +34 added lines, -34 removed lines

@@ -7,22 +7,22 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
-if ( ! empty($link_id) ) {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
+if ( ! empty($link_id)) {
+	$heading = sprintf(__('<a href="%s">Links</a> / Edit Link'), 'link-manager.php');
 	$submit_text = __('Update Link');
 	$form_name = 'editlink';
-	$nonce_action = 'update-bookmark_' . $link_id;
+	$nonce_action = 'update-bookmark_'.$link_id;
 } else {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
+	$heading = sprintf(__('<a href="%s">Links</a> / Add New Link'), 'link-manager.php');
 	$submit_text = __('Add Link');
 	$form_name = 'addlink';
 	$nonce_action = 'add-bookmark';
 }
 
-require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' );
+require_once(ABSPATH.'wp-admin/includes/meta-boxes.php');
 
 add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', null, 'side', 'core');
 add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', null, 'normal', 'core');
@@ -31,7 +31,7 @@ 
 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', null, 'normal', 'core');
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'add_meta_boxes', 'link', $link );
+do_action('add_meta_boxes', 'link', $link);
 
 /**
  * Fires when link-specific meta boxes are added.
@@ -40,58 +40,58 @@ 
  *
  * @param object $link Link object.
  */
-do_action( 'add_meta_boxes_link', $link );
+do_action('add_meta_boxes_link', $link);
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'normal', $link );
+do_action('do_meta_boxes', 'link', 'normal', $link);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'advanced', $link );
+do_action('do_meta_boxes', 'link', 'advanced', $link);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'side', $link );
+do_action('do_meta_boxes', 'link', 'side', $link);
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
+add_screen_option('layout_columns', array('max' => 2, 'default' => 2));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-	'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
-	'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
-	'<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/" target="_blank">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>'
-) );
+	'<p>'.__('You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.').'</p>'.
+	'<p>'.__('The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.').'</p>'.
+	'<p>'.__('XFN stands for <a href="http://gmpg.org/xfn/" target="_blank">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a></h1>
+<h1><?php echo esc_html($title); ?>  <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a></h1>
 
-<?php if ( isset( $_GET['added'] ) ) : ?>
+<?php if (isset($_GET['added'])) : ?>
 <div id="message" class="updated notice is-dismissible"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>
 
-<form name="<?php echo esc_attr( $form_name ); ?>" id="<?php echo esc_attr( $form_name ); ?>" method="post" action="link.php">
+<form name="<?php echo esc_attr($form_name); ?>" id="<?php echo esc_attr($form_name); ?>" method="post" action="link.php">
 <?php
-if ( ! empty( $link_added ) ) {
+if ( ! empty($link_added)) {
 	echo $link_added;
 }
 
-wp_nonce_field( $nonce_action );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+wp_nonce_field($nonce_action);
+wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
 
 <div id="poststuff">
 
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
 <div id="namediv" class="stuffbox">
-<h2><label for="link_name"><?php _ex( 'Name', 'link name' ) ?></label></h2>
+<h2><label for="link_name"><?php _ex('Name', 'link name') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_name" size="30" maxlength="255" value="<?php echo esc_attr($link->link_name); ?>" id="link_name" />
 	<p><?php _e('Example: Nifty blogging software'); ?></p>
@@ -99,7 +99,7 @@ 
 </div>
 
 <div id="addressdiv" class="stuffbox">
-<h2><label for="link_url"><?php _e( 'Web Address' ) ?></label></h2>
+<h2><label for="link_url"><?php _e('Web Address') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr($link->link_url); ?>" id="link_url" />
 	<p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p>
@@ -107,7 +107,7 @@ 
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
-<h2><label for="link_description"><?php _e( 'Description' ) ?></label></h2>
+<h2><label for="link_description"><?php _e('Description') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_description" size="30" maxlength="255" value="<?php echo isset($link->link_description) ? esc_attr($link->link_description) : ''; ?>" id="link_description" />
 	<p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
@@ -119,8 +119,8 @@ 
 <?php
 
 /** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'submitlink_box' );
-$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
+do_action('submitlink_box');
+$side_meta_boxes = do_meta_boxes('link', 'side', $link);
 
 ?>
 </div>
@@ -135,7 +135,7 @@ 
 </div>
 <?php
 
-if ( $link_id ) : ?>
+if ($link_id) : ?>
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />

src/wp-admin/link-parse-opml.php

Spacing +13 added lines, -13 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die();
 
 /**
@@ -33,28 +33,28 @@ 
 function startElement($parser, $tagName, $attrs) {
 	global $names, $urls, $targets, $descriptions, $feeds;
 
-	if ( 'OUTLINE' === $tagName ) {
+	if ('OUTLINE' === $tagName) {
 		$name = '';
-		if ( isset( $attrs['TEXT'] ) ) {
+		if (isset($attrs['TEXT'])) {
 			$name = $attrs['TEXT'];
 		}
-		if ( isset( $attrs['TITLE'] ) ) {
+		if (isset($attrs['TITLE'])) {
 			$name = $attrs['TITLE'];
 		}
 		$url = '';
-		if ( isset( $attrs['URL'] ) ) {
+		if (isset($attrs['URL'])) {
 			$url = $attrs['URL'];
 		}
-		if ( isset( $attrs['HTMLURL'] ) ) {
+		if (isset($attrs['HTMLURL'])) {
 			$url = $attrs['HTMLURL'];
 		}
 
 		// Save the data away.
 		$names[] = $name;
 		$urls[] = $url;
-		$targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] :  '';
-		$feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] :  '';
-		$descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] :  '';
+		$targets[] = isset($attrs['TARGET']) ? $attrs['TARGET'] : '';
+		$feeds[] = isset($attrs['XMLURL']) ? $attrs['XMLURL'] : '';
+		$descriptions[] = isset($attrs['DESCRIPTION']) ? $attrs['DESCRIPTION'] : '';
 	} // End if outline.
 }
 
@@ -77,12 +77,12 @@ 
 // Set the functions to handle opening and closing tags
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
-if ( ! xml_parse( $xml_parser, $opml, true ) ) {
+if ( ! xml_parse($xml_parser, $opml, true)) {
 	printf(
 		/* translators: 1: error message, 2: line number */
-		__( 'XML Error: %1$s at line %2$s' ),
-		xml_error_string( xml_get_error_code( $xml_parser ) ),
-		xml_get_current_line_number( $xml_parser )
+		__('XML Error: %1$s at line %2$s'),
+		xml_error_string(xml_get_error_code($xml_parser)),
+		xml_get_current_line_number($xml_parser)
 	);
 }
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @subpackage Administration
  */
 
-if ( ! defined('ABSPATH') )
+if ( ! defined('ABSPATH') ) {
 	die();
+}
 
 /**
  * @global string $opml

src/wp-admin/ms-delete-site.php

Spacing +31 added lines, -31 removed lines

@@ -7,43 +7,43 @@ 
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'delete_site' ) )
-	wp_die(__( 'You do not have sufficient permissions to delete this site.'));
+if ( ! current_user_can('delete_site'))
+	wp_die(__('You do not have sufficient permissions to delete this site.'));
 
-if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
-	if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
-		wpmu_delete_blog( $wpdb->blogid );
-		wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
+if (isset($_GET['h']) && $_GET['h'] != '' && get_option('delete_blog_hash') != false) {
+	if (get_option('delete_blog_hash') == $_GET['h']) {
+		wpmu_delete_blog($wpdb->blogid);
+		wp_die(sprintf(__('Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.'), $current_site->site_name));
 	} else {
-		wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) );
+		wp_die(__("I'm sorry, the link you clicked is stale. Please select another option."));
 	}
 }
 
 $blog = get_blog_details();
 $user = wp_get_current_user();
 
-$title = __( 'Delete Site' );
+$title = __('Delete Site');
 $parent_file = 'tools.php';
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 echo '<div class="wrap">';
-echo '<h1>' . esc_html( $title ) . '</h1>';
+echo '<h1>'.esc_html($title).'</h1>';
 
-if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
-	check_admin_referer( 'delete-blog' );
+if (isset($_POST['action']) && $_POST['action'] == 'deleteblog' && isset($_POST['confirmdelete']) && $_POST['confirmdelete'] == '1') {
+	check_admin_referer('delete-blog');
 
-	$hash = wp_generate_password( 20, false );
-	update_option( 'delete_blog_hash', $hash );
+	$hash = wp_generate_password(20, false);
+	update_option('delete_blog_hash', $hash);
 
-	$url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
+	$url_delete = esc_url(admin_url('ms-delete-site.php?h='.$hash));
 
 	/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
-	$content = __( "Howdy ###USERNAME###,
+	$content = __("Howdy ###USERNAME###,
 
 You recently clicked the 'Delete Site' link on your site and filled in a
 form on that page.
@@ -66,30 +66,30 @@ 
 	 *
 	 * @param string $content The email content that will be sent to the user who deleted a site in a Multisite network.
 	 */
-	$content = apply_filters( 'delete_site_email_content', $content );
+	$content = apply_filters('delete_site_email_content', $content);
 
-	$content = str_replace( '###USERNAME###', $user->user_login, $content );
-	$content = str_replace( '###URL_DELETE###', $url_delete, $content );
-	$content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+	$content = str_replace('###USERNAME###', $user->user_login, $content);
+	$content = str_replace('###URL_DELETE###', $url_delete, $content);
+	$content = str_replace('###SITE_NAME###', $current_site->site_name, $content);
 
-	wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
+	wp_mail(get_option('admin_email'), "[ ".wp_specialchars_decode(get_option('blogname'))." ] ".__('Delete My Site'), $content);
 	?>
 
-	<p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ) ?></p>
+	<p><?php _e('Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.') ?></p>
 
 <?php } else {
 	?>
-	<p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
-	<p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
+	<p><?php printf(__('If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
+	<p><?php _e('Remember, once deleted your site cannot be restored.') ?></p>
 
 	<form method="post" name="deletedirect">
-		<?php wp_nonce_field( 'delete-blog' ) ?>
+		<?php wp_nonce_field('delete-blog') ?>
 		<input type="hidden" name="action" value="deleteblog" />
-		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $blog->domain : $blog->domain . $blog->path ); ?></strong></label></p>
-		<?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
+		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf(__("I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again."), is_subdomain_install() ? $blog->domain : $blog->domain.$blog->path); ?></strong></label></p>
+		<?php submit_button(__('Delete My Site Permanently')); ?>
 	</form>
  	<?php
 }
 echo '</div>';
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +4 added lines, -2 removed lines

@@ -9,11 +9,13 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !is_multisite() )
+if ( !is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'delete_site' ) )
+if ( ! current_user_can( 'delete_site' ) ) {
 	wp_die(__( 'You do not have sufficient permissions to delete this site.'));
+}
 
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
 	if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {

src/wp-admin/admin-functions.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' );
+_deprecated_file(basename(__FILE__), '2.5', 'wp-admin/includes/admin.php');
 
 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');