ntwb / wordpress

src/wp-admin/options-general.php

Indentation +16 added lines, -16 removed lines

@@ -224,7 +224,7 @@ 
 		$right_now = time();
 		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
 			if ( $tr['ts'] > $right_now ) {
-			    $found = true;
+				$found = true;
 				break;
 			}
 		}
@@ -254,13 +254,13 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 	/**
-	* Filter the default date formats.
-	*
-	* @since 2.7.0
-	* @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-	*
-	* @param array $default_date_formats Array of default date formats.
-	*/
+	 * Filter the default date formats.
+	 *
+	 * @since 2.7.0
+	 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+	 *
+	 * @param array $default_date_formats Array of default date formats.
+	 */
 	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
 
 	$custom = true;
@@ -288,12 +288,12 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 	/**
-	* Filter the default time formats.
-	*
-	* @since 2.7.0
-	*
-	* @param array $default_time_formats Array of default time formats.
-	*/
+	 * Filter the default time formats.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param array $default_time_formats Array of default time formats.
+	 */
 	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
 
 	$custom = true;
@@ -322,8 +322,8 @@ 
 <td><select name="start_of_week" id="start_of_week">
 <?php
 /**
- * @global WP_Locale $wp_locale
- */
+	 * @global WP_Locale $wp_locale
+	 */
 global $wp_locale;
 
 for ($day_index = 0; $day_index <= 6; $day_index++) :

Spacing +77 added lines, -78 removed lines

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

Braces +26 added lines, -16 removed lines

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

src/wp-admin/maint/repair.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Database Repair and Optimization Script.
- *
- * @package WordPress
- * @subpackage Database
- */
+			 * Database Repair and Optimization Script.
+			 *
+			 * @package WordPress
+			 * @subpackage Database
+			 */
 define('WP_REPAIRING', true);
 
 require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );

Spacing +48 added lines, -48 removed lines

@@ -7,36 +7,36 @@ 
  */
 define('WP_REPAIRING', true);
 
-require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );
+require_once(dirname(dirname(dirname(__FILE__))).'/wp-load.php');
 
-header( 'Content-Type: text/html; charset=utf-8' );
+header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Database Repair'); ?></title>
 	<?php
-	wp_admin_css( 'install', true );
+	wp_admin_css('install', true);
 	?>
 </head>
 <body class="wp-core-ui">
-<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
 
-if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
-	echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
+if ( ! defined('WP_ALLOW_REPAIR')) {
+	echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.')."</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 
 	$default_key     = 'put your unique phrase here';
 	$missing_key     = false;
 	$duplicated_keys = array();
 
-	foreach ( array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' ) as $key ) {
-		if ( defined( $key ) ) {
+	foreach (array('AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT') as $key) {
+		if (defined($key)) {
 			// Check for unique values of each key.
-			$duplicated_keys[ constant( $key ) ] = isset( $duplicated_keys[ constant( $key ) ] );
+			$duplicated_keys[constant($key)] = isset($duplicated_keys[constant($key)]);
 		} else {
 			// If a constant is not defined, it's missing.
 			$missing_key = true;
@@ -44,19 +44,19 @@ 
 	}
 
 	// If at least one key uses the default value, consider it duplicated.
-	if ( isset( $duplicated_keys[ $default_key ] ) ) {
-		$duplicated_keys[ $default_key ] = true;
+	if (isset($duplicated_keys[$default_key])) {
+		$duplicated_keys[$default_key] = true;
 	}
 
 	// Weed out all unique, non-default values.
-	$duplicated_keys = array_filter( $duplicated_keys );
+	$duplicated_keys = array_filter($duplicated_keys);
 
-	if ( $duplicated_keys || $missing_key ) {
+	if ($duplicated_keys || $missing_key) {
 		// Translators: 1: wp-config.php; 2: Secret key service URL.
-		echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
+		echo '<p>'.sprintf(__('While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.'), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/').'</p>';
 	}
 
-} elseif ( isset( $_GET['repair'] ) ) {
+} elseif (isset($_GET['repair'])) {
 	$optimize = 2 == $_GET['repair'];
 	$okay = true;
 	$problems = array();
@@ -64,9 +64,9 @@ 
 	$tables = $wpdb->tables();
 
 	// Sitecategories may not exist if global terms are disabled.
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->sitecategories ) );
-	if ( is_multisite() && ! $wpdb->get_var( $query ) ) {
-		unset( $tables['sitecategories'] );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->sitecategories));
+	if (is_multisite() && ! $wpdb->get_var($query)) {
+		unset($tables['sitecategories']);
 	}
 
 	/**
@@ -76,75 +76,75 @@ 
 	 *
 	 * @param array $tables Array of prefixed table names to be repaired.
 	 */
-	$tables = array_merge( $tables, (array) apply_filters( 'tables_to_repair', array() ) );
+	$tables = array_merge($tables, (array) apply_filters('tables_to_repair', array()));
 
 	// Loop over the tables, checking and repairing as needed.
-	foreach ( $tables as $table ) {
-		$check = $wpdb->get_row( "CHECK TABLE $table" );
+	foreach ($tables as $table) {
+		$check = $wpdb->get_row("CHECK TABLE $table");
 
 		echo '<p>';
-		if ( 'OK' == $check->Msg_text ) {
+		if ('OK' == $check->Msg_text) {
 			/* translators: %s: table name */
-			printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
+			printf(__('The %s table is okay.'), "<code>$table</code>");
 		} else {
 			/* translators: 1: table name, 2: error message, */
-			printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
+			printf(__('The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;'), "<code>$table</code>", "<code>$check->Msg_text</code>");
 
-			$repair = $wpdb->get_row( "REPAIR TABLE $table" );
+			$repair = $wpdb->get_row("REPAIR TABLE $table");
 
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			if ( 'OK' == $check->Msg_text ) {
+			if ('OK' == $check->Msg_text) {
 				/* translators: %s: table name */
-				printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
+				printf(__('Successfully repaired the %s table.'), "<code>$table</code>");
 			} else {
 				/* translators: 1: table name, 2: error message, */
-				echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
+				echo sprintf(__('Failed to repair the %1$s table. Error: %2$s'), "<code>$table</code>", "<code>$check->Msg_text</code>").'<br />';
 				$problems[$table] = $check->Msg_text;
 				$okay = false;
 			}
 		}
 
-		if ( $okay && $optimize ) {
-			$check = $wpdb->get_row( "ANALYZE TABLE $table" );
+		if ($okay && $optimize) {
+			$check = $wpdb->get_row("ANALYZE TABLE $table");
 
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			if ( 'Table is already up to date' == $check->Msg_text )  {
+			if ('Table is already up to date' == $check->Msg_text) {
 				/* translators: %s: table name */
-				printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
+				printf(__('The %s table is already optimized.'), "<code>$table</code>");
 			} else {
-				$check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
+				$check = $wpdb->get_row("OPTIMIZE TABLE $table");
 
 				echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-				if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
+				if ('OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text) {
 					/* translators: %s: table name */
-					printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
+					printf(__('Successfully optimized the %s table.'), "<code>$table</code>");
 				} else {
 					/* translators: 1: table name, 2: error message, */
-					printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
+					printf(__('Failed to optimize the %1$s table. Error: %2$s'), "<code>$table</code>", "<code>$check->Msg_text</code>");
 				}
 			}
 		}
 		echo '</p>';
 	}
 
-	if ( $problems ) {
-		printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
+	if ($problems) {
+		printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', __('https://wordpress.org/support/forum/how-to-and-troubleshooting'));
 		$problem_output = '';
-		foreach ( $problems as $table => $problem )
+		foreach ($problems as $table => $problem)
 			$problem_output .= "$table: $problem\n";
-		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
+		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">'.esc_textarea($problem_output).'</textarea></p>';
 	} else {
-		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
+		echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
-		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
+	if (isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'])
+		echo '<p>'.__('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.').'</p>';
 	else
-		echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
+		echo '<p>'.__('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.').'</p>';
 ?>
-	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
-	<p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
-	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
+	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e('Repair Database'); ?></a></p>
+	<p><?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?></p>
+	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e('Repair and Optimize Database'); ?></a></p>
 <?php
 }
 ?>

Braces +9 added lines, -7 removed lines

@@ -130,18 +130,20 @@
 	if ( $problems ) {
 		printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
 		$problem_output = '';
-		foreach ( $problems as $table => $problem )
-			$problem_output .= "$table: $problem\n";
+		foreach ( $problems as $table => $problem ) {
+					$problem_output .= "$table: $problem\n";
+		}
 		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
 	} else {
 		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
-		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
-	else
-		echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
-?>
+	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) {
+			echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
+	} else {
+			echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
+	}
+	?>
 	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
 	<p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
 	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>

src/wp-admin/comment.php

Indentation +5 added lines, -5 removed lines

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

Spacing +97 added lines, -97 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -16,20 +16,20 @@ 
  * @global string $action
  */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars(array('action'));
 
-if ( isset( $_POST['deletecomment'] ) )
+if (isset($_POST['deletecomment']))
 	$action = 'deletecomment';
 
-if ( 'cdc' == $action )
+if ('cdc' == $action)
 	$action = 'delete';
-elseif ( 'mac' == $action )
+elseif ('mac' == $action)
 	$action = 'approve';
 
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+if (isset($_GET['dt'])) {
+	if ('spam' == $_GET['dt'])
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	elseif ('trash' == $_GET['dt'])
 		$action = 'trash';
 }
 
@@ -38,48 +38,48 @@ 
  *
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {
+function comment_footer_die($msg) {
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	die;
 }
 
-switch( $action ) {
+switch ($action) {
 
 case 'editcomment' :
 	$title = __('Edit Comment');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
+			'<p>'.__('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.').'</p>'.
+			'<p>'.__('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.').'</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://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://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'javascript:history.go(-1)'));
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('You are not allowed to edit this comment.') );
+	if ( ! current_user_can('edit_comment', $comment_id))
+		comment_footer_die(__('You are not allowed to edit this comment.'));
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ('trash' == $comment->comment_approved)
+		comment_footer_die(__('This comment is in the Trash. Please move it out of the Trash if you want to edit it.'));
 
-	$comment = get_comment_to_edit( $comment_id );
+	$comment = get_comment_to_edit($comment_id);
 
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+	include(ABSPATH.'wp-admin/edit-form-comment.php');
 
 	break;
 
@@ -90,40 +90,40 @@ 
 
 	$title = __('Moderate Comment');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( !$comment = get_comment_to_edit( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
+	if ( ! $comment = get_comment_to_edit($comment_id)) {
+		wp_redirect(admin_url('edit-comments.php?error=1'));
 		die();
 	}
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
+		wp_redirect(admin_url('edit-comments.php?error=2'));
 		die();
 	}
 
 	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+	if ($action == str_replace('1', 'approve', $comment->comment_approved)) {
+		wp_redirect(admin_url('edit-comments.php?same='.$comment_id));
 		die();
  	}
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$formaction    = $action . 'comment';
+	$formaction    = $action.'comment';
 	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 	$nonce_action .= $comment_id;
 
 ?>
 <div class="wrap">
 
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-switch ( $action ) {
+switch ($action) {
 	case 'spam' :
 		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
+		$button      = _x('Mark as Spam', 'comment');
 		break;
 	case 'trash' :
 		$caution_msg = __('You are about to move the following comment to the Trash:');
@@ -139,9 +139,9 @@ 
 		break;
 }
 
-if ( $comment->comment_approved != '0' ) { // if not unapproved
+if ($comment->comment_approved != '0') { // if not unapproved
 	$message = '';
-	switch ( $comment->comment_approved ) {
+	switch ($comment->comment_approved) {
 		case '1' :
 			$message = __('This comment is currently approved.');
 			break;
@@ -152,8 +152,8 @@ 
 			$message  = __('This comment is currently in the Trash.');
 			break;
 	}
-	if ( $message ) {
-		echo '<div class="notice notice-info"><p>' . $message . '</p></div>';
+	if ($message) {
+		echo '<div class="notice notice-info"><p>'.$message.'</p></div>';
 	}
 }
 ?>
@@ -164,50 +164,50 @@ 
 <th scope="row"><?php _e('Author'); ?></th>
 <td><?php echo $comment->comment_author; ?></td>
 </tr>
-<?php if ( $comment->comment_author_email ) { ?>
+<?php if ($comment->comment_author_email) { ?>
 <tr>
 <th scope="row"><?php _e('E-mail'); ?></th>
 <td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>
-<?php if ( $comment->comment_author_url ) { ?>
+<?php if ($comment->comment_author_url) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
 <td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+	<th scope="row"><?php /* translators: column name or table row header */ _e('In Response To'); ?></th>
 	<td>
 	<?php
 		$post_id = $comment->comment_post_ID;
-		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+		if (current_user_can('edit_post', $post_id)) {
+			$post_link = "<a href='".esc_url(get_edit_post_link($post_id))."'>";
+			$post_link .= esc_html(get_the_title($post_id)).'</a>';
 		} else {
-			$post_link = esc_html( get_the_title( $post_id ) );
+			$post_link = esc_html(get_the_title($post_id));
 		}
 		echo $post_link;
 
-		if ( $comment->comment_parent ) {
-			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
-			$name        = get_comment_author( $parent->comment_ID );
-			printf( ' | ' . __( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
+		if ($comment->comment_parent) {
+			$parent      = get_comment($comment->comment_parent);
+			$parent_link = esc_url(get_comment_link($comment->comment_parent));
+			$name        = get_comment_author($parent->comment_ID);
+			printf(' | '.__('In reply to <a href="%1$s">%2$s</a>.'), $parent_link, $name);
 		}
 	?>
 	</td>
 </tr>
 <tr>
-	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
+	<th scope="row"><?php _e('Submitted on'); ?></th>
 	<td>
 	<?php
 		/* translators: 2: comment date, 3: comment time */
-		printf( __( '<a href="%1$s">%2$s at %3$s</a>' ),
-			esc_url( get_comment_link( $comment->comment_ID ) ),
+		printf(__('<a href="%1$s">%2$s at %3$s</a>'),
+			esc_url(get_comment_link($comment->comment_ID)),
 			/* translators: comment date format. See http://php.net/date */
-			get_comment_date( __( 'Y/m/d' ) ),
-			get_comment_date( get_option( 'time_format' ) )
+			get_comment_date(__('Y/m/d')),
+			get_comment_date(get_option('time_format'))
 		);
 	?>
 	</td>
@@ -221,11 +221,11 @@ 
 <form action="comment.php" method="get" class="comment-ays-submit">
 
 <p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a></td>
+	<?php submit_button($button, 'primary', 'submit', false); ?>
+	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e('Cancel'); ?></a></td>
 </p>
 
-<?php wp_nonce_field( $nonce_action ); ?>
+<?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
 <input type="hidden" name="noredir" value="1" />
@@ -242,75 +242,75 @@ 
 case 'unspamcomment'    :
 case 'approvecomment'   :
 case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	$comment_id = absint($_REQUEST['c']);
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
+	if (in_array($action, array('approvecomment', 'unapprovecomment')))
+		check_admin_referer('approve-comment_'.$comment_id);
 	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		check_admin_referer('delete-comment_'.$comment_id);
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('You are not allowed to edit comments on this post.') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'edit-comments.php'));
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
+		comment_footer_die(__('You are not allowed to edit comments on this post.'));
 
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+	if ('' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php'))
 		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
+	elseif ('' != wp_get_original_referer() && ! $noredir)
 		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	elseif (in_array($action, array('approvecomment', 'unapprovecomment')))
+		$redir = admin_url('edit-comments.php?p='.absint($comment->comment_post_ID));
 	else
 		$redir = admin_url('edit-comments.php');
 
-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+	$redir = remove_query_arg(array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir);
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'deletecomment' :
-			wp_delete_comment( $comment_id );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			wp_delete_comment($comment_id);
+			$redir = add_query_arg(array('deleted' => '1'), $redir);
 			break;
 		case 'trashcomment' :
 			wp_trash_comment($comment_id);
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			$redir = add_query_arg(array('trashed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'untrashcomment' :
 			wp_untrash_comment($comment_id);
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			$redir = add_query_arg(array('untrashed' => '1'), $redir);
 			break;
 		case 'spamcomment' :
 			wp_spam_comment($comment_id);
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			$redir = add_query_arg(array('spammed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'unspamcomment' :
 			wp_unspam_comment($comment_id);
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			$redir = add_query_arg(array('unspammed' => '1'), $redir);
 			break;
 		case 'approvecomment' :
-			wp_set_comment_status( $comment_id, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			wp_set_comment_status($comment_id, 'approve');
+			$redir = add_query_arg(array('approved' => 1), $redir);
 			break;
 		case 'unapprovecomment' :
-			wp_set_comment_status( $comment_id, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+			wp_set_comment_status($comment_id, 'hold');
+			$redir = add_query_arg(array('unapproved' => 1), $redir);
 			break;
 	}
 
-	wp_redirect( $redir );
+	wp_redirect($redir);
 	die;
 
 case 'editedcomment' :
 
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+	$comment_id = absint($_POST['comment_ID']);
+	$comment_post_id = absint($_POST['comment_post_ID']);
 
-	check_admin_referer( 'update-comment_' . $comment_id );
+	check_admin_referer('update-comment_'.$comment_id);
 
 	edit_comment();
 
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = (empty($_POST['referredby']) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby']).'#comment-'.$comment_id;
 
 	/**
 	 * Filter the URI the user is redirected to after editing a comment in the admin.
@@ -320,14 +320,14 @@ 
 	 * @param string $location The URI the user will be redirected to.
 	 * @param int $comment_id The ID of the comment being edited.
 	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+	$location = apply_filters('comment_edit_redirect', $location, $comment_id);
+	wp_redirect($location);
 
 	exit();
 
 default:
-	wp_die( __('Unknown action.') );
+	wp_die(__('Unknown action.'));
 
 } // end switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +41 added lines, -31 removed lines

@@ -18,20 +18,23 @@ 
 global $action;
 wp_reset_vars( array('action') );
 
-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}
 
-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}
 
 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
-}
+	if ( 'spam' == $_GET['dt'] ) {
+			$action = 'spam';
+	} elseif ( 'trash' == $_GET['dt'] ) {
+			$action = 'trash';
+	}
+	}
 
 /**
  * Display error message at bottom of comments.
@@ -68,14 +71,17 @@ 
 
 	$comment_id = absint( $_GET['c'] );
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( !$comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	}
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('You are not allowed to edit this comment.') );
+	if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __('You are not allowed to edit this comment.') );
+	}
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	}
 
 	$comment = get_comment_to_edit( $comment_id );
 
@@ -244,26 +250,30 @@ 
 case 'unapprovecomment' :
 	$comment_id = absint( $_REQUEST['c'] );
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+	} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+	}
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('You are not allowed to edit comments on this post.') );
-
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+	if ( !$comment = get_comment($comment_id) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+	}
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __('You are not allowed to edit comments on this post.') );
+	}
+
+	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') ) {
+			$redir = wp_get_referer();
+	} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+	} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	} else {
+			$redir = admin_url('edit-comments.php');
+	}
 
 	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
 

src/wp-admin/index.php

Spacing +57 added lines, -57 removed lines

@@ -7,106 +7,106 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once(ABSPATH.'wp-admin/includes/dashboard.php');
 
 wp_dashboard_setup();
 
-wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
-	wp_enqueue_script( 'customize-loader' );
-if ( current_user_can( 'install_plugins' ) )
-	wp_enqueue_script( 'plugin-install' );
-if ( current_user_can( 'upload_files' ) )
-	wp_enqueue_script( 'media-upload' );
+wp_enqueue_script('dashboard');
+if (current_user_can('edit_theme_options'))
+	wp_enqueue_script('customize-loader');
+if (current_user_can('install_plugins'))
+	wp_enqueue_script('plugin-install');
+if (current_user_can('upload_files'))
+	wp_enqueue_script('media-upload');
 add_thickbox();
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
 
-$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '</p>';
+$help = '<p>'.__('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.').'</p>';
 
 // Not using chaining here, so as to be parseable by PHP4.
 $screen = get_current_screen();
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
 // Help tabs
 
-$help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';
-$help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';
+$help  = '<p>'.__('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.').'</p>';
+$help .= '<p>'.__('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-navigation',
-	'title'   => __( 'Navigation' ),
+	'title'   => __('Navigation'),
 	'content' => $help,
-) );
+));
 
-$help  = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';
+$help  = '<p>'.__('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.').'</p>';
+$help .= '<p>'.__('<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.').'</p>';
+$help .= '<p>'.__('<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.').'</p>';
+$help .= '<p>'.__('<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-layout',
-	'title'   => __( 'Layout' ),
+	'title'   => __('Layout'),
 	'content' => $help,
-) );
-
-$help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
-	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
-	$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>, and popular and recent plugins.' ) . '</p>';
+));
+
+$help = '<p>'.__('The boxes on your Dashboard screen are:').'</p>';
+if (current_user_can('edit_posts'))
+	$help .= '<p>'.__('<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.').'</p>';
+	$help .= '<p>'.__('<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.').'</p>';
+if (is_blog_admin() && current_user_can('edit_posts'))
+	$help .= '<p>'.__("<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started.").'</p>';
+if ( ! is_multisite() && current_user_can('install_plugins'))
+	$help .= '<p>'.__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>, and popular and recent plugins.').'</p>';
 else
-	$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>.' ) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
-	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+	$help .= '<p>'.__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>.').'</p>';
+if (current_user_can('edit_theme_options'))
+	$help .= '<p>'.__('<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-content',
-	'title'   => __( 'Content' ),
+	'title'   => __('Content'),
 	'content' => $help,
-) );
+));
 
-unset( $help );
+unset($help);
 
 $screen->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</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/Dashboard_Screen" target="_blank">Documentation on Dashboard</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>
 
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+<?php if (has_action('welcome_panel') && current_user_can('edit_theme_options')) :
 	$classes = 'welcome-panel';
 
-	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+	$option = get_user_meta(get_current_user_id(), 'show_welcome_panel', true);
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
-	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
+	$hide = 0 == $option || (2 == $option && wp_get_current_user()->user_email != get_option('admin_email'));
+	if ($hide)
 		$classes .= ' hidden'; ?>
 
-	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
-		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
-		<a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e( 'Dismiss' ); ?></a>
+	<div id="welcome-panel" class="<?php echo esc_attr($classes); ?>">
+		<?php wp_nonce_field('welcome-panel-nonce', 'welcomepanelnonce', false); ?>
+		<a class="welcome-panel-close" href="<?php echo esc_url(admin_url('?welcome=0')); ?>"><?php _e('Dismiss'); ?></a>
 		<?php
 		/**
 		 * Add content to the welcome panel on the admin dashboard.
@@ -117,7 +117,7 @@ 
 		 *
 		 * @since 3.5.0
 		 */
-		do_action( 'welcome_panel' );
+		do_action('welcome_panel');
 		?>
 	</div>
 <?php endif; ?>
@@ -129,4 +129,4 @@ 
 </div><!-- wrap -->
 
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +21 added lines, -11 removed lines

@@ -15,16 +15,20 @@ 
 wp_dashboard_setup();
 
 wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
+if ( current_user_can( 'edit_theme_options' ) ) {
 	wp_enqueue_script( 'customize-loader' );
-if ( current_user_can( 'install_plugins' ) )
+}
+if ( current_user_can( 'install_plugins' ) ) {
 	wp_enqueue_script( 'plugin-install' );
-if ( current_user_can( 'upload_files' ) )
+}
+if ( current_user_can( 'upload_files' ) ) {
 	wp_enqueue_script( 'media-upload' );
+}
 add_thickbox();
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
@@ -63,17 +67,21 @@ 
 ) );
 
 $help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
+if ( current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
+}
 	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
+}
+if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 	$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>, and popular and recent plugins.' ) . '</p>';
-else
+} else {
 	$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>.' ) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
+}
+if ( current_user_can( 'edit_theme_options' ) ) {
 	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+}
 
 $screen->add_help_tab( array(
 	'id'      => 'help-content',
@@ -101,8 +109,10 @@ 
 	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
 	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
-		$classes .= ' hidden'; ?>
+	if ( $hide ) {
+			$classes .= ' hidden';
+	}
+	?>
 
 	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
 		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>

src/wp-admin/ms-sites.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite sites administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+		 * Multisite sites administration panel.
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.0.0
+		 */
 
 require_once( dirname( __FILE__ ) . '/admin.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('sites.php') );
+wp_redirect(network_admin_url('sites.php'));
 exit;

src/wp-admin/media.php

Switch Indentation +76 added lines, -76 removed lines

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

Spacing +39 added lines, -39 removed lines

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

Braces +24 added lines, -13 removed lines

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

src/wp-admin/user/user-edit.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/user-edit.php' );
+require(ABSPATH.'wp-admin/user-edit.php');

src/wp-admin/user/credits.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/credits.php' );
+require(ABSPATH.'wp-admin/credits.php');

src/wp-admin/user/index.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/index.php' );
+require(ABSPATH.'wp-admin/index.php');