ntwb / wordpress

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

Indentation +27 added lines, -27 removed lines

@@ -19,7 +19,7 @@ 
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
 	/**
- 	 * Fires before the Edit Category form.
+	 * Fires before the Edit Category form.
 	 *
 	 * @since 2.1.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
@@ -49,16 +49,16 @@ 
 	do_action( 'edit_tag_form_pre', $tag );
 }
 /**
- * Fires before the Edit Term form for all taxonomies.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to
- * the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param object $tag      Current taxonomy term object.
- * @param string $taxonomy Current $taxonomy slug.
- */
+	 * Fires before the Edit Term form for all taxonomies.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to
+	 * the taxonomy slug.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param object $tag      Current taxonomy term object.
+	 * @param string $taxonomy Current $taxonomy slug.
+	 */
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">
@@ -67,13 +67,13 @@ 
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
 <?php
 /**
- * Fires inside the Edit Term form tag.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to
- * the taxonomy slug.
- *
- * @since 3.7.0
- */
+	 * Fires inside the Edit Term form tag.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to
+	 * the taxonomy slug.
+	 *
+	 * @since 3.7.0
+	 */
 do_action( "{$taxonomy}_term_edit_form_tag" );
 ?>>
 <input type="hidden" name="action" value="editedtag" />
@@ -205,15 +205,15 @@ 
 	do_action( 'edit_tag_form', $tag );
 }
 /**
- * Fires at the end of the Edit Term form for all taxonomies.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param object $tag      Current taxonomy term object.
- * @param string $taxonomy Current taxonomy slug.
- */
+	 * Fires at the end of the Edit Term form for all taxonomies.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param object $tag      Current taxonomy term object.
+	 * @param string $taxonomy Current taxonomy slug.
+	 */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 
 submit_button( __('Update') );

Spacing +38 added lines, -38 removed lines

@@ -7,17 +7,17 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
-if ( empty($tag_ID) ) { ?>
-	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
+if (empty($tag_ID)) { ?>
+	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e('You did not select an item for editing.'); ?></strong></p></div>
 <?php
 	return;
 }
 
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
  	 * Fires before the Edit Category form.
 	 *
@@ -26,8 +26,8 @@ 
 	 *
 	 * @param object $tag Current category term object.
 	 */
-	do_action( 'edit_category_form_pre', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form_pre', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires before the Edit Link Category form.
 	 *
@@ -36,7 +36,7 @@ 
 	 *
 	 * @param object $tag Current link category term object.
 	 */
-	do_action( 'edit_link_category_form_pre', $tag );
+	do_action('edit_link_category_form_pre', $tag);
 } else {
 	/**
 	 * Fires before the Edit Tag form.
@@ -46,7 +46,7 @@ 
 	 *
 	 * @param object $tag Current tag term object.
 	 */
-	do_action( 'edit_tag_form_pre', $tag );
+	do_action('edit_tag_form_pre', $tag);
 }
 /**
  * Fires before the Edit Term form for all taxonomies.
@@ -59,7 +59,7 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current $taxonomy slug.
  */
-do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
+do_action("{$taxonomy}_pre_edit_form", $tag, $taxonomy); ?>
 
 <div class="wrap">
 <h1><?php echo $tax->labels->edit_item; ?></h1>
@@ -74,21 +74,21 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_edit_form_tag" );
+do_action("{$taxonomy}_term_edit_form_tag");
 ?>>
 <input type="hidden" name="action" value="editedtag" />
 <input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag->term_id) ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_'.$tag_ID); ?>
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
-			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<th scope="row"><label for="name"><?php _ex('Name', 'term name'); ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if (isset($tag->name)) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled()) { ?>
 		<tr class="form-field term-slug-wrap">
-			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
+			<th scope="row"><label for="slug"><?php _e('Slug'); ?></label></th>
 			<?php
 			/**
 			 * Filter the editable slug.
@@ -101,15 +101,15 @@ 
 			 * @param string $slug The editable slug. Will be either a term slug or post URI depending
 			 *                     upon the context in which it is evaluated.
 			 */
-			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug ) : '';
+			$slug = isset($tag->slug) ? apply_filters('editable_slug', $tag->slug) : '';
 			?>
-			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr($slug); ?>" size="40" />
 			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 <?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 		<tr class="form-field term-parent-wrap">
-			<th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
+			<th scope="row"><label for="parent"><?php _ex('Parent', 'term parent'); ?></label></th>
 			<td>
 				<?php
 				$dropdown_args = array(
@@ -121,26 +121,26 @@ 
 					'selected'         => $tag->parent,
 					'exclude_tree'     => $tag->term_id,
 					'hierarchical'     => true,
-					'show_option_none' => __( 'None' ),
+					'show_option_none' => __('None'),
 				);
 
 				/** This filter is documented in wp-admin/edit-tags.php */
-				$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-				wp_dropdown_categories( $dropdown_args ); ?>
-				<?php if ( 'category' == $taxonomy ) : ?>
+				$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit');
+				wp_dropdown_categories($dropdown_args); ?>
+				<?php if ('category' == $taxonomy) : ?>
 				<p class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 				<?php endif; ?>
 			</td>
 		</tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
 		<tr class="form-field term-description-wrap">
-			<th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
+			<th scope="row"><label for="description"><?php _e('Description'); ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
 			<p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
 		</tr>
 		<?php
 		// Back compat hooks
-		if ( 'category' == $taxonomy ) {
+		if ('category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Category form fields are displayed.
 			 *
@@ -149,8 +149,8 @@ 
 			 *
 			 * @param object $tag Current category term object.
 			 */
-			do_action( 'edit_category_form_fields', $tag );
-		} elseif ( 'link_category' == $taxonomy ) {
+			do_action('edit_category_form_fields', $tag);
+		} elseif ('link_category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Link Category form fields are displayed.
 			 *
@@ -159,7 +159,7 @@ 
 			 *
 			 * @param object $tag Current link category term object.
 			 */
-			do_action( 'edit_link_category_form_fields', $tag );
+			do_action('edit_link_category_form_fields', $tag);
 		} else {
 			/**
 			 * Fires after the Edit Tag form fields are displayed.
@@ -169,7 +169,7 @@ 
 			 *
 			 * @param object $tag Current tag term object.
 			 */
-			do_action( 'edit_tag_form_fields', $tag );
+			do_action('edit_tag_form_fields', $tag);
 		}
 		/**
 		 * Fires after the Edit Term form fields are displayed.
@@ -182,17 +182,17 @@ 
 		 * @param object $tag      Current taxonomy term object.
 		 * @param string $taxonomy Current taxonomy slug.
 		 */
-		do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
+		do_action("{$taxonomy}_edit_form_fields", $tag, $taxonomy);
 		?>
 	</table>
 <?php
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_category_form', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_link_category_form', $tag );
+	do_action('edit_link_category_form', $tag);
 } else {
 	/**
 	 * Fires at the end of the Edit Term form.
@@ -202,7 +202,7 @@ 
 	 *
 	 * @param object $tag Current taxonomy term object.
 	 */
-	do_action( 'edit_tag_form', $tag );
+	do_action('edit_tag_form', $tag);
 }
 /**
  * Fires at the end of the Edit Term form for all taxonomies.
@@ -214,14 +214,14 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current taxonomy slug.
  */
-do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
+do_action("{$taxonomy}_edit_form", $tag, $taxonomy);
 
-submit_button( __('Update') );
+submit_button(__('Update'));
 ?>
 </form>
 </div>
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>

Braces +6 added lines, -2 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 
 if ( empty($tag_ID) ) { ?>
 	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
@@ -83,7 +84,10 @@ 
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
 			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) {
+	echo esc_attr($tag->name);
+}
+?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
 <?php if ( !global_terms_enabled() ) { ?>

src/wp-admin/upgrade-functions.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/install.php

Switch Indentation +76 added lines, -76 removed lines

@@ -241,85 +241,85 @@ 
 }
 
 switch($step) {
-	case 0: // Step 0
-
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			display_header( 'language-chooser' );
-			echo '<form id="setup" method="post" action="?step=1">';
-			wp_install_language_form( $languages );
-			echo '</form>';
-			break;
-		}
+		case 0: // Step 0
+
+			if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+				display_header( 'language-chooser' );
+				echo '<form id="setup" method="post" action="?step=1">';
+				wp_install_language_form( $languages );
+				echo '</form>';
+				break;
+			}
 
-		// Deliberately fall through if we can't reach the translations API.
+			// Deliberately fall through if we can't reach the translations API.
 
-	case 1: // Step 1, direct link or from language chooser.
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
-				$GLOBALS['wp_locale'] = new WP_Locale();
+		case 1: // Step 1, direct link or from language chooser.
+			if ( ! empty( $language ) ) {
+				$loaded_language = wp_download_language_pack( $language );
+				if ( $loaded_language ) {
+					load_default_textdomain( $loaded_language );
+					$GLOBALS['wp_locale'] = new WP_Locale();
+				}
 			}
-		}
 
-		display_header();
-?>
-<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
+			display_header();
+	?>
+	<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
 
 <h1><?php _e( 'Information needed' ); ?></h1>
 <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
 
-<?php
-		display_setup_form();
-		break;
-	case 2:
-		if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
-			$loaded_language = $language;
-			$GLOBALS['wp_locale'] = new WP_Locale();
-		} else {
-			$loaded_language = 'en_US';
-		}
-
-		if ( ! empty( $wpdb->error ) )
-			wp_die( $wpdb->error->get_error_message() );
-
-		display_header();
-		// Fill in the data we gathered
-		$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-		$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-		$admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
-		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
-		$admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-		$public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
-
-		// Check e-mail address.
-		$error = false;
-		if ( empty( $user_name ) ) {
-			// TODO: poka-yoke
-			display_setup_form( __( 'Please provide a valid username.' ) );
-			$error = true;
-		} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-			display_setup_form( __( 'The username you provided has invalid characters.' ) );
-			$error = true;
-		} elseif ( $admin_password != $admin_password_check ) {
-			// TODO: poka-yoke
-			display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
-			$error = true;
-		} elseif ( empty( $admin_email ) ) {
-			// TODO: poka-yoke
-			display_setup_form( __( 'You must provide an email address.' ) );
-			$error = true;
-		} elseif ( ! is_email( $admin_email ) ) {
-			// TODO: poka-yoke
-			display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
-			$error = true;
-		}
-
-		if ( $error === false ) {
-			$wpdb->show_errors();
-			$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
-?>
+	<?php
+			display_setup_form();
+			break;
+		case 2:
+			if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
+				$loaded_language = $language;
+				$GLOBALS['wp_locale'] = new WP_Locale();
+			} else {
+				$loaded_language = 'en_US';
+			}
+
+			if ( ! empty( $wpdb->error ) )
+				wp_die( $wpdb->error->get_error_message() );
+
+			display_header();
+			// Fill in the data we gathered
+			$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
+			$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
+			$admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
+			$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
+			$admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+			$public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
+
+			// Check e-mail address.
+			$error = false;
+			if ( empty( $user_name ) ) {
+				// TODO: poka-yoke
+				display_setup_form( __( 'Please provide a valid username.' ) );
+				$error = true;
+			} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
+				display_setup_form( __( 'The username you provided has invalid characters.' ) );
+				$error = true;
+			} elseif ( $admin_password != $admin_password_check ) {
+				// TODO: poka-yoke
+				display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
+				$error = true;
+			} elseif ( empty( $admin_email ) ) {
+				// TODO: poka-yoke
+				display_setup_form( __( 'You must provide an email address.' ) );
+				$error = true;
+			} elseif ( ! is_email( $admin_email ) ) {
+				// TODO: poka-yoke
+				display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
+				$error = true;
+			}
+
+			if ( $error === false ) {
+				$wpdb->show_errors();
+				$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
+	?>
 
 <h1><?php _e( 'Success!' ); ?></h1>
 
@@ -333,19 +333,19 @@ 
 	<tr>
 		<th><?php _e( 'Password' ); ?></th>
 		<td><?php
-		if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
-			<code><?php echo esc_html( $result['password'] ) ?></code><br />
+			if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
+				<code><?php echo esc_html( $result['password'] ) ?></code><br />
 		<?php endif ?>
-			<p><?php echo $result['password_message'] ?></p>
+				<p><?php echo $result['password_message'] ?></p>
 		</td>
 	</tr>
 </table>
 
 <p class="step"><a href="../wp-login.php" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
 
-<?php
-		}
-		break;
+	<?php
+			}
+			break;
 }
 if ( !wp_is_mobile() ) {
 ?>

Spacing +112 added lines, -112 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // Sanity check.
-if ( false ) {
+if (false) {
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -30,23 +30,23 @@ 
  * @since 1.5.1
  * @var bool
  */
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
 /** Load wpdb */
-require_once( ABSPATH . WPINC . '/wp-db.php' );
+require_once(ABSPATH.WPINC.'/wp-db.php');
 
 nocache_headers();
 
-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
+$step = isset($_GET['step']) ? (int) $_GET['step'] : 0;
 
 /**
  * Display install header.
@@ -55,13 +55,13 @@ 
  *
  * @param string $body_classes
  */
-function display_header( $body_classes = '' ) {
-	header( 'Content-Type: text/html; charset=utf-8' );
-	if ( is_rtl() ) {
+function display_header($body_classes = '') {
+	header('Content-Type: text/html; charset=utf-8');
+	if (is_rtl()) {
 		$body_classes .= 'rtl';
 	}
-	if ( $body_classes ) {
-		$body_classes = ' ' . $body_classes;
+	if ($body_classes) {
+		$body_classes = ' '.$body_classes;
 	}
 ?>
 <!DOCTYPE html>
@@ -69,14 +69,14 @@ 
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Installation'); ?></title>
 	<?php
-		wp_admin_css( 'install', true );
-		wp_admin_css( 'dashicons', true );
+		wp_admin_css('install', true);
+		wp_admin_css('dashicons', true);
 	?>
 </head>
 <body class="wp-core-ui<?php echo $body_classes ?>">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<h1 id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></h1>
 
 <?php
 } // end display_header()
@@ -88,73 +88,73 @@ 
  *
  * @param string|null $error
  */
-function display_setup_form( $error = null ) {
+function display_setup_form($error = null) {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
-	$user_table = ( $wpdb->get_var( $sql ) != null );
+	$sql = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->users));
+	$user_table = ($wpdb->get_var($sql) != null);
 
 	// Ensure that Blogs appear in search engines by default.
 	$blog_public = 1;
-	if ( isset( $_POST['weblog_title'] ) ) {
-		$blog_public = isset( $_POST['blog_public'] );
+	if (isset($_POST['weblog_title'])) {
+		$blog_public = isset($_POST['blog_public']);
 	}
 
-	$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-	$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-	$admin_email  = isset( $_POST['admin_email']  ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+	$weblog_title = isset($_POST['weblog_title']) ? trim(wp_unslash($_POST['weblog_title'])) : '';
+	$user_name = isset($_POST['user_name']) ? trim(wp_unslash($_POST['user_name'])) : '';
+	$admin_email  = isset($_POST['admin_email']) ? trim(wp_unslash($_POST['admin_email'])) : '';
 
-	if ( ! is_null( $error ) ) {
+	if ( ! is_null($error)) {
 ?>
 <p class="message"><?php echo $error; ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
-			<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
+			<th scope="row"><label for="weblog_title"><?php _e('Site Title'); ?></label></th>
+			<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr($weblog_title); ?>" /></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="user_login"><?php _e('Username'); ?></label></th>
 			<td>
 			<?php
-			if ( $user_table ) {
+			if ($user_table) {
 				_e('User(s) already exists.');
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
-				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
-				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
+				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr(sanitize_user($user_name, true)); ?>" />
+				<p><?php _e('Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.'); ?></p>
 			<?php
 			} ?>
 			</td>
 		</tr>
-		<?php if ( ! $user_table ) : ?>
+		<?php if ( ! $user_table) : ?>
 		<tr class="form-field form-required user-pass1-wrap">
 			<th scope="row">
 				<label for="pass1">
-					<?php _e( 'Password' ); ?>
+					<?php _e('Password'); ?>
 				</label>
 			</th>
 			<td>
 				<div class="">
-					<?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
-					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+					<?php $initial_password = isset($_POST['admin_password']) ? stripslashes($_POST['admin_password']) : wp_generate_password(18); ?>
+					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
+					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset($_POST['admin_password']); ?>" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 						<span class="dashicons dashicons-hidden"></span>
-						<span class="text"><?php _e( 'Hide' ); ?></span>
+						<span class="text"><?php _e('Hide'); ?></span>
 					</button>
 					<div id="pass-strength-result" aria-live="polite"></div>
 				</div>
 				<p><span class="description important hide-if-no-js">
-				<strong><?php _e( 'Important:' ); ?></strong>
+				<strong><?php _e('Important:'); ?></strong>
 				<?php /* translators: The non-breaking space prevents 1Password from thinking the text "log in" should trigger a password save prompt. */ ?>
-				<?php _e( 'You will need this password to log&nbsp;in. Please store it in a secure location.' ); ?></span></p>
+				<?php _e('You will need this password to log&nbsp;in. Please store it in a secure location.'); ?></span></p>
 			</td>
 		</tr>
 		<tr class="form-field form-required user-pass2-wrap hide-if-js">
 			<th scope="row">
-				<label for="pass2"><?php _e( 'Repeat Password' ); ?>
-					<span class="description"><?php _e( '(required)' ); ?></span>
+				<label for="pass2"><?php _e('Repeat Password'); ?>
+					<span class="description"><?php _e('(required)'); ?></span>
 				</label>
 			</th>
 			<td>
@@ -162,35 +162,35 @@ 
 			</td>
 		</tr>
 		<tr class="pw-weak">
-			<th scope="row"><?php _e( 'Confirm Password' ); ?></th>
+			<th scope="row"><?php _e('Confirm Password'); ?></th>
 			<td>
 				<label>
 					<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-					<?php _e( 'Confirm use of weak password' ); ?>
+					<?php _e('Confirm use of weak password'); ?>
 				</label>
 			</td>
 		</tr>
 		<?php endif; ?>
 		<tr>
-			<th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
-			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
-			<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
+			<th scope="row"><label for="admin_email"><?php _e('Your E-mail'); ?></label></th>
+			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr($admin_email); ?>" />
+			<p><?php _e('Double-check your email address before continuing.'); ?></p></td>
 		</tr>
 		<tr>
-			<th scope="row"><?php _e( 'Privacy' ); ?></th>
-			<td colspan="2"><label><input type="checkbox" name="blog_public" id="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site' ); ?></label></td>
+			<th scope="row"><?php _e('Privacy'); ?></th>
+			<td colspan="2"><label><input type="checkbox" name="blog_public" id="blog_public" value="1" <?php checked($blog_public); ?> /> <?php _e('Allow search engines to index this site'); ?></label></td>
 		</tr>
 	</table>
-	<p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
-	<input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
+	<p class="step"><?php submit_button(__('Install WordPress'), 'large', 'Submit', false, array('id' => 'submit')); ?></p>
+	<input type="hidden" name="language" value="<?php echo isset($_REQUEST['language']) ? esc_attr($_REQUEST['language']) : ''; ?>" />
 </form>
 <?php
 } // end display_setup_form()
 
 // Let's check to make sure WP isn't already installed.
-if ( is_blog_installed() ) {
+if (is_blog_installed()) {
 	display_header();
-	die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
+	die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p><p class="step"><a href="../wp-login.php" class="button button-large">'.__('Log In').'</a></p></body></html>');
 }
 
 /**
@@ -203,30 +203,30 @@ 
 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-$mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+$php_compat     = version_compare($php_version, $required_php_version, '>=');
+$mysql_compat   = version_compare($mysql_version, $required_mysql_version, '>=') || file_exists(WP_CONTENT_DIR.'/db.php');
 
-if ( !$mysql_compat && !$php_compat )
-	$compat = sprintf( __( 'You cannot install 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 )
-	$compat = sprintf( __( 'You cannot install 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 )
-	$compat = sprintf( __( 'You cannot install 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 );
+if ( ! $mysql_compat && ! $php_compat)
+	$compat = sprintf(__('You cannot install 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)
+	$compat = sprintf(__('You cannot install 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)
+	$compat = sprintf(__('You cannot install 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);
 
-if ( !$mysql_compat || !$php_compat ) {
+if ( ! $mysql_compat || ! $php_compat) {
 	display_header();
-	die( '<h1>' . __( 'Insufficient Requirements' ) . '</h1><p>' . $compat . '</p></body></html>' );
+	die('<h1>'.__('Insufficient Requirements').'</h1><p>'.$compat.'</p></body></html>');
 }
 
-if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
+if ( ! is_string($wpdb->base_prefix) || '' === $wpdb->base_prefix) {
 	display_header();
-	die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
+	die('<h1>'.__('Configuration Error').'</h1><p>'.__('Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.').'</p></body></html>');
 }
 
 // Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install.
-if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 	display_header();
-	die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '</p></body></html>' );
+	die('<h1>'.__('Configuration Error').'</h1><p>'.__('The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.').'</p></body></html>');
 }
 
 /**
@@ -234,19 +234,19 @@ 
  * @global WP_Locale $wp_locale
  */
 $language = '';
-if ( ! empty( $_REQUEST['language'] ) ) {
-	$language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
-} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+if ( ! empty($_REQUEST['language'])) {
+	$language = preg_replace('/[^a-zA-Z_]/', '', $_REQUEST['language']);
+} elseif (isset($GLOBALS['wp_local_package'])) {
 	$language = $GLOBALS['wp_local_package'];
 }
 
-switch($step) {
+switch ($step) {
 	case 0: // Step 0
 
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			display_header( 'language-chooser' );
+		if (wp_can_install_language_pack() && empty($language) && ($languages = wp_get_available_translations())) {
+			display_header('language-chooser');
 			echo '<form id="setup" method="post" action="?step=1">';
-			wp_install_language_form( $languages );
+			wp_install_language_form($languages);
 			echo '</form>';
 			break;
 		}
@@ -254,105 +254,105 @@ 
 		// Deliberately fall through if we can't reach the translations API.
 
 	case 1: // Step 1, direct link or from language chooser.
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
+		if ( ! empty($language)) {
+			$loaded_language = wp_download_language_pack($language);
+			if ($loaded_language) {
+				load_default_textdomain($loaded_language);
 				$GLOBALS['wp_locale'] = new WP_Locale();
 			}
 		}
 
 		display_header();
 ?>
-<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
-<p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
+<h1><?php _ex('Welcome', 'Howdy'); ?></h1>
+<p><?php _e('Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.'); ?></p>
 
-<h1><?php _e( 'Information needed' ); ?></h1>
-<p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
+<h1><?php _e('Information needed'); ?></h1>
+<p><?php _e('Please provide the following information. Don&#8217;t worry, you can always change these settings later.'); ?></p>
 
 <?php
 		display_setup_form();
 		break;
 	case 2:
-		if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
+		if ( ! empty($language) && load_default_textdomain($language)) {
 			$loaded_language = $language;
 			$GLOBALS['wp_locale'] = new WP_Locale();
 		} else {
 			$loaded_language = 'en_US';
 		}
 
-		if ( ! empty( $wpdb->error ) )
-			wp_die( $wpdb->error->get_error_message() );
+		if ( ! empty($wpdb->error))
+			wp_die($wpdb->error->get_error_message());
 
 		display_header();
 		// Fill in the data we gathered
-		$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-		$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-		$admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
-		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
-		$admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-		$public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
+		$weblog_title = isset($_POST['weblog_title']) ? trim(wp_unslash($_POST['weblog_title'])) : '';
+		$user_name = isset($_POST['user_name']) ? trim(wp_unslash($_POST['user_name'])) : '';
+		$admin_password = isset($_POST['admin_password']) ? wp_unslash($_POST['admin_password']) : '';
+		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash($_POST['admin_password2']) : '';
+		$admin_email  = isset($_POST['admin_email']) ? trim(wp_unslash($_POST['admin_email'])) : '';
+		$public       = isset($_POST['blog_public']) ? (int) $_POST['blog_public'] : 0;
 
 		// Check e-mail address.
 		$error = false;
-		if ( empty( $user_name ) ) {
+		if (empty($user_name)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Please provide a valid username.' ) );
+			display_setup_form(__('Please provide a valid username.'));
 			$error = true;
-		} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-			display_setup_form( __( 'The username you provided has invalid characters.' ) );
+		} elseif ($user_name != sanitize_user($user_name, true)) {
+			display_setup_form(__('The username you provided has invalid characters.'));
 			$error = true;
-		} elseif ( $admin_password != $admin_password_check ) {
+		} elseif ($admin_password != $admin_password_check) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
+			display_setup_form(__('Your passwords do not match. Please try again.'));
 			$error = true;
-		} elseif ( empty( $admin_email ) ) {
+		} elseif (empty($admin_email)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'You must provide an email address.' ) );
+			display_setup_form(__('You must provide an email address.'));
 			$error = true;
-		} elseif ( ! is_email( $admin_email ) ) {
+		} elseif ( ! is_email($admin_email)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
+			display_setup_form(__('Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.'));
 			$error = true;
 		}
 
-		if ( $error === false ) {
+		if ($error === false) {
 			$wpdb->show_errors();
-			$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
+			$result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash($admin_password), $loaded_language);
 ?>
 
-<h1><?php _e( 'Success!' ); ?></h1>
+<h1><?php _e('Success!'); ?></h1>
 
-<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
+<p><?php _e('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'); ?></p>
 
 <table class="form-table install-success">
 	<tr>
-		<th><?php _e( 'Username' ); ?></th>
-		<td><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></td>
+		<th><?php _e('Username'); ?></th>
+		<td><?php echo esc_html(sanitize_user($user_name, true)); ?></td>
 	</tr>
 	<tr>
-		<th><?php _e( 'Password' ); ?></th>
+		<th><?php _e('Password'); ?></th>
 		<td><?php
-		if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
-			<code><?php echo esc_html( $result['password'] ) ?></code><br />
+		if ( ! empty($result['password']) && empty($admin_password_check)): ?>
+			<code><?php echo esc_html($result['password']) ?></code><br />
 		<?php endif ?>
 			<p><?php echo $result['password_message'] ?></p>
 		</td>
 	</tr>
 </table>
 
-<p class="step"><a href="../wp-login.php" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
+<p class="step"><a href="../wp-login.php" class="button button-large"><?php _e('Log In'); ?></a></p>
 
 <?php
 		}
 		break;
 }
-if ( !wp_is_mobile() ) {
+if ( ! wp_is_mobile()) {
 ?>
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 <?php } ?>
-<?php wp_print_scripts( 'user-profile' ); ?>
-<?php wp_print_scripts( 'language-chooser' ); ?>
+<?php wp_print_scripts('user-profile'); ?>
+<?php wp_print_scripts('language-chooser'); ?>
 <script type="text/javascript">
 jQuery( function( $ ) {
 	$( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );

Braces +7 added lines, -5 removed lines

@@ -206,12 +206,13 @@ 
 $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
 $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
-if ( !$mysql_compat && !$php_compat )
+if ( !$mysql_compat && !$php_compat ) {
 	$compat = sprintf( __( 'You cannot install 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 )
+} elseif ( !$php_compat ) {
 	$compat = sprintf( __( 'You cannot install 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 )
+} elseif ( !$mysql_compat ) {
 	$compat = sprintf( __( 'You cannot install 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 );
+}
 
 if ( !$mysql_compat || !$php_compat ) {
 	display_header();
@@ -281,8 +282,9 @@ 
 			$loaded_language = 'en_US';
 		}
 
-		if ( ! empty( $wpdb->error ) )
-			wp_die( $wpdb->error->get_error_message() );
+		if ( ! empty( $wpdb->error ) ) {
+					wp_die( $wpdb->error->get_error_message() );
+		}
 
 		display_header();
 		// Fill in the data we gathered

src/wp-admin/edit-comments.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Edit Comments Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+		 * Edit Comments Administration Screen.
+		 *
+		 * @package WordPress
+		 * @subpackage Administration
+		 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +116 added lines, -116 removed lines

@@ -7,95 +7,95 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( !current_user_can('edit_posts') )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('edit_posts'))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 $wp_list_table = _get_list_table('WP_Comments_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
-	check_admin_referer( 'bulk-comments' );
+if ($doaction) {
+	check_admin_referer('bulk-comments');
 
-	if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
-		$comment_status = wp_unslash( $_REQUEST['comment_status'] );
-		$delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+	if ('delete_all' == $doaction && ! empty($_REQUEST['pagegen_timestamp'])) {
+		$comment_status = wp_unslash($_REQUEST['comment_status']);
+		$delete_time = wp_unslash($_REQUEST['pagegen_timestamp']);
+		$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time));
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
+	} elseif (isset($_REQUEST['delete_comments'])) {
 		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
-	} elseif ( wp_get_referer() ) {
-		wp_safe_redirect( wp_get_referer() );
+		$doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
+	} elseif (isset($_REQUEST['ids'])) {
+		$comment_ids = array_map('absint', explode(',', $_REQUEST['ids']));
+	} elseif (wp_get_referer()) {
+		wp_safe_redirect(wp_get_referer());
 		exit;
 	}
 
 	$approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
 
-	$redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
-	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
+	$redirect_to = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer());
+	$redirect_to = add_query_arg('paged', $pagenum, $redirect_to);
 
-	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
+	foreach ($comment_ids as $comment_id) { // Check the permissions on each
+		if ( ! current_user_can('edit_comment', $comment_id))
 			continue;
 
-		switch ( $doaction ) {
+		switch ($doaction) {
 			case 'approve' :
-				wp_set_comment_status( $comment_id, 'approve' );
+				wp_set_comment_status($comment_id, 'approve');
 				$approved++;
 				break;
 			case 'unapprove' :
-				wp_set_comment_status( $comment_id, 'hold' );
+				wp_set_comment_status($comment_id, 'hold');
 				$unapproved++;
 				break;
 			case 'spam' :
-				wp_spam_comment( $comment_id );
+				wp_spam_comment($comment_id);
 				$spammed++;
 				break;
 			case 'unspam' :
-				wp_unspam_comment( $comment_id );
+				wp_unspam_comment($comment_id);
 				$unspammed++;
 				break;
 			case 'trash' :
-				wp_trash_comment( $comment_id );
+				wp_trash_comment($comment_id);
 				$trashed++;
 				break;
 			case 'untrash' :
-				wp_untrash_comment( $comment_id );
+				wp_untrash_comment($comment_id);
 				$untrashed++;
 				break;
 			case 'delete' :
-				wp_delete_comment( $comment_id );
+				wp_delete_comment($comment_id);
 				$deleted++;
 				break;
 		}
 	}
 
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
-
-	wp_safe_redirect( $redirect_to );
+	if ($approved)
+		$redirect_to = add_query_arg('approved', $approved, $redirect_to);
+	if ($unapproved)
+		$redirect_to = add_query_arg('unapproved', $unapproved, $redirect_to);
+	if ($spammed)
+		$redirect_to = add_query_arg('spammed', $spammed, $redirect_to);
+	if ($unspammed)
+		$redirect_to = add_query_arg('unspammed', $unspammed, $redirect_to);
+	if ($trashed)
+		$redirect_to = add_query_arg('trashed', $trashed, $redirect_to);
+	if ($untrashed)
+		$redirect_to = add_query_arg('untrashed', $untrashed, $redirect_to);
+	if ($deleted)
+		$redirect_to = add_query_arg('deleted', $deleted, $redirect_to);
+	if ($trashed || $spammed)
+		$redirect_to = add_query_arg('ids', join(',', $comment_ids), $redirect_to);
+
+	wp_safe_redirect($redirect_to);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -104,120 +104,120 @@ 
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
-if ( $post_id )
-	$title = sprintf( __( 'Comments on “%s”' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) );
+if ($post_id)
+	$title = sprintf(__('Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50, '…'));
 else
 	$title = __('Comments');
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'moderating-comments',
 'title'		=> __('Moderating Comments'),
 'content'	=>
-		'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Comment</strong> column, above each comment it says &#8220;Submitted on,&#8221; followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
-		'<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>'
-) );
+		'<p>'.__('A red bar on the left means the comment is waiting for you to moderate it.').'</p>'.
+		'<p>'.__('In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.').'</p>'.
+		'<p>'.__('In the <strong>Comment</strong> column, above each comment it says &#8220;Submitted on,&#8221; followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.').'</p>'.
+		'<p>'.__('In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.').'</p>'.
+		'<p>'.__('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</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/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</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
-if ( $post_id )
-	echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
-		sprintf( '<a href="%s">%s</a>',
-			get_edit_post_link( $post_id ),
-			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
+if ($post_id)
+	echo sprintf(__('Comments on &#8220;%s&#8221;'),
+		sprintf('<a href="%s">%s</a>',
+			get_edit_post_link($post_id),
+			wp_html_excerpt(_draft_or_post_title($post_id), 50, '&hellip;')
 		)
 	);
 else
-	_e( 'Comments' );
+	_e('Comments');
 
-if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	echo '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' ) ) . '</span>'; ?>
+if (isset($_REQUEST['s']) && $_REQUEST['s'])
+	echo '<span class="subtitle">'.sprintf(__('Search results for &#8220;%s&#8221;'), wp_html_excerpt(esc_html(wp_unslash($_REQUEST['s'])), 50, '&hellip;')).'</span>'; ?>
 </h1>
 
 <?php
-if ( isset( $_REQUEST['error'] ) ) {
+if (isset($_REQUEST['error'])) {
 	$error = (int) $_REQUEST['error'];
 	$error_msg = '';
-	switch ( $error ) {
+	switch ($error) {
 		case 1 :
-			$error_msg = __( 'Invalid comment ID.' );
+			$error_msg = __('Invalid comment ID.');
 			break;
 		case 2 :
-			$error_msg = __( 'You are not allowed to edit comments on this post.' );
+			$error_msg = __('You are not allowed to edit comments on this post.');
 			break;
 	}
-	if ( $error_msg )
-		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	if ($error_msg)
+		echo '<div id="moderated" class="error"><p>'.$error_msg.'</p></div>';
 }
 
-if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
-	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
-	$deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
-	$trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
-	$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
-	$spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
-	$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
-	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
+if (isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same'])) {
+	$approved  = isset($_REQUEST['approved']) ? (int) $_REQUEST['approved'] : 0;
+	$deleted   = isset($_REQUEST['deleted']) ? (int) $_REQUEST['deleted'] : 0;
+	$trashed   = isset($_REQUEST['trashed']) ? (int) $_REQUEST['trashed'] : 0;
+	$untrashed = isset($_REQUEST['untrashed']) ? (int) $_REQUEST['untrashed'] : 0;
+	$spammed   = isset($_REQUEST['spammed']) ? (int) $_REQUEST['spammed'] : 0;
+	$unspammed = isset($_REQUEST['unspammed']) ? (int) $_REQUEST['unspammed'] : 0;
+	$same      = isset($_REQUEST['same']) ? (int) $_REQUEST['same'] : 0;
 
-	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
-		if ( $approved > 0 )
-			$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+	if ($approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0) {
+		if ($approved > 0)
+			$messages[] = sprintf(_n('%s comment approved', '%s comments approved', $approved), $approved);
 
-		if ( $spammed > 0 ) {
+		if ($spammed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
-			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment marked as spam.', '%s comments marked as spam.', $spammed), $spammed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $unspammed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+		if ($unspammed > 0)
+			$messages[] = sprintf(_n('%s comment restored from the spam', '%s comments restored from the spam', $unspammed), $unspammed);
 
-		if ( $trashed > 0 ) {
+		if ($trashed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
-			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed), $trashed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $untrashed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+		if ($untrashed > 0)
+			$messages[] = sprintf(_n('%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed), $untrashed);
 
-		if ( $deleted > 0 )
-			$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+		if ($deleted > 0)
+			$messages[] = sprintf(_n('%s comment permanently deleted', '%s comments permanently deleted', $deleted), $deleted);
 
-		if ( $same > 0 && $comment = get_comment( $same ) ) {
-			switch ( $comment->comment_approved ) {
+		if ($same > 0 && $comment = get_comment($same)) {
+			switch ($comment->comment_approved) {
 				case '1' :
-					$messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already approved.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 				case 'trash' :
-					$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+					$messages[] = __('This comment is already in the Trash.').' <a href="'.esc_url(admin_url('edit-comments.php?comment_status=trash')).'"> '.__('View Trash').'</a>';
 					break;
 				case 'spam' :
-					$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already marked as spam.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 			}
 		}
 
-		echo '<div id="moderated" class="updated notice is-dismissible"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';
+		echo '<div id="moderated" class="updated notice is-dismissible"><p>'.implode("<br/>\n", $messages).'</p></div>';
 	}
 }
 ?>
@@ -226,20 +226,20 @@ 
 
 <form id="comments-form" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>
+<?php $wp_list_table->search_box(__('Search Comments'), 'comment'); ?>
 
-<?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
+<?php if ($post_id) : ?>
+<input type="hidden" name="p" value="<?php echo esc_attr(intval($post_id)); ?>" />
 <?php endif; ?>
 <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
 
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
+<input type="hidden" name="_total" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('total_items')); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('per_page')); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('page')); ?>" />
 
-<?php if ( isset($_REQUEST['paged']) ) { ?>
-	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
+<?php if (isset($_REQUEST['paged'])) { ?>
+	<input type="hidden" name="paged" value="<?php echo esc_attr(absint($_REQUEST['paged'])); ?>" />
 <?php } ?>
 
 <?php $wp_list_table->display(); ?>
@@ -251,4 +251,4 @@ 
 <?php
 wp_comment_reply('-1', true, 'detail');
 wp_comment_trashnotice();
-include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +55 added lines, -36 removed lines

@@ -8,8 +8,9 @@ 
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( !current_user_can('edit_posts') )
+if ( !current_user_can('edit_posts') ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 $wp_list_table = _get_list_table('WP_Comments_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -40,8 +41,9 @@ 
 	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
 
 	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
-			continue;
+		if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+					continue;
+		}
 
 		switch ( $doaction ) {
 			case 'approve' :
@@ -75,22 +77,30 @@ 
 		}
 	}
 
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+	if ( $approved ) {
+			$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
+	}
+	if ( $unapproved ) {
+			$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
+	}
+	if ( $spammed ) {
+			$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
+	}
+	if ( $unspammed ) {
+			$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
+	}
+	if ( $trashed ) {
+			$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
+	}
+	if ( $untrashed ) {
+			$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
+	}
+	if ( $deleted ) {
+			$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
+	}
+	if ( $trashed || $spammed ) {
+			$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+	}
 
 	wp_safe_redirect( $redirect_to );
 	exit;
@@ -104,10 +114,11 @@ 
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
-if ( $post_id )
+if ( $post_id ) {
 	$title = sprintf( __( 'Comments on “%s”' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) );
-else
+} else {
 	$title = __('Comments');
+}
 
 add_screen_option( 'per_page' );
 
@@ -141,18 +152,21 @@ 
 
 <div class="wrap">
 <h1><?php
-if ( $post_id )
+if ( $post_id ) {
 	echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
 		sprintf( '<a href="%s">%s</a>',
 			get_edit_post_link( $post_id ),
 			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
 		)
 	);
-else
+} else {
 	_e( 'Comments' );
+}
 
-if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	echo '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' ) ) . '</span>'; ?>
+if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) {
+	echo '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' ) ) . '</span>';
+}
+?>
 </h1>
 
 <?php
@@ -167,9 +181,10 @@ 
 			$error_msg = __( 'You are not allowed to edit comments on this post.' );
 			break;
 	}
-	if ( $error_msg )
-		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
-}
+	if ( $error_msg ) {
+			echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	}
+	}
 
 if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
 	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
@@ -181,27 +196,31 @@ 
 	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
 
 	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
-		if ( $approved > 0 )
-			$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+		if ( $approved > 0 ) {
+					$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+		}
 
 		if ( $spammed > 0 ) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
 		}
 
-		if ( $unspammed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+		if ( $unspammed > 0 ) {
+					$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+		}
 
 		if ( $trashed > 0 ) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
 		}
 
-		if ( $untrashed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+		if ( $untrashed > 0 ) {
+					$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+		}
 
-		if ( $deleted > 0 )
-			$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+		if ( $deleted > 0 ) {
+					$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+		}
 
 		if ( $same > 0 && $comment = get_comment( $same ) ) {
 			switch ( $comment->comment_approved ) {

src/wp-admin/widgets.php

Indentation +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Widgets administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Widgets administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -343,10 +343,10 @@ 
 
 <?php
 /**
- * Fires before the Widgets administration page content loads.
- *
- * @since 3.0.0
- */
+	 * Fires before the Widgets administration page content loads.
+	 *
+	 * @since 3.0.0
+	 */
 do_action( 'widgets_admin_page' ); ?>
 
 <div class="widget-liquid-left">

Spacing +128 added lines, -128 removed lines

@@ -7,18 +7,18 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Administration Widgets API */
-require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+require_once(ABSPATH.'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can('edit_theme_options') )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('edit_theme_options'))
+	wp_die(__('Cheatin’ uh?'), 403);
 
-$widgets_access = get_user_setting( 'widgets_access' );
-if ( isset($_GET['widgets-access']) ) {
+$widgets_access = get_user_setting('widgets_access');
+if (isset($_GET['widgets-access'])) {
 	$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
-	set_user_setting( 'widgets_access', $widgets_access );
+	set_user_setting('widgets_access', $widgets_access);
 }
 
 /**
@@ -30,13 +30,13 @@ 
 	return "$classes widgets_access ";
 }
 
-if ( 'on' == $widgets_access ) {
-	add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+if ('on' == $widgets_access) {
+	add_filter('admin_body_class', 'wp_widgets_access_body_class');
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
+	if (wp_is_mobile())
+		wp_enqueue_script('jquery-touch-punch');
 }
 
 /**
@@ -45,68 +45,68 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_setup' );
+do_action('sidebar_admin_setup');
 
-$title = __( 'Widgets' );
+$title = __('Widgets');
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.').'</p>
+	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'removing-reusing',
 'title'		=> __('Removing and Reusing'),
 'content'	=>
-	'<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.').'</p>
+	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.').'</p>
+	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'missing-widgets',
 'title'		=> __('Missing Widgets'),
 'content'	=>
-	'<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
-		'<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
-) );
+	'<p>'.__('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.').'</p>'.
+		'<p>'.__('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</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_Widgets_Screen" target="_blank">Documentation on Widgets</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ) );
+if ( ! current_theme_supports('widgets')) {
+	wp_die(__('The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.'));
 }
 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if (empty($sidebars_widgets))
 	$sidebars_widgets = wp_get_widget_defaults();
 
-foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
+foreach ($sidebars_widgets as $sidebar_id => $widgets) {
+	if ('wp_inactive_widgets' == $sidebar_id)
 		continue;
 
-	if ( !isset( $wp_registered_sidebars[ $sidebar_id ] ) ) {
-		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
+	if ( ! isset($wp_registered_sidebars[$sidebar_id])) {
+		if ( ! empty($widgets)) { // register the inactive_widgets area as sidebar
 			register_sidebar(array(
-				'name' => __( 'Inactive Sidebar (not used)' ),
+				'name' => __('Inactive Sidebar (not used)'),
 				'id' => $sidebar_id,
 				'class' => 'inactive-sidebar orphan-sidebar',
-				'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+				'description' => __('This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.'),
 				'before_widget' => '',
 				'after_widget' => '',
 				'before_title' => '',
 				'after_title' => '',
 			));
 		} else {
-			unset( $sidebars_widgets[ $sidebar_id ] );
+			unset($sidebars_widgets[$sidebar_id]);
 		}
 	}
 }
@@ -116,7 +116,7 @@ 
 	'name' => __('Inactive Widgets'),
 	'id' => 'wp_inactive_widgets',
 	'class' => 'inactive-sidebar',
-	'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+	'description' => __('Drag widgets here to remove them from the sidebar but keep their settings.'),
 	'before_widget' => '',
 	'after_widget' => '',
 	'before_title' => '',
@@ -126,46 +126,46 @@ 
 retrieve_widgets();
 
 // We're saving a widget without js
-if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+if (isset($_POST['savewidget']) || isset($_POST['removewidget'])) {
 	$widget_id = $_POST['widget-id'];
 	check_admin_referer("save-delete-widget-$widget_id");
 
 	$number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
-	if ( $number ) {
-		foreach ( $_POST as $key => $val ) {
-			if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
-				$_POST[$key] = array( $number => array_shift($val) );
+	if ($number) {
+		foreach ($_POST as $key => $val) {
+			if (is_array($val) && preg_match('/__i__|%i%/', key($val))) {
+				$_POST[$key] = array($number => array_shift($val));
 				break;
 			}
 		}
 	}
 
 	$sidebar_id = $_POST['sidebar'];
-	$position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
+	$position = isset($_POST[$sidebar_id.'_position']) ? (int) $_POST[$sidebar_id.'_position'] - 1 : 0;
 
 	$id_base = $_POST['id_base'];
 	$sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
 	// Delete.
-	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
+	if (isset($_POST['removewidget']) && $_POST['removewidget']) {
 
-		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+		if ( ! in_array($widget_id, $sidebar, true)) {
+			wp_redirect(admin_url('widgets.php?error=0'));
 			exit;
 		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff($sidebar, array($widget_id));
+		$_POST = array('sidebar' => $sidebar_id, 'widget-'.$id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
 	}
 
 	$_POST['widget-id'] = $sidebar;
 
-	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
+	foreach ((array) $wp_registered_widget_updates as $name => $control) {
+		if ($name != $id_base || ! is_callable($control['callback']))
 			continue;
 
 		ob_start();
-			call_user_func_array( $control['callback'], $control['params'] );
+			call_user_func_array($control['callback'], $control['params']);
 		ob_end_clean();
 
 		break;
@@ -174,36 +174,36 @@ 
 	$sidebars_widgets[$sidebar_id] = $sidebar;
 
 	// Remove old position.
-	if ( !isset($_POST['delete_widget']) ) {
-		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+	if ( ! isset($_POST['delete_widget'])) {
+		foreach ($sidebars_widgets as $key => $sb) {
+			if (is_array($sb))
+				$sidebars_widgets[$key] = array_diff($sb, array($widget_id));
 		}
-		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+		array_splice($sidebars_widgets[$sidebar_id], $position, 0, $widget_id);
 	}
 
 	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Output the widget form without js
-if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+if (isset($_GET['editwidget']) && $_GET['editwidget']) {
 	$widget_id = $_GET['editwidget'];
 
-	if ( isset($_GET['addnew']) ) {
+	if (isset($_GET['addnew'])) {
 		// Default to the first sidebar
-		$keys = array_keys( $wp_registered_sidebars );
-		$sidebar = reset( $keys );
+		$keys = array_keys($wp_registered_sidebars);
+		$sidebar = reset($keys);
 
-		if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+		if (isset($_GET['base']) && isset($_GET['num'])) { // multi-widget
 			// Copy minimal info from an existing instance of this widget to a new instance
-			foreach ( $wp_registered_widget_controls as $control ) {
-				if ( $_GET['base'] === $control['id_base'] ) {
+			foreach ($wp_registered_widget_controls as $control) {
+				if ($_GET['base'] === $control['id_base']) {
 					$control_callback = $control['callback'];
 					$multi_number = (int) $_GET['num'];
 					$control['params'][0]['number'] = -1;
-					$widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
+					$widget_id = $control['id'] = $control['id_base'].'-'.$multi_number;
 					$wp_registered_widget_controls[$control['id']] = $control;
 					break;
 				}
@@ -211,66 +211,66 @@ 
 		}
 	}
 
-	if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
+	if (isset($wp_registered_widget_controls[$widget_id]) && ! isset($control)) {
 		$control = $wp_registered_widget_controls[$widget_id];
 		$control_callback = $control['callback'];
-	} elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
-		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+	} elseif ( ! isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id])) {
+		$name = esc_html(strip_tags($wp_registered_widgets[$widget_id]['name']));
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( ! isset($name))
+		$name = esc_html(strip_tags($control['name']));
 
-	if ( !isset($sidebar) )
+	if ( ! isset($sidebar))
 		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-	if ( !isset($multi_number) )
+	if ( ! isset($multi_number))
 		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
 	// Show the widget form.
-	$width = ' style="width:' . max($control['width'], 350) . 'px"';
+	$width = ' style="width:'.max($control['width'], 350).'px"';
 	$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-	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 ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
-	<h3><?php printf( __( 'Widget %s' ), $name ); ?></h3>
+	<h3><?php printf(__('Widget %s'), $name); ?></h3>
 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
+	if (is_callable($control_callback))
+		call_user_func_array($control_callback, $control['params']);
 	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo '<p>'.__('There are no options for this widget.')."</p>\n"; ?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
 	<div class="widget-position">
 	<table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
 <?php
-	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+	foreach ($wp_registered_sidebars as $sbname => $sbvalue) {
+		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='".esc_attr($sbname)."'".checked($sbname, $sidebar, false)." /> $sbvalue[name]</label></td><td>";
+		if ('wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr($sbname, 0, 16)) {
 			echo '&nbsp;';
 		} else {
-			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
+			if ( ! isset($sidebars_widgets[$sbname]) || ! is_array($sidebars_widgets[$sbname])) {
 				$j = 1;
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
+				if (isset($_GET['addnew']) || ! in_array($widget_id, $sidebars_widgets[$sbname], true))
 					$j++;
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
-			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
-			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+			echo "\t\t<option value=''>".__('&mdash; Select &mdash;')."</option>\n";
+			for ($i = 1; $i <= $j; $i++) {
+				if (in_array($widget_id, $sidebars_widgets[$sbname], true))
+					$selected = selected($i, $key + 1, false);
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -282,13 +282,13 @@ 
 
 	<div class="widget-control-actions">
 <?php
-	if ( isset($_GET['addnew']) ) { ?>
+	if (isset($_GET['addnew'])) { ?>
 	<a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
 <?php
 	} else {
-		submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
+		submit_button(__('Delete'), 'button alignleft', 'removewidget', false);
 	}
-	submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
+	submit_button(__('Save Widget'), 'button-primary alignright', 'savewidget', false); ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
@@ -299,7 +299,7 @@ 
 	</div>
 	</div>
 <?php
-	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -312,32 +312,32 @@ 
 	__('Error in displaying the widget settings form.')
 );
 
-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 );
-	if ( current_user_can( 'customize' ) ) {
+	echo esc_html($title);
+	if (current_user_can('customize')) {
 		printf(
 			' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg(
+			esc_url(add_query_arg(
 				array(
-					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+					array('autofocus' => array('panel' => 'widgets')),
+					'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI']))
 				),
-				admin_url( 'customize.php' )
-			) ),
-			__( 'Manage in Customizer' )
+				admin_url('customize.php')
+			)),
+			__('Manage in Customizer')
 		);
 	}
 ?>
 </h1>
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<?php if (isset($_GET['message']) && isset($messages[$_GET['message']])) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
+<?php if (isset($_GET['error']) && isset($errors[$_GET['error']])) { ?>
 <div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
 <?php } ?>
 
@@ -347,7 +347,7 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'widgets_admin_page' ); ?>
+do_action('widgets_admin_page'); ?>
 
 <div class="widget-liquid-left">
 <div id="widgets-left">
@@ -371,16 +371,16 @@ 
 <?php
 
 $theme_sidebars = array();
-foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+foreach ($wp_registered_sidebars as $sidebar => $registered_sidebar) {
+	if (false !== strpos($registered_sidebar['class'], 'inactive-sidebar') || 'orphaned_widgets' == substr($sidebar, 0, 16)) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( ! empty($registered_sidebar['class']))
+			$wrap_class .= ' '.$registered_sidebar['class'];
 
 		?>
-		<div class="<?php echo esc_attr( $wrap_class ); ?>">
+		<div class="<?php echo esc_attr($wrap_class); ?>">
 			<div class="widget-holder inactive">
-				<?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+				<?php wp_list_widget_controls($registered_sidebar['id'], $registered_sidebar['name']); ?>
 				<div class="clear"></div>
 			</div>
 		</div>
@@ -398,10 +398,10 @@ 
 
 $i = $split = 0;
 $single_sidebar_class = '';
-$sidebars_count = count( $theme_sidebars );
+$sidebars_count = count($theme_sidebars);
 
-if ( $sidebars_count > 1 ) {
-	$split = ceil( $sidebars_count / 2 );
+if ($sidebars_count > 1) {
+	$split = ceil($sidebars_count / 2);
 } else {
 	$single_sidebar_class = ' class="single-sidebar"';
 }
@@ -412,23 +412,23 @@ 
 <div class="sidebars-column-1">
 <?php
 
-foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+foreach ($theme_sidebars as $sidebar => $registered_sidebar) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( ! empty($registered_sidebar['class']))
+		$wrap_class .= ' sidebar-'.$registered_sidebar['class'];
 
-	if ( $i > 0 )
+	if ($i > 0)
 		$wrap_class .= ' closed';
 
-	if ( $split && $i == $split ) {
+	if ($split && $i == $split) {
 		?>
 		</div><div class="sidebars-column-2">
 		<?php
 	}
 
 	?>
-	<div class="<?php echo esc_attr( $wrap_class ); ?>">
-		<?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
+	<div class="<?php echo esc_attr($wrap_class); ?>">
+		<?php wp_list_widget_controls($sidebar, $registered_sidebar['name']); // Show the control forms for each of the widgets in this sidebar ?>
 	</div>
 	<?php
 
@@ -440,7 +440,7 @@ 
 </div>
 </div>
 <form method="post">
-<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+<?php wp_nonce_field('save-sidebar-widgets', '_wpnonce_widgets', false); ?>
 </form>
 <br class="clear" />
 </div>
@@ -448,8 +448,8 @@ 
 <div class="widgets-chooser">
 	<ul class="widgets-chooser-sidebars"></ul>
 	<div class="widgets-chooser-actions">
-		<button class="button-secondary"><?php _e( 'Cancel' ); ?></button>
-		<button class="button-primary"><?php _e( 'Add Widget' ); ?></button>
+		<button class="button-secondary"><?php _e('Cancel'); ?></button>
+		<button class="button-primary"><?php _e('Add Widget'); ?></button>
 	</div>
 </div>
 
@@ -460,5 +460,5 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_page' );
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+do_action('sidebar_admin_page');
+require_once(ABSPATH.'wp-admin/admin-footer.php');

Braces +47 added lines, -31 removed lines

@@ -12,8 +12,9 @@ 
 /** WordPress Administration Widgets API */
 require_once(ABSPATH . 'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can('edit_theme_options') )
+if ( ! current_user_can('edit_theme_options') ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 $widgets_access = get_user_setting( 'widgets_access' );
 if ( isset($_GET['widgets-access']) ) {
@@ -35,9 +36,10 @@ 
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
-}
+	if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+	}
+	}
 
 /**
  * Fires early before the Widgets administration screen loads,
@@ -86,12 +88,14 @@ 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if ( empty( $sidebars_widgets ) ) {
 	$sidebars_widgets = wp_get_widget_defaults();
+}
 
 foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
-		continue;
+	if ( 'wp_inactive_widgets' == $sidebar_id ) {
+			continue;
+	}
 
 	if ( !isset( $wp_registered_sidebars[ $sidebar_id ] ) ) {
 		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
@@ -161,8 +165,9 @@ 
 	$_POST['widget-id'] = $sidebar;
 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
-			continue;
+		if ( $name != $id_base || !is_callable($control['callback']) ) {
+					continue;
+		}
 
 		ob_start();
 			call_user_func_array( $control['callback'], $control['params'] );
@@ -176,8 +181,9 @@ 
 	// Remove old position.
 	if ( !isset($_POST['delete_widget']) ) {
 		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			if ( is_array($sb) ) {
+							$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			}
 		}
 		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
 	}
@@ -218,14 +224,17 @@ 
 		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( !isset($name) ) {
+			$name = esc_html( strip_tags($control['name']) );
+	}
 
-	if ( !isset($sidebar) )
-		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	if ( !isset($sidebar) ) {
+			$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	}
 
-	if ( !isset($multi_number) )
-		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	if ( !isset($multi_number) ) {
+			$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	}
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
@@ -242,10 +251,12 @@ 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
-	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+	if ( is_callable( $control_callback ) ) {
+			call_user_func_array( $control_callback, $control['params'] );
+	} else {
+			echo '<p>' . __('There are no options for this widget.') . "</p>\n";
+	}
+	?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
@@ -262,15 +273,17 @@ 
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$j++;
+				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$j++;
+				}
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
 			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
 			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$selected = selected( $i, $key + 1, false );
+				}
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -374,8 +387,9 @@ 
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( !empty( $registered_sidebar['class'] ) ) {
+					$wrap_class .= ' ' . $registered_sidebar['class'];
+		}
 
 		?>
 		<div class="<?php echo esc_attr( $wrap_class ); ?>">
@@ -414,11 +428,13 @@ 
 
 foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( !empty( $registered_sidebar['class'] ) ) {
+			$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	}
 
-	if ( $i > 0 )
-		$wrap_class .= ' closed';
+	if ( $i > 0 ) {
+			$wrap_class .= ' closed';
+	}
 
 	if ( $split && $i == $split ) {
 		?>

src/wp-admin/ms-themes.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/plugin-install.php

Spacing +43 added lines, -43 removed lines

@@ -6,55 +6,55 @@ 
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
-	define( 'IFRAME_REQUEST', true );
+if ( ! defined('IFRAME_REQUEST') && isset($_GET['tab']) && ('plugin-information' == $_GET['tab']))
+	define('IFRAME_REQUEST', true);
 
 /**
  * WordPress Administration Bootstrap.
  */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('install_plugins') )
+if ( ! current_user_can('install_plugins'))
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'plugin-install.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('plugin-install.php'));
 	exit();
 }
 
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
-if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-	$location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+if ( ! empty($_REQUEST['_wp_http_referer'])) {
+	$location = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-	if ( ! empty( $_REQUEST['paged'] ) ) {
-		$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+	if ( ! empty($_REQUEST['paged'])) {
+		$location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
 }
 
 $wp_list_table->prepare_items();
 
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
 
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
 
-$title = __( 'Add Plugins' );
+$title = __('Add Plugins');
 $parent_file = 'plugins.php';
 
-wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
+wp_enqueue_script('plugin-install');
+if ('plugin-information' != $tab)
 	add_thickbox();
 
 $body_id = $tab;
 
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('updates');
 
 /**
  * Fires before each tab on the Install Plugins screen is loaded.
@@ -64,54 +64,54 @@ 
  *
  * @since 2.7.0
  */
-do_action( "install_plugins_pre_$tab" );
+do_action("install_plugins_pre_$tab");
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'adding-plugins',
 'title'		=> __('Adding Plugins'),
 'content'	=>
-	'<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
-	'<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
-	'<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
-	'<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
-) );
+	'<p>'.__('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.').'</p>'.
+	'<p>'.__('If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.').'</p>'.
+	'<p>'.__('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.').'</p>'.
+	'<p>'.__('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</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/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 /**
  * WordPress Administration Template Header.
  */
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
 <h1>
 	<?php
-	echo esc_html( $title );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
-		if ( $tab === 'upload' ) {
-			$href = self_admin_url( 'plugin-install.php' );
-			$text = _x( 'Browse', 'plugins' );
+	echo esc_html($title);
+	if ( ! empty($tabs['upload']) && current_user_can('upload_plugins')) {
+		if ($tab === 'upload') {
+			$href = self_admin_url('plugin-install.php');
+			$text = _x('Browse', 'plugins');
 		} else {
-			$href = self_admin_url( 'plugin-install.php?tab=upload' );
-			$text = __( 'Upload Plugin' );
+			$href = self_admin_url('plugin-install.php?tab=upload');
+			$text = __('Upload Plugin');
 		}
-		echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>';
+		echo ' <a href="'.$href.'" class="upload page-title-action">'.$text.'</a>';
 	}
 	?>
 </h1>
 
 <?php
-if ( $tab !== 'upload' ) {
+if ($tab !== 'upload') {
 	$wp_list_table->views();
 	echo '<br class="clear" />';
 }
@@ -126,7 +126,7 @@ 
  *
  * @param int $paged The current page number of the plugins list table.
  */
-do_action( "install_plugins_$tab", $paged ); ?>
+do_action("install_plugins_$tab", $paged); ?>
 </div>
 
 <?php
@@ -135,4 +135,4 @@ 
 /**
  * WordPress Administration Template Footer.
  */
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +6 added lines, -3 removed lines

@@ -6,16 +6,18 @@ 
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /**
  * WordPress Administration Bootstrap.
  */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('install_plugins') )
+if ( ! current_user_can('install_plugins') ) {
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-install.php' ) );
@@ -49,8 +51,9 @@ 
 $parent_file = 'plugins.php';
 
 wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
+if ( 'plugin-information' != $tab ) {
 	add_thickbox();
+}
 
 $body_id = $tab;
 

src/wp-admin/admin-ajax.php

Spacing +20 added lines, -20 removed lines

@@ -13,35 +13,35 @@ 
  *
  * @since 2.1.0
  */
-define( 'DOING_AJAX', true );
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+define('DOING_AJAX', true);
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 /** Allow for cross-domain requests (from the frontend). */
 send_origin_headers();
 
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
-	die( '0' );
+if (empty($_REQUEST['action']))
+	die('0');
 
 /** Load WordPress Administration APIs */
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** Load Ajax Handlers for WordPress Core */
-require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+require_once(ABSPATH.'wp-admin/includes/ajax-actions.php');
 
-@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-@header( 'X-Robots-Tag: noindex' );
+@header('Content-Type: text/html; charset='.get_option('blog_charset'));
+@header('X-Robots-Tag: noindex');
 
 send_nosniff_header();
 nocache_headers();
 
 /** This action is documented in wp-admin/admin.php */
-do_action( 'admin_init' );
+do_action('admin_init');
 
 $core_actions_get = array(
 	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
@@ -69,15 +69,15 @@ 
 $core_actions_post[] = 'wp-fullscreen-save-post';
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
-	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+if ( ! empty($_GET['action']) && in_array($_GET['action'], $core_actions_get))
+	add_action('wp_ajax_'.$_GET['action'], 'wp_ajax_'.str_replace('-', '_', $_GET['action']), 1);
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
-	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+if ( ! empty($_POST['action']) && in_array($_POST['action'], $core_actions_post))
+	add_action('wp_ajax_'.$_POST['action'], 'wp_ajax_'.str_replace('-', '_', $_POST['action']), 1);
 
-add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
+add_action('wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1);
 
-if ( is_user_logged_in() ) {
+if (is_user_logged_in()) {
 	/**
 	 * Fires authenticated AJAX actions for logged-in users.
 	 *
@@ -86,7 +86,7 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_ajax_' . $_REQUEST['action'] );
+	do_action('wp_ajax_'.$_REQUEST['action']);
 } else {
 	/**
 	 * Fires non-authenticated AJAX actions for logged-out users.
@@ -96,7 +96,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+	do_action('wp_ajax_nopriv_'.$_REQUEST['action']);
 }
 // Default status
-die( '0' );
+die('0');

Braces +6 added lines, -3 removed lines

@@ -25,8 +25,9 @@ 
 send_origin_headers();
 
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
 	die( '0' );
+}
 
 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -69,11 +70,13 @@ 
 $core_actions_post[] = 'wp-fullscreen-save-post';
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
 	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
 	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+}
 
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 

src/wp-admin/options-writing.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Writing settings administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Writing settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +33 added lines, -33 removed lines

@@ -7,56 +7,56 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
 $title = __('Writing Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_post_by_email_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-postemail',
-		'title'   => __( 'Post Via Email' ),
-		'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
-	) );
+		'title'   => __('Post Via Email'),
+		'content' => '<p>'.__('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.').'</p>',
+	));
 }
 
 /** This filter is documented in wp-admin/options-writing.php */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_update_services_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-services',
-		'title'   => __( 'Update Services' ),
-		'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
-	) );
+		'title'   => __('Update Services'),
+		'content' => '<p>'.__('If desired, WordPress will automatically alert various services of your new posts.').'</p>',
+	));
 }
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</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/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
 
 <table class="form-table">
-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php if (get_site_option('initial_db_version') < 32453) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
@@ -77,21 +77,21 @@ 
 </tr>
 <?php
 $post_formats = get_post_format_strings();
-unset( $post_formats['standard'] );
+unset($post_formats['standard']);
 ?>
 <tr>
 <th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
 <td>
 	<select name="default_post_format" id="default_post_format">
-		<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
-<?php foreach ( $post_formats as $format_slug => $format_name ): ?>
-		<option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
+		<option value="0"><?php echo get_post_format_string('standard'); ?></option>
+<?php foreach ($post_formats as $format_slug => $format_name): ?>
+		<option<?php selected(get_option('default_post_format'), $format_slug); ?> value="<?php echo esc_attr($format_slug); ?>"><?php echo esc_html($format_name); ?></option>
 <?php endforeach; ?>
 	</select>
 </td>
 </tr>
 <?php
-if ( get_option( 'link_manager_enabled' ) ) :
+if (get_option('link_manager_enabled')) :
 ?>
 <tr>
 <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
@@ -111,7 +111,7 @@ 
 
 <?php
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+if (apply_filters('enable_post_by_email_configuration', true)) {
 ?>
 <h3 class="title"><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
@@ -154,15 +154,15 @@ 
  *
  * @param bool $enable Whether to enable the Update Services settings area. Default true.
  */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
+if (apply_filters('enable_update_services_configuration', true)) {
 ?>
 <h3 class="title"><?php _e('Update Services') ?></h3>
 
-<?php if ( 1 == get_option('blog_public') ) : ?>
+<?php if (1 == get_option('blog_public')) : ?>
 
 <p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></label></p>
 
-<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
+<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea(get_option('ping_sites')); ?></textarea>
 
 <?php else : ?>
 
@@ -177,4 +177,4 @@ 
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +7 added lines, -3 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('Writing Settings');
 $parent_file = 'options-general.php';
@@ -164,9 +165,12 @@ 
 
 <textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
 
-<?php else : ?>
+<?php else {
+	: ?>
 
-	<p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">visibility settings</a>.'), 'options-reading.php'); ?></p>
+	<p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">visibility settings</a>.'), 'options-reading.php');
+}
+?></p>
 
 <?php endif; ?>
 <?php } // multisite ?>