ntwb / wordpress

src/wp-admin/media-upload.php

Braces +2 added lines, -1 removed lines

@@ -9,8 +9,9 @@
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
+if ( ! isset( $_GET['inline'] ) ) {
 	define( 'IFRAME_REQUEST' , true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +22 added lines, -22 removed lines

@@ -9,47 +9,47 @@ 
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
-	define( 'IFRAME_REQUEST' , true );
+if ( ! isset($_GET['inline']))
+	define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ), 403 );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('Sorry, you are not allowed to upload files.'), 403);
 }
 
 wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
-wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_script('set-post-thumbnail');
 wp_enqueue_style('imgareaselect');
-wp_enqueue_script( 'media-gallery' );
+wp_enqueue_script('media-gallery');
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 // IDs should be integers
 $ID = isset($ID) ? (int) $ID : 0;
-$post_id = isset($post_id)? (int) $post_id : 0;
+$post_id = isset($post_id) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && $action == 'edit' && !$ID ) {
+if (isset($action) && $action == 'edit' && ! $ID) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Invalid item ID.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Invalid item ID.').'</p>',
 		403
 	);
 }
 
-if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+if ( ! empty($_REQUEST['post_id']) && ! current_user_can('edit_post', $_REQUEST['post_id'])) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 		403
 	);
 }
 
 // Upload type: image, video, file, ..?
-if ( isset($_GET['type']) ) {
+if (isset($_GET['type'])) {
 	$type = strval($_GET['type']);
 } else {
 	/**
@@ -60,11 +60,11 @@ 
 	 * @param string $type The default media upload type. Possible values include
 	 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
 	 */
-	$type = apply_filters( 'media_upload_default_type', 'file' );
+	$type = apply_filters('media_upload_default_type', 'file');
 }
 
 // Tab: gallery, library, or type-specific.
-if ( isset($_GET['tab']) ) {
+if (isset($_GET['tab'])) {
 	$tab = strval($_GET['tab']);
 } else {
 	/**
@@ -74,13 +74,13 @@ 
 	 *
 	 * @param string $type The default media popup tab. Default 'type' (From Computer).
 	 */
-	$tab = apply_filters( 'media_upload_default_tab', 'type' );
+	$tab = apply_filters('media_upload_default_tab', 'type');
 }
 
 $body_id = 'media-upload';
 
 // Let the action code decide how to handle the request.
-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+if ($tab == 'type' || $tab == 'type_url' || ! array_key_exists($tab, media_upload_tabs())) {
 	/**
 	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
 	 * media popup based on the current tab.
@@ -95,7 +95,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_{$type}" );
+	do_action("media_upload_{$type}");
 } else {
 	/**
 	 * Fires inside limited and specific upload-tab views in the legacy
@@ -107,6 +107,6 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_{$tab}" );
+	do_action("media_upload_{$tab}");
 }
 

src/wp-admin/credits.php

Braces +7 added lines, -4 removed lines

@@ -62,8 +62,10 @@ 
 		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty( $group_data['shuffle'] ) ) {
+			shuffle( $group_data['data'] );
+	}
+	// We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
 	switch ( $group_data['type'] ) {
 		case 'list' :
@@ -87,8 +89,9 @@ 
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				if ( ! $compact ) {
+									echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";

Spacing +55 added lines, -55 removed lines

@@ -7,89 +7,89 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require_once( dirname( __FILE__ ) . '/includes/credits.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require_once(dirname(__FILE__).'/includes/credits.php');
 
-$title = __( 'Credits' );
+$title = __('Credits');
 
-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+list($display_version) = explode('-', get_bloginfo('version'));
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap about-wrap">
 
-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+<h1><?php printf(__('Welcome to WordPress %s'), $display_version); ?></h1>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf(__('Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.'), $display_version); ?></p>
 
-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 <h2 class="nav-tab-wrapper wp-clearfix">
-	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+	<a href="about.php" class="nav-tab"><?php _e('What&#8217;s New'); ?></a>
+	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e('Credits'); ?></a>
+	<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 </h2>
 
 <?php
 
 $credits = wp_credits();
 
-if ( ! $credits ) {
+if ( ! $credits) {
 	echo '<p class="about-description">';
 	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(__('WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.'),
 		'https://wordpress.org/about/',
-		__( 'https://make.wordpress.org/' )
+		__('https://make.wordpress.org/')
 	);
 	echo '</p>';
 	echo '</div>';
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
+echo '<p class="about-description">'.__('WordPress is created by a worldwide team of passionate individuals.')."</p>\n";
 
-foreach ( $credits['groups'] as $group_slug => $group_data ) {
-	if ( $group_data['name'] ) {
-		if ( 'Translators' == $group_data['name'] ) {
+foreach ($credits['groups'] as $group_slug => $group_data) {
+	if ($group_data['name']) {
+		if ('Translators' == $group_data['name']) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+			$title = _x('Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section');
+		} elseif (isset($group_data['placeholders'])) {
+			$title = vsprintf(translate($group_data['name']), $group_data['placeholders']);
 		} else {
-			$title = translate( $group_data['name'] );
+			$title = translate($group_data['name']);
 		}
 
-		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+		echo '<h3 class="wp-people-group">'.esc_html($title)."</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty($group_data['shuffle']))
+		shuffle($group_data['data']); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
-	switch ( $group_data['type'] ) {
+	switch ($group_data['type']) {
 		case 'list' :
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles']);
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		case 'libraries' :
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_build_object_link');
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		default:
 			$compact = 'compact' == $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
+			$classes = 'wp-people-group '.($compact ? 'compact' : '');
+			echo '<ul class="'.$classes.'" id="wp-people-group-'.$group_slug.'">'."\n";
+			foreach ($group_data['data'] as $person_data) {
+				echo '<li class="wp-person" id="wp-person-'.esc_attr($person_data[2]).'">'."\n\t";
+				echo '<a href="'.esc_url(sprintf($credits['data']['profiles'], $person_data[2])).'" class="web">';
 				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$data = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
 				$size *= 2;
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
-				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				$data2x = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
+				echo '<img src="'.esc_url($data['url']).'" srcset="'.esc_url($data2x['url']).' 2x" class="gravatar" alt="" />'."\n";
+				echo esc_html($person_data[0])."</a>\n\t";
+				if ( ! $compact)
+					echo '<span class="title">'.translate($person_data[3])."</span>\n";
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
@@ -100,26 +100,26 @@ 
 ?>
 <p class="clear"><?php
 	/* translators: %s: https://make.wordpress.org/ */
-	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-		__( 'https://make.wordpress.org/' )
+	printf(__('Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.'),
+		__('https://make.wordpress.org/')
 	);
 ?></p>
 
 </div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 return;
 
 // These are strings returned by the API that we want to be translatable
-__( 'Project Leaders' );
-__( 'Core Contributors to WordPress %s' );
-__( 'Contributing Developers' );
-__( 'Cofounder, Project Lead' );
-__( 'Lead Developer' );
-__( 'Release Lead' );
-__( 'Release Design Lead' );
-__( 'Release Deputy' );
-__( 'Core Developer' );
-__( 'External Libraries' );
+__('Project Leaders');
+__('Core Contributors to WordPress %s');
+__('Contributing Developers');
+__('Cofounder, Project Lead');
+__('Lead Developer');
+__('Release Lead');
+__('Release Design Lead');
+__('Release Deputy');
+__('Core Developer');
+__('External Libraries');

src/wp-admin/options-general.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';
@@ -68,13 +69,19 @@ 
 <?php if ( !is_multisite() ) { ?>
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) {
+	echo ' disabled' ?>" /></td>
 </tr>
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' );
+}
+?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) {
+	echo ' disabled' ?>" />
 <?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
+<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' );
+}
+?></p></td>
 <?php endif; ?>
 </tr>
 <tr>
@@ -129,18 +136,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>
@@ -177,10 +186,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

Indentation +14 added lines, -14 removed lines

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

Spacing +97 added lines, -98 removed lines

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

src/wp-admin/setup-config.php

Braces +28 added lines, -16 removed lines

@@ -41,21 +41,23 @@ 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
 	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
+} elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) ) {
 	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
-else
+} else {
 	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.' ) );
+}
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
+if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
 	wp_die( '<p>' . sprintf(
 			/* translators: %s: install.php */
 			__( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
 			'install.php'
 		) . '</p>'
 	);
+}
 
 // Check if wp-config.php exists above the root directory but is not part of another install
 if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
@@ -90,7 +92,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -246,12 +251,14 @@ 
 
 	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if ( empty( $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	}
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	}
 
 	// Test the db connection.
 	/**#@+
@@ -273,8 +280,9 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty( $wpdb->error ) ) {
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	}
 
 	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
 	try {
@@ -315,8 +323,9 @@ 
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+					continue;
+		}
 
 		$constant = $match[1];
 		$padding  = $match[2];
@@ -375,15 +384,18 @@ 
 })();
 </script>
 <?php
-	else :
+	else {
+		:
 		/*
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
 		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
 			$path_to_wp_config = ABSPATH . 'wp-config.php';
-		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+	}
+		else {
+					$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+		}
 
 		$handle = fopen( $path_to_wp_config, 'w' );
 		foreach ( $config_file as $line ) {

Switch Indentation +136 added lines, -136 removed lines

@@ -111,37 +111,37 @@ 
 }
 
 switch($step) {
-	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
-			echo '<h1 class="screen-reader-text">Select a default language</h1>';
-			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
-			echo '</form>';
-			break;
-		}
+		case -1:
+			if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+				setup_config_display_header( 'language-chooser' );
+				echo '<h1 class="screen-reader-text">Select a default language</h1>';
+				echo '<form id="setup" method="post" action="?step=0">';
+				wp_install_language_form( $languages );
+				echo '</form>';
+				break;
+			}
 
-		// Deliberately fall through if we can't reach the translations API.
+			// Deliberately fall through if we can't reach the translations API.
 
-	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
-				$GLOBALS['wp_locale'] = new WP_Locale();
+		case 0:
+			if ( ! empty( $language ) ) {
+				$loaded_language = wp_download_language_pack( $language );
+				if ( $loaded_language ) {
+					load_default_textdomain( $loaded_language );
+					$GLOBALS['wp_locale'] = new WP_Locale();
+				}
 			}
-		}
 
-		setup_config_display_header();
-		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
-			$step_1 .= '&amp;noapi';
-		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
-		}
-?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
+			setup_config_display_header();
+			$step_1 = 'setup-config.php?step=1';
+			if ( isset( $_REQUEST['noapi'] ) ) {
+				$step_1 .= '&amp;noapi';
+			}
+			if ( ! empty( $loaded_language ) ) {
+				$step_1 .= '&amp;language=' . $loaded_language;
+			}
+	?>
+	<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
 <ol>
 	<li><?php _e( 'Database name' ); ?></li>
@@ -151,37 +151,37 @@ 
 	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
 <p><?php
-	/* translators: %s: wp-config.php */
-	printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
-		'<code>wp-config.php</code>'
-	);
-	?>
-	<strong><?php
-		/* translators: 1: wp-config-sample.php, 2: wp-config.php */
-		printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
-			'<code>wp-config-sample.php</code>',
+		/* translators: %s: wp-config.php */
+		printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
 			'<code>wp-config.php</code>'
 		);
-	?></strong>
+		?>
+		<strong><?php
+			/* translators: 1: wp-config-sample.php, 2: wp-config.php */
+			printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+				'<code>wp-config-sample.php</code>',
+				'<code>wp-config.php</code>'
+			);
+		?></strong>
 	<?php
-	/* translators: %s: Codex URL */
-	printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
-	);
-?></p>
+		/* translators: %s: Codex URL */
+		printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
+			__( 'https://codex.wordpress.org/Editing_wp-config.php' )
+		);
+	?></p>
 <p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
-<?php
-	break;
+	<?php
+		break;
 
-	case 1:
-		load_default_textdomain( $language );
-		$GLOBALS['wp_locale'] = new WP_Locale();
+		case 1:
+			load_default_textdomain( $language );
+			$GLOBALS['wp_locale'] = new WP_Locale();
 
-		setup_config_display_header();
-	?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+			setup_config_display_header();
+		?>
+	<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
 	<table class="form-table">
@@ -204,9 +204,9 @@ 
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td><?php
-				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
-			?></td>
+					/* translators: %s: localhost */
+					printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
+				?></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
@@ -215,118 +215,118 @@ 
 		</tr>
 	</table>
 	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
+		<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 <?php
-	break;
+		break;
 
-	case 2:
-	load_default_textdomain( $language );
-	$GLOBALS['wp_locale'] = new WP_Locale();
+		case 2:
+		load_default_textdomain( $language );
+		$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+		$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
+		$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
+		$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
+		$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
+		$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
 
-	$step_1 = 'setup-config.php?step=1';
-	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
-		$step_1 .= '&amp;noapi';
-	}
+		$step_1 = 'setup-config.php?step=1';
+		$install = 'install.php';
+		if ( isset( $_REQUEST['noapi'] ) ) {
+			$step_1 .= '&amp;noapi';
+		}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
-	} else {
-		$install .= '?language=en_US';
-	}
+		if ( ! empty( $language ) ) {
+			$step_1 .= '&amp;language=' . $language;
+			$install .= '?language=' . $language;
+		} else {
+			$install .= '?language=en_US';
+		}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+		$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+		if ( empty( $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
 
-	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+		// Validate $prefix: it can only contain letters, numbers and underscores.
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
 
-	// Test the db connection.
-	/**#@+
+		// Test the db connection.
+		/**#@+
 	 * @ignore
 	 */
-	define('DB_NAME', $dbname);
-	define('DB_USER', $uname);
-	define('DB_PASSWORD', $pwd);
-	define('DB_HOST', $dbhost);
-	/**#@-*/
+		define('DB_NAME', $dbname);
+		define('DB_USER', $uname);
+		define('DB_PASSWORD', $pwd);
+		define('DB_HOST', $dbhost);
+		/**#@-*/
 
-	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
-	require_wp_db();
+		// Re-construct $wpdb with these new values.
+		unset( $wpdb );
+		require_wp_db();
 
-	/*
+		/*
 	 * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
 	 * fire this manually. We'll fail here if the values are no good.
 	 */
-	$wpdb->db_connect();
+		$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+		if ( ! empty( $wpdb->error ) )
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
-	$wpdb->query( "SELECT $prefix" );
-	if ( ! $wpdb->last_error ) {
-		// MySQL was able to parse the prefix as a value, which we don't want. Bail.
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
-	}
-
-	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
-	try {
-		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
-		$max = strlen($chars) - 1;
-		for ( $i = 0; $i < 8; $i++ ) {
-			$key = '';
-			for ( $j = 0; $j < 64; $j++ ) {
-				$key .= substr( $chars, random_int( 0, $max ), 1 );
-			}
-			$secret_keys[] = $key;
+		$wpdb->query( "SELECT $prefix" );
+		if ( ! $wpdb->last_error ) {
+			// MySQL was able to parse the prefix as a value, which we don't want. Bail.
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
 		}
-	} catch ( Exception $ex ) {
-		$no_api = isset( $_POST['noapi'] );
 
-		if ( ! $no_api ) {
-			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-		}
-
-		if ( $no_api || is_wp_error( $secret_keys ) ) {
-			$secret_keys = array();
+		// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
+		try {
+			$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
+			$max = strlen($chars) - 1;
 			for ( $i = 0; $i < 8; $i++ ) {
-				$secret_keys[] = wp_generate_password( 64, true, true );
+				$key = '';
+				for ( $j = 0; $j < 64; $j++ ) {
+					$key .= substr( $chars, random_int( 0, $max ), 1 );
+				}
+				$secret_keys[] = $key;
 			}
-		} else {
-			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-			foreach ( $secret_keys as $k => $v ) {
-				$secret_keys[$k] = substr( $v, 28, 64 );
+		} catch ( Exception $ex ) {
+			$no_api = isset( $_POST['noapi'] );
+
+			if ( ! $no_api ) {
+				$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
 			}
-		}
-	}
 
-	$key = 0;
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
-			continue;
+			if ( $no_api || is_wp_error( $secret_keys ) ) {
+				$secret_keys = array();
+				for ( $i = 0; $i < 8; $i++ ) {
+					$secret_keys[] = wp_generate_password( 64, true, true );
+				}
+			} else {
+				$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+				foreach ( $secret_keys as $k => $v ) {
+					$secret_keys[$k] = substr( $v, 28, 64 );
+				}
+			}
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		$key = 0;
+		foreach ( $config_file as $line_num => $line ) {
+			if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
+				$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+				continue;
+			}
 
-		$constant = $match[1];
-		$padding  = $match[2];
+			if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+				continue;
 
-		switch ( $constant ) {
+			$constant = $match[1];
+			$padding  = $match[2];
+
+			switch ( $constant ) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
@@ -348,7 +348,7 @@ 
 			case 'NONCE_SALT'       :
 				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
 				break;
-		}
+			}
 	}
 	unset( $line );
 

Spacing +134 added lines, -134 removed lines

@@ -26,48 +26,48 @@ 
  */
 error_reporting(0);
 
-if ( ! defined( 'ABSPATH' ) ) {
-	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined('ABSPATH')) {
+	define('ABSPATH', dirname(dirname(__FILE__)).'/');
 }
 
-require( ABSPATH . 'wp-settings.php' );
+require(ABSPATH.'wp-settings.php');
 
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
-	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
+if (file_exists(ABSPATH.'wp-config-sample.php'))
+	$config_file = file(ABSPATH.'wp-config-sample.php');
+elseif (file_exists(dirname(ABSPATH).'/wp-config-sample.php'))
+	$config_file = file(dirname(ABSPATH).'/wp-config-sample.php');
 else
-	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.' ) );
+	wp_die(__('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.'));
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
-	wp_die( '<p>' . sprintf(
+if (file_exists(ABSPATH.'wp-config.php'))
+	wp_die('<p>'.sprintf(
 			/* translators: %s: install.php */
-			__( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+			__("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."),
 			'install.php'
-		) . '</p>'
+		).'</p>'
 	);
 
 // Check if wp-config.php exists above the root directory but is not part of another install
-if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
-	wp_die( '<p>' . sprintf(
+if (@file_exists(ABSPATH.'../wp-config.php') && ! @file_exists(ABSPATH.'../wp-settings.php')) {
+	wp_die('<p>'.sprintf(
 			/* translators: %s: install.php */
-			__( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+			__("The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."),
 			'install.php'
-		) . '</p>'
+		).'</p>'
 	);
 }
 
-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
+$step = isset($_GET['step']) ? (int) $_GET['step'] : -1;
 
 /**
  * Display setup wp-config.php file header.
@@ -80,43 +80,43 @@ 
  *
  * @param string|array $body_classes
  */
-function setup_config_display_header( $body_classes = array() ) {
+function setup_config_display_header($body_classes = array()) {
 	$body_classes = (array) $body_classes;
 	$body_classes[] = 'wp-core-ui';
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$body_classes[] = 'rtl';
 	}
 
-	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 if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
-	<?php wp_admin_css( 'install', true ); ?>
+	<title><?php _e('WordPress &rsaquo; Setup Configuration File'); ?></title>
+	<?php wp_admin_css('install', true); ?>
 </head>
-<body class="<?php echo implode( ' ', $body_classes ); ?>">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<body class="<?php echo implode(' ', $body_classes); ?>">
+<p id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 <?php
 } // end function setup_config_display_header();
 
 $language = '';
-if ( ! empty( $_REQUEST['language'] ) ) {
-	$language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
-} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+if ( ! empty($_REQUEST['language'])) {
+	$language = preg_replace('/[^a-zA-Z_]/', '', $_REQUEST['language']);
+} elseif (isset($GLOBALS['wp_local_package'])) {
 	$language = $GLOBALS['wp_local_package'];
 }
 
-switch($step) {
+switch ($step) {
 	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
+		if (wp_can_install_language_pack() && empty($language) && ($languages = wp_get_available_translations())) {
+			setup_config_display_header('language-chooser');
 			echo '<h1 class="screen-reader-text">Select a default language</h1>';
 			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
+			wp_install_language_form($languages);
 			echo '</form>';
 			break;
 		}
@@ -124,134 +124,134 @@ 
 		// Deliberately fall through if we can't reach the translations API.
 
 	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
+		if ( ! empty($language)) {
+			$loaded_language = wp_download_language_pack($language);
+			if ($loaded_language) {
+				load_default_textdomain($loaded_language);
 				$GLOBALS['wp_locale'] = new WP_Locale();
 			}
 		}
 
 		setup_config_display_header();
 		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
+		if (isset($_REQUEST['noapi'])) {
 			$step_1 .= '&amp;noapi';
 		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
+		if ( ! empty($loaded_language)) {
+			$step_1 .= '&amp;language='.$loaded_language;
 		}
 ?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
+<h1 class="screen-reader-text"><?php _e('Before getting started') ?></h1>
+<p><?php _e('Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.') ?></p>
 <ol>
-	<li><?php _e( 'Database name' ); ?></li>
-	<li><?php _e( 'Database username' ); ?></li>
-	<li><?php _e( 'Database password' ); ?></li>
-	<li><?php _e( 'Database host' ); ?></li>
-	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
+	<li><?php _e('Database name'); ?></li>
+	<li><?php _e('Database username'); ?></li>
+	<li><?php _e('Database password'); ?></li>
+	<li><?php _e('Database host'); ?></li>
+	<li><?php _e('Table prefix (if you want to run more than one WordPress in a single database)'); ?></li>
 </ol>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
+	printf(__('We&#8217;re going to use this information to create a %s file.'),
 		'<code>wp-config.php</code>'
 	);
 	?>
 	<strong><?php
 		/* translators: 1: wp-config-sample.php, 2: wp-config.php */
-		printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+		printf(__('If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.'),
 			'<code>wp-config-sample.php</code>',
 			'<code>wp-config.php</code>'
 		);
 	?></strong>
 	<?php
 	/* translators: %s: Codex URL */
-	printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
+	printf(__('Need more help? <a href="%s">We got it</a>.'),
+		__('https://codex.wordpress.org/Editing_wp-config.php')
 	);
 ?></p>
-<p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
+<p><?php _e('In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;'); ?></p>
 
-<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
+<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e('Let&#8217;s go!'); ?></a></p>
 <?php
 	break;
 
 	case 1:
-		load_default_textdomain( $language );
+		load_default_textdomain($language);
 		$GLOBALS['wp_locale'] = new WP_Locale();
 
 		setup_config_display_header();
 	?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+<h1 class="screen-reader-text"><?php _e('Set up your database connection') ?></h1>
 <form method="post" action="setup-config.php?step=2">
-	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
+	<p><?php _e('Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.'); ?></p>
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
+			<th scope="row"><label for="dbname"><?php _e('Database Name'); ?></label></th>
 			<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
-			<td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
+			<td><?php _e('The name of the database you want to use with WordPress.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
-			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
-			<td><?php _e( 'Your database username.' ); ?></td>
+			<th scope="row"><label for="uname"><?php _e('Username'); ?></label></th>
+			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars(_x('username', 'example username'), ENT_QUOTES); ?>" /></td>
+			<td><?php _e('Your database username.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
-			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
-			<td><?php _e( 'Your database password.' ); ?></td>
+			<th scope="row"><label for="pwd"><?php _e('Password'); ?></label></th>
+			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars(_x('password', 'example password'), ENT_QUOTES); ?>" autocomplete="off" /></td>
+			<td><?php _e('Your database password.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
+			<th scope="row"><label for="dbhost"><?php _e('Database Host'); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td><?php
 				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
+				printf(__('You should be able to get this info from your web host, if %s doesn&#8217;t work.'), '<code>localhost</code>');
 			?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
+			<th scope="row"><label for="prefix"><?php _e('Table Prefix'); ?></label></th>
 			<td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
-			<td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
+			<td><?php _e('If you want to run multiple WordPress installations in a single database, change this.'); ?></td>
 		</tr>
 	</table>
-	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
-	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
+	<?php if (isset($_GET['noapi'])) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
+	<input type="hidden" name="language" value="<?php echo esc_attr($language); ?>" />
+	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars(__('Submit'), ENT_QUOTES); ?>" class="button button-large" /></p>
 </form>
 <?php
 	break;
 
 	case 2:
-	load_default_textdomain( $language );
+	load_default_textdomain($language);
 	$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+	$dbname = trim(wp_unslash($_POST['dbname']));
+	$uname = trim(wp_unslash($_POST['uname']));
+	$pwd = trim(wp_unslash($_POST['pwd']));
+	$dbhost = trim(wp_unslash($_POST['dbhost']));
+	$prefix = trim(wp_unslash($_POST['prefix']));
 
 	$step_1 = 'setup-config.php?step=1';
 	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
+	if (isset($_REQUEST['noapi'])) {
 		$step_1 .= '&amp;noapi';
 	}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
+	if ( ! empty($language)) {
+		$step_1 .= '&amp;language='.$language;
+		$install .= '?language='.$language;
 	} else {
 		$install .= '?language=en_US';
 	}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+	$tryagain_link = '</p><p class="step"><a href="'.$step_1.'" onclick="javascript:history.go(-1);return false;" class="button button-large">'.__('Try again').'</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if (empty($prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" must not be empty.'.$tryagain_link));
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if (preg_match('|[^a-z0-9_]|i', $prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.'.$tryagain_link));
 
 	// Test the db connection.
 	/**#@+
@@ -264,7 +264,7 @@ 
 	/**#@-*/
 
 	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
+	unset($wpdb);
 	require_wp_db();
 
 	/*
@@ -273,69 +273,69 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty($wpdb->error))
+		wp_die($wpdb->error->get_error_message().$tryagain_link);
 
-	$wpdb->query( "SELECT $prefix" );
-	if ( ! $wpdb->last_error ) {
+	$wpdb->query("SELECT $prefix");
+	if ( ! $wpdb->last_error) {
 		// MySQL was able to parse the prefix as a value, which we don't want. Bail.
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" is invalid.'));
 	}
 
 	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
 	try {
 		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
 		$max = strlen($chars) - 1;
-		for ( $i = 0; $i < 8; $i++ ) {
+		for ($i = 0; $i < 8; $i++) {
 			$key = '';
-			for ( $j = 0; $j < 64; $j++ ) {
-				$key .= substr( $chars, random_int( 0, $max ), 1 );
+			for ($j = 0; $j < 64; $j++) {
+				$key .= substr($chars, random_int(0, $max), 1);
 			}
 			$secret_keys[] = $key;
 		}
-	} catch ( Exception $ex ) {
-		$no_api = isset( $_POST['noapi'] );
+	} catch (Exception $ex) {
+		$no_api = isset($_POST['noapi']);
 
-		if ( ! $no_api ) {
-			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+		if ( ! $no_api) {
+			$secret_keys = wp_remote_get('https://api.wordpress.org/secret-key/1.1/salt/');
 		}
 
-		if ( $no_api || is_wp_error( $secret_keys ) ) {
+		if ($no_api || is_wp_error($secret_keys)) {
 			$secret_keys = array();
-			for ( $i = 0; $i < 8; $i++ ) {
-				$secret_keys[] = wp_generate_password( 64, true, true );
+			for ($i = 0; $i < 8; $i++) {
+				$secret_keys[] = wp_generate_password(64, true, true);
 			}
 		} else {
-			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-			foreach ( $secret_keys as $k => $v ) {
-				$secret_keys[$k] = substr( $v, 28, 64 );
+			$secret_keys = explode("\n", wp_remote_retrieve_body($secret_keys));
+			foreach ($secret_keys as $k => $v) {
+				$secret_keys[$k] = substr($v, 28, 64);
 			}
 		}
 	}
 
 	$key = 0;
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+	foreach ($config_file as $line_num => $line) {
+		if ('$table_prefix  =' == substr($line, 0, 16)) {
+			$config_file[$line_num] = '$table_prefix  = \''.addcslashes($prefix, "\\'")."';\r\n";
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+		if ( ! preg_match('/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match))
 			continue;
 
 		$constant = $match[1];
 		$padding  = $match[2];
 
-		switch ( $constant ) {
+		switch ($constant) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
 			case 'DB_HOST'     :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".addcslashes(constant($constant), "\\'")."');\r\n";
 				break;
 			case 'DB_CHARSET'  :
-				if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
-					$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n";
+				if ('utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap('utf8mb4'))) {
+					$config_file[$line_num] = "define('".$constant."',".$padding."'utf8mb4');\r\n";
 				}
 				break;
 			case 'AUTH_KEY'         :
@@ -346,30 +346,30 @@ 
 			case 'SECURE_AUTH_SALT' :
 			case 'LOGGED_IN_SALT'   :
 			case 'NONCE_SALT'       :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".$secret_keys[$key++]."');\r\n";
 				break;
 		}
 	}
-	unset( $line );
+	unset($line);
 
-	if ( ! is_writable(ABSPATH) ) :
+	if ( ! is_writable(ABSPATH)) :
 		setup_config_display_header();
 ?>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' );
+	printf(__('Sorry, but I can&#8217;t write the %s file.'), '<code>wp-config.php</code>');
 ?></p>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+	printf(__('You can create the %s manually and paste the following text into it.'), '<code>wp-config.php</code>');
 ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
-		foreach ( $config_file as $line ) {
+		foreach ($config_file as $line) {
 			echo htmlentities($line, ENT_COMPAT, 'UTF-8');
 		}
 ?></textarea>
-<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p><?php _e('After you&#8217;ve done that, click &#8220;Run the install.&#8221;'); ?></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <script>
 (function(){
 if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
@@ -385,28 +385,28 @@ 
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
-		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-			$path_to_wp_config = ABSPATH . 'wp-config.php';
+		if (file_exists(ABSPATH.'wp-config-sample.php'))
+			$path_to_wp_config = ABSPATH.'wp-config.php';
 		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+			$path_to_wp_config = dirname(ABSPATH).'/wp-config.php';
 
-		$handle = fopen( $path_to_wp_config, 'w' );
-		foreach ( $config_file as $line ) {
-			fwrite( $handle, $line );
+		$handle = fopen($path_to_wp_config, 'w');
+		foreach ($config_file as $line) {
+			fwrite($handle, $line);
 		}
-		fclose( $handle );
-		chmod( $path_to_wp_config, 0666 );
+		fclose($handle);
+		chmod($path_to_wp_config, 0666);
 		setup_config_display_header();
 ?>
-<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
-<p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
+<h1 class="screen-reader-text"><?php _e('Successful database connection') ?></h1>
+<p><?php _e('All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;'); ?></p>
 
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <?php
 	endif;
 	break;
 }
 ?>
-<?php wp_print_scripts( 'language-chooser' ); ?>
+<?php wp_print_scripts('language-chooser'); ?>
 </body>
 </html>

src/wp-admin/export.php

Braces +24 added lines, -17 removed lines

@@ -9,8 +9,9 @@ 
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('export') )
+if ( !current_user_can('export') ) {
 	wp_die(__('You do not have sufficient permissions to export the content of this site.'));
+}
 
 /** Load WordPress export API */
 require_once( ABSPATH . 'wp-admin/includes/export.php' );
@@ -64,32 +65,37 @@ 
 	} elseif ( 'posts' == $_GET['content'] ) {
 		$args['content'] = 'post';
 
-		if ( $_GET['cat'] )
-			$args['category'] = (int) $_GET['cat'];
+		if ( $_GET['cat'] ) {
+					$args['category'] = (int) $_GET['cat'];
+		}
 
-		if ( $_GET['post_author'] )
-			$args['author'] = (int) $_GET['post_author'];
+		if ( $_GET['post_author'] ) {
+					$args['author'] = (int) $_GET['post_author'];
+		}
 
 		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
 			$args['start_date'] = $_GET['post_start_date'];
 			$args['end_date'] = $_GET['post_end_date'];
 		}
 
-		if ( $_GET['post_status'] )
-			$args['status'] = $_GET['post_status'];
+		if ( $_GET['post_status'] ) {
+					$args['status'] = $_GET['post_status'];
+		}
 	} elseif ( 'pages' == $_GET['content'] ) {
 		$args['content'] = 'page';
 
-		if ( $_GET['page_author'] )
-			$args['author'] = (int) $_GET['page_author'];
+		if ( $_GET['page_author'] ) {
+					$args['author'] = (int) $_GET['page_author'];
+		}
 
 		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
 			$args['start_date'] = $_GET['page_start_date'];
 			$args['end_date'] = $_GET['page_end_date'];
 		}
 
-		if ( $_GET['page_status'] )
-			$args['status'] = $_GET['page_status'];
+		if ( $_GET['page_status'] ) {
+					$args['status'] = $_GET['page_status'];
+		}
 	} elseif ( 'attachment' == $_GET['content'] ) {
 		$args['content'] = 'attachment';
 
@@ -97,8 +103,7 @@ 
 			$args['start_date'] = $_GET['attachment_start_date'];
 			$args['end_date'] = $_GET['attachment_end_date'];
 		}
-	}
-	else {
+	} else {
 		$args['content'] = $_GET['content'];
 	}
 
@@ -138,12 +143,14 @@ 
 	", $post_type ) );
 
 	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-		return;
+	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+			return;
+	}
 
 	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
-			continue;
+		if ( 0 == $date->year ) {
+					continue;
+		}
 
 		$month = zeroise( $date->month, 2 );
 		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';

Spacing +89 added lines, -89 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('export') )
+if ( ! current_user_can('export'))
 	wp_die(__('Sorry, you are not allowed to export the content of this site.'));
 
 /** Load WordPress export API */
-require_once( ABSPATH . 'wp-admin/includes/export.php' );
+require_once(ABSPATH.'wp-admin/includes/export.php');
 $title = __('Export');
 
 /**
@@ -40,60 +40,60 @@ 
 </script>
 <?php
 }
-add_action( 'admin_head', 'export_add_js' );
+add_action('admin_head', 'export_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
-		'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
-) );
+	'content' => '<p>'.__('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.').'</p>'.
+		'<p>'.__('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Export_Screen">Documentation on Export</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Export_Screen">Documentation on Export</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
 // If the 'download' URL parameter is set, a WXR export file is baked and returned.
-if ( isset( $_GET['download'] ) ) {
+if (isset($_GET['download'])) {
 	$args = array();
 
-	if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
+	if ( ! isset($_GET['content']) || 'all' == $_GET['content']) {
 		$args['content'] = 'all';
-	} elseif ( 'posts' == $_GET['content'] ) {
+	} elseif ('posts' == $_GET['content']) {
 		$args['content'] = 'post';
 
-		if ( $_GET['cat'] )
+		if ($_GET['cat'])
 			$args['category'] = (int) $_GET['cat'];
 
-		if ( $_GET['post_author'] )
+		if ($_GET['post_author'])
 			$args['author'] = (int) $_GET['post_author'];
 
-		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
+		if ($_GET['post_start_date'] || $_GET['post_end_date']) {
 			$args['start_date'] = $_GET['post_start_date'];
 			$args['end_date'] = $_GET['post_end_date'];
 		}
 
-		if ( $_GET['post_status'] )
+		if ($_GET['post_status'])
 			$args['status'] = $_GET['post_status'];
-	} elseif ( 'pages' == $_GET['content'] ) {
+	} elseif ('pages' == $_GET['content']) {
 		$args['content'] = 'page';
 
-		if ( $_GET['page_author'] )
+		if ($_GET['page_author'])
 			$args['author'] = (int) $_GET['page_author'];
 
-		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
+		if ($_GET['page_start_date'] || $_GET['page_end_date']) {
 			$args['start_date'] = $_GET['page_start_date'];
 			$args['end_date'] = $_GET['page_end_date'];
 		}
 
-		if ( $_GET['page_status'] )
+		if ($_GET['page_status'])
 			$args['status'] = $_GET['page_status'];
-	} elseif ( 'attachment' == $_GET['content'] ) {
+	} elseif ('attachment' == $_GET['content']) {
 		$args['content'] = 'attachment';
 
-		if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) {
+		if ($_GET['attachment_start_date'] || $_GET['attachment_end_date']) {
 			$args['start_date'] = $_GET['attachment_start_date'];
 			$args['end_date'] = $_GET['attachment_end_date'];
 		}
@@ -109,13 +109,13 @@ 
 	 *
 	 * @param array $args The arguments to send to the exporter.
 	 */
-	$args = apply_filters( 'export_args', $args );
+	$args = apply_filters('export_args', $args);
 
-	export_wp( $args );
+	export_wp($args);
 	die();
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 /**
  * Create the date options fields for exporting a given post type.
@@ -127,151 +127,151 @@ 
  *
  * @param string $post_type The post type. Default 'post'.
  */
-function export_date_options( $post_type = 'post' ) {
+function export_date_options($post_type = 'post') {
 	global $wpdb, $wp_locale;
 
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	$months = $wpdb->get_results($wpdb->prepare("
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s AND post_status != 'auto-draft'
 		ORDER BY post_date DESC
-	", $post_type ) );
+	", $post_type));
 
-	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+	$month_count = count($months);
+	if ( ! $month_count || (1 == $month_count && 0 == $months[0]->month))
 		return;
 
-	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
+	foreach ($months as $date) {
+		if (0 == $date->year)
 			continue;
 
-		$month = zeroise( $date->month, 2 );
-		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
+		$month = zeroise($date->month, 2);
+		echo '<option value="'.$date->year.'-'.$month.'">'.$wp_locale->get_month($month).' '.$date->year.'</option>';
 	}
 }
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
 <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.'); ?></p>
 
-<h2><?php _e( 'Choose what to export' ); ?></h2>
+<h2><?php _e('Choose what to export'); ?></h2>
 <form method="get" id="export-filters">
 <fieldset>
-<legend class="screen-reader-text"><?php _e( 'Content to export' ); ?></legend>
+<legend class="screen-reader-text"><?php _e('Content to export'); ?></legend>
 <input type="hidden" name="download" value="true" />
-<p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e( 'All content' ); ?></label></p>
-<p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.' ); ?></p>
+<p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e('All content'); ?></label></p>
+<p class="description" id="all-content-desc"><?php _e('This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.'); ?></p>
 
-<p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
+<p><label><input type="radio" name="content" value="posts" /> <?php _e('Posts'); ?></label></p>
 <ul id="post-filters" class="export-filters">
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Categories:' ); ?></span>
-		<?php wp_dropdown_categories( array( 'show_option_all' => __('All') ) ); ?>
+		<label><span class="label-responsive"><?php _e('Categories:'); ?></span>
+		<?php wp_dropdown_categories(array('show_option_all' => __('All'))); ?>
 		</label>
 	</li>
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+		<label><span class="label-responsive"><?php _e('Authors:'); ?></span>
 		<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" );
-		wp_dropdown_users( array(
+		$authors = $wpdb->get_col("SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'");
+		wp_dropdown_users(array(
 			'include' => $authors,
 			'name' => 'post_author',
 			'multi' => true,
-			'show_option_all' => __( 'All' ),
+			'show_option_all' => __('All'),
 			'show' => 'display_name_with_login',
-		) ); ?>
+		)); ?>
 		</label>
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="post-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="post-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="post_start_date" id="post-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
 			<?php export_date_options(); ?>
 		</select>
-		<label for="post-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="post-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="post_end_date" id="post-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
 			<?php export_date_options(); ?>
 		</select>
 		</fieldset>
 	</li>
 	<li>
-		<label for="post-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+		<label for="post-status" class="label-responsive"><?php _e('Status:'); ?></label>
 		<select name="post_status" id="post-status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
-			foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
+			<option value="0"><?php _e('All'); ?></option>
+			<?php $post_stati = get_post_stati(array('internal' => false), 'objects');
+			foreach ($post_stati as $status) : ?>
+			<option value="<?php echo esc_attr($status->name); ?>"><?php echo esc_html($status->label); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</li>
 </ul>
 
-<p><label><input type="radio" name="content" value="pages" /> <?php _e( 'Pages' ); ?></label></p>
+<p><label><input type="radio" name="content" value="pages" /> <?php _e('Pages'); ?></label></p>
 <ul id="page-filters" class="export-filters">
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+		<label><span class="label-responsive"><?php _e('Authors:'); ?></span>
 		<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" );
-		wp_dropdown_users( array(
+		$authors = $wpdb->get_col("SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'");
+		wp_dropdown_users(array(
 			'include' => $authors,
 			'name' => 'page_author',
 			'multi' => true,
-			'show_option_all' => __( 'All' ),
+			'show_option_all' => __('All'),
 			'show' => 'display_name_with_login',
-		) ); ?>
+		)); ?>
 		</label>
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="page-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="page-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="page_start_date" id="page-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'page' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('page'); ?>
 		</select>
-		<label for="page-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="page-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="page_end_date" id="page-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'page' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('page'); ?>
 		</select>
 		</fieldset>
 	</li>
 	<li>
-		<label for="page-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+		<label for="page-status" class="label-responsive"><?php _e('Status:'); ?></label>
 		<select name="page_status" id="page-status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
+			<option value="0"><?php _e('All'); ?></option>
+			<?php foreach ($post_stati as $status) : ?>
+			<option value="<?php echo esc_attr($status->name); ?>"><?php echo esc_html($status->label); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</li>
 </ul>
 
-<?php foreach ( get_post_types( array( '_builtin' => false, 'can_export' => true ), 'objects' ) as $post_type ) : ?>
-<p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
+<?php foreach (get_post_types(array('_builtin' => false, 'can_export' => true), 'objects') as $post_type) : ?>
+<p><label><input type="radio" name="content" value="<?php echo esc_attr($post_type->name); ?>" /> <?php echo esc_html($post_type->label); ?></label></p>
 <?php endforeach; ?>
 
-<p><label><input type="radio" name="content" value="attachment" /> <?php _e( 'Media' ); ?></label></p>
+<p><label><input type="radio" name="content" value="attachment" /> <?php _e('Media'); ?></label></p>
 <ul id="attachment-filters" class="export-filters">
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="attachment-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="attachment-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="attachment_start_date" id="attachment-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'attachment' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('attachment'); ?>
 		</select>
-		<label for="attachment-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="attachment-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="attachment_end_date" id="attachment-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'attachment' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('attachment'); ?>
 		</select>
 		</fieldset>
 	</li>
@@ -284,11 +284,11 @@ 
  *
  * @since 3.5.0
  */
-do_action( 'export_filters' );
+do_action('export_filters');
 ?>
 
-<?php submit_button( __('Download Export File') ); ?>
+<?php submit_button(__('Download Export File')); ?>
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/user-edit.php

Braces +52 added lines, -27 removed lines

@@ -13,28 +13,32 @@ 
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
+if ( ! defined( 'IS_PROFILE_PAGE' ) ) {
 	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+}
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE ) {
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
+} elseif ( ! $user_id && ! IS_PROFILE_PAGE ) {
 	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
+} elseif ( ! get_userdata( $user_id ) ) {
 	wp_die( __('Invalid user ID.') );
+}
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if ( current_user_can('edit_users') && !IS_PROFILE_PAGE ) {
 	$submenu_file = 'users.php';
-else
+} else {
 	$submenu_file = 'profile.php';
+}
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if ( current_user_can('edit_users') && !is_user_admin() ) {
 	$parent_file = 'users.php';
-else
+} else {
 	$parent_file = 'profile.php';
+}
 
 $profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
 	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
@@ -108,8 +112,9 @@ 
 
 check_admin_referer('update-user_' . $user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 if ( IS_PROFILE_PAGE ) {
 	/**
@@ -152,8 +157,9 @@ 
 
 if ( !is_wp_error( $errors ) ) {
 	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
-		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	if ( $wp_http_referer ) {
+			$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	}
 	wp_redirect($redirect);
 	exit;
 }
@@ -161,8 +167,9 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
 
@@ -176,9 +183,12 @@ 
 <div id="message" class="updated notice is-dismissible">
 	<?php if ( IS_PROFILE_PAGE ) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
-	<?php else: ?>
+	<?php else {
+	: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
 	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
@@ -230,7 +240,10 @@ 
 <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 	<tr class="user-rich-editing-wrap">
 		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) {
+	checked( 'false', $profileuser->rich_editing );
+}
+?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
 	</tr>
 <?php endif; ?>
 <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
@@ -256,7 +269,10 @@ 
 if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <tr class="user-comment-shortcuts-wrap">
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) {
+	checked( 'true', $profileuser->comment_shortcuts );
+}
+?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
@@ -315,10 +331,11 @@ 
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
+if ( $user_role ) {
 	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
-else
+} else {
 	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+}
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
@@ -328,8 +345,11 @@ 
 <td>
 <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
-<?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<?php else {
+	: ?>
+<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' );
+}
+?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -358,19 +378,23 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
-				$public_display['display_firstname'] = $profileuser->first_name;
+			if ( !empty($profileuser->first_name) ) {
+							$public_display['display_firstname'] = $profileuser->first_name;
+			}
 
-			if ( !empty($profileuser->last_name) )
-				$public_display['display_lastname'] = $profileuser->last_name;
+			if ( !empty($profileuser->last_name) ) {
+							$public_display['display_lastname'] = $profileuser->last_name;
+			}
 
 			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
 				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
 				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
+			if ( !in_array( $profileuser->display_name, $public_display ) ) {
+				// Only add this if it isn't duplicated elsewhere
 				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			}
 
 			$public_display = array_map( 'trim', $public_display );
 			$public_display = array_unique( $public_display );
@@ -623,8 +647,9 @@ 
 	$output = '';
 	foreach ( $profileuser->caps as $cap => $value ) {
 		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
-				$output .= ', ';
+			if ( '' != $output ) {
+							$output .= ', ';
+			}
 			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
 		}
 	}

Indentation +3 added lines, -3 removed lines

@@ -51,9 +51,9 @@
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen">Documentation on User Profiles</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen">Documentation on User Profiles</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 $wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );

Spacing +181 added lines, -181 removed lines

@@ -7,58 +7,58 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
+wp_reset_vars(array('action', 'user_id', 'wp_http_referer'));
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
-	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+if ( ! defined('IS_PROFILE_PAGE'))
+	define('IS_PROFILE_PAGE', ($user_id == $current_user->ID));
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE)
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
-	wp_die( __('Invalid user ID.') );
+elseif ( ! $user_id && ! IS_PROFILE_PAGE)
+	wp_die(__('Invalid user ID.'));
+elseif ( ! get_userdata($user_id))
+	wp_die(__('Invalid user ID.'));
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if (current_user_can('edit_users') && ! IS_PROFILE_PAGE)
 	$submenu_file = 'users.php';
 else
 	$submenu_file = 'profile.php';
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if (current_user_can('edit_users') && ! is_user_admin())
 	$parent_file = 'users.php';
 else
 	$parent_file = 'profile.php';
 
-$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
-	'<p>' . __( 'You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.' ) . '</p>' .
-	'<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
-	'<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-	'<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+$profile_help = '<p>'.__('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.').'</p>'.
+	'<p>'.__('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.').'</p>'.
+	'<p>'.__('You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.').'</p>'.
+	'<p>'.__('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.').'</p>'.
+	'<p>'.__('You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.').'</p>'.
+	'<p>'.__('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.').'</p>'.
+	'<p>'.__('Remember to click the Update Profile button when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $profile_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen">Documentation on User Profiles</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen">Documentation on User Profiles</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('update', 'delete_count', 'user_id'), $wp_http_referer);
 
-$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+$user_can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 /**
  * Filters whether to allow administrators on Multisite to edit every user.
@@ -73,47 +73,47 @@ 
  *
  * @param bool $allow Whether to allow editing of any user. Default true.
  */
-if ( is_multisite()
-	&& ! current_user_can( 'manage_network_users' )
+if (is_multisite()
+	&& ! current_user_can('manage_network_users')
 	&& $user_id != $current_user->ID
-	&& ! apply_filters( 'enable_edit_any_user_configuration', true )
+	&& ! apply_filters('enable_edit_any_user_configuration', true)
 ) {
-	wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+	wp_die(__('Sorry, you are not allowed to edit this user.'));
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
-if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
+if (is_multisite() && IS_PROFILE_PAGE && isset($_GET['newuseremail']) && $current_user->ID) {
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && hash_equals($new_email['hash'], $_GET['newuseremail'])) {
 		$user = new stdClass;
 		$user->ID = $current_user->ID;
-		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		$user->user_email = esc_html(trim($new_email['newemail']));
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login))) {
+			$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login));
 		}
-		wp_update_user( $user );
-		delete_user_meta( $current_user->ID, '_new_email' );
-		wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
+		wp_update_user($user);
+		delete_user_meta($current_user->ID, '_new_email');
+		wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 		die();
 	} else {
-		wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
+		wp_redirect(add_query_arg(array('error' => 'new-email'), self_admin_url('profile.php')));
 	}
-} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) {
-	check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
-	delete_user_meta( $current_user->ID, '_new_email' );
-	wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+} elseif (is_multisite() && IS_PROFILE_PAGE && ! empty($_GET['dismiss']) && $current_user->ID.'_new_email' === $_GET['dismiss']) {
+	check_admin_referer('dismiss-'.$current_user->ID.'_new_email');
+	delete_user_meta($current_user->ID, '_new_email');
+	wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 	die();
 }
 
 switch ($action) {
 case 'update':
 
-check_admin_referer('update-user_' . $user_id);
+check_admin_referer('update-user_'.$user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('Sorry, you are not allowed to edit this user.'));
 
-if ( IS_PROFILE_PAGE ) {
+if (IS_PROFILE_PAGE) {
 	/**
 	 * Fires before the page loads on the 'Your Profile' editing screen.
 	 *
@@ -123,7 +123,7 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'personal_options_update', $user_id );
+	do_action('personal_options_update', $user_id);
 } else {
 	/**
 	 * Fires before the page loads on the 'Edit User' screen.
@@ -132,29 +132,29 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'edit_user_profile_update', $user_id );
+	do_action('edit_user_profile_update', $user_id);
 }
 
 // Update the email address in signups, if present.
-if ( is_multisite() ) {
-	$user = get_userdata( $user_id );
+if (is_multisite()) {
+	$user = get_userdata($user_id);
 
-	if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-		$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+	if ($user->user_login && isset($_POST['email']) && is_email($_POST['email']) && $wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login))) {
+		$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login));
 	}
 }
 
 // Update the user.
-$errors = edit_user( $user_id );
+$errors = edit_user($user_id);
 
 // Grant or revoke super admin status if requested.
-if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-	empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins) && empty($_POST['super_admin']) == is_super_admin($user_id)) {
+	empty($_POST['super_admin']) ? revoke_super_admin($user_id) : grant_super_admin($user_id);
 }
 
-if ( !is_wp_error( $errors ) ) {
-	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
+if ( ! is_wp_error($errors)) {
+	$redirect = add_query_arg('updated', true, get_edit_user_link($user_id));
+	if ($wp_http_referer)
 		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
 	wp_redirect($redirect);
 	exit;
@@ -163,67 +163,67 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('Sorry, you are not allowed to edit this user.'));
 
-$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
+$sessions = WP_Session_Tokens::get_instance($profileuser->ID);
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
-<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
+<?php if ( ! IS_PROFILE_PAGE && is_super_admin($profileuser->ID) && current_user_can('manage_network_options')) { ?>
 	<div class="notice notice-info"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['updated']) ) : ?>
+<?php if (isset($_GET['updated'])) : ?>
 <div id="message" class="updated notice is-dismissible">
-	<?php if ( IS_PROFILE_PAGE ) : ?>
+	<?php if (IS_PROFILE_PAGE) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
 	<?php else: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
 	<?php endif; ?>
-	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
+	<?php if ($wp_http_referer && false === strpos($wp_http_referer, 'user-new.php') && ! IS_PROFILE_PAGE) : ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $_GET['error'] ) ) : ?>
+<?php if (isset($_GET['error'])) : ?>
 <div class="notice notice-error">
-	<?php if ( 'new-email' == $_GET['error'] ) : ?>
-	<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
+	<?php if ('new-email' == $_GET['error']) : ?>
+	<p><?php _e('Error while saving the new email address. Please try again.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
+<div class="error"><p><?php echo implode("</p>\n<p>", $errors->get_error_messages()); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
 <?php
-if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+if ( ! IS_PROFILE_PAGE) {
+	if (current_user_can('create_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+	<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 	<?php }
 }
 ?>
 
 <hr class="wp-header-end">
 
-<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
+<form id="your-profile" action="<?php echo esc_url(self_admin_url(IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php')); ?>" method="post" novalidate="novalidate"<?php
 	/**
 	 * Fires inside the your-profile form tag on the user editing screen.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_edit_form_tag' );
+	do_action('user_edit_form_tag');
 ?>>
-<?php wp_nonce_field('update-user_' . $user_id) ?>
-<?php if ( $wp_http_referer ) : ?>
+<?php wp_nonce_field('update-user_'.$user_id) ?>
+<?php if ($wp_http_referer) : ?>
 	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
@@ -231,16 +231,16 @@ 
 <input type="hidden" name="checkuser_id" value="<?php echo get_current_user_id(); ?>" />
 </p>
 
-<h2><?php _e( 'Personal Options' ); ?></h2>
+<h2><?php _e('Personal Options'); ?></h2>
 
 <table class="form-table">
-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
+<?php if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 	<tr class="user-rich-editing-wrap">
-		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<th scope="row"><?php _e('Visual Editor'); ?></th>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty($profileuser->rich_editing)) checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
 	</tr>
 <?php endif; ?>
-<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
+<?php if (count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker')) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php
@@ -255,53 +255,53 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'admin_color_scheme_picker', $user_id );
+	do_action('admin_color_scheme_picker', $user_id);
 ?></td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
+if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 <tr class="user-comment-shortcuts-wrap">
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<th scope="row"><?php _e('Keyboard Shortcuts'); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty($profileuser->comment_shortcuts)) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><?php _e( 'Toolbar' ); ?></th>
+<th scope="row"><?php _e('Toolbar'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
 <label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked(_get_admin_bar_pref('front', $profileuser->ID)); ?> />
+<?php _e('Show Toolbar when viewing site'); ?></label><br />
 </fieldset>
 </td>
 </tr>
 
 <?php
 $languages = get_available_languages();
-if ( $languages ) : ?>
+if ($languages) : ?>
 <tr class="user-language-wrap">
 	<th scope="row">
 		<?php /* translators: The user language selection field label */ ?>
-		<label for="locale"><?php _e( 'Language' ); ?></label>
+		<label for="locale"><?php _e('Language'); ?></label>
 	</th>
 	<td>
 		<?php
 		$user_locale = $profileuser->locale;
 
-		if ( 'en_US' === $user_locale ) {
+		if ('en_US' === $user_locale) {
 			$user_locale = '';
-		} elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
+		} elseif ('' === $user_locale || ! in_array($user_locale, $languages, true)) {
 			$user_locale = 'site-default';
 		}
 
-		wp_dropdown_languages( array(
+		wp_dropdown_languages(array(
 			'name'                        => 'locale',
 			'id'                          => 'locale',
 			'selected'                    => $user_locale,
 			'languages'                   => $languages,
 			'show_available_translations' => false,
 			'show_option_site_default'    => true
-		) );
+		));
 		?>
 	</td>
 </tr>
@@ -317,12 +317,12 @@ 
  *
  * @param WP_User $profileuser The current WP_User object.
  */
-do_action( 'personal_options', $profileuser );
+do_action('personal_options', $profileuser);
 ?>
 
 </table>
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
 		 *
@@ -332,11 +332,11 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'profile_personal_options', $profileuser );
+		do_action('profile_personal_options', $profileuser);
 	}
 ?>
 
-<h2><?php _e( 'Name' ); ?></h2>
+<h2><?php _e('Name'); ?></h2>
 
 <table class="form-table">
 	<tr class="user-user-login-wrap">
@@ -344,33 +344,33 @@ 
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
 	</tr>
 
-<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
+<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin()) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
 <td><select name="role" id="role">
 <?php
 // Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = reset( $user_roles );
+$user_roles = array_intersect(array_values($profileuser->roles), array_keys(get_editable_roles()));
+$user_role  = reset($user_roles);
 
 // print the full list of roles with the primary one selected.
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
-	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
+if ($user_role)
+	echo '<option value="">'.__('&mdash; No role for this site &mdash;').'</option>';
 else
-	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+	echo '<option value="" selected="selected">'.__('&mdash; No role for this site &mdash;').'</option>';
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins)) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
-<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
+<?php if ($profileuser->user_email != get_site_option('admin_email') || ! is_super_admin($profileuser->ID)) : ?>
+<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked(is_super_admin($profileuser->ID)); ?> /> <?php _e('Grant this user super admin privileges for the Network.'); ?></label></p>
 <?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<p><?php _e('Super admin privileges cannot be removed because this user has the network admin email.'); ?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -399,26 +399,26 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
+			if ( ! empty($profileuser->first_name))
 				$public_display['display_firstname'] = $profileuser->first_name;
 
-			if ( !empty($profileuser->last_name) )
+			if ( ! empty($profileuser->last_name))
 				$public_display['display_lastname'] = $profileuser->last_name;
 
-			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			if ( ! empty($profileuser->first_name) && ! empty($profileuser->last_name)) {
+				$public_display['display_firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+				$public_display['display_lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			if ( ! in_array($profileuser->display_name, $public_display)) // Only add this if it isn't duplicated elsewhere
+				$public_display = array('display_displayname' => $profileuser->display_name) + $public_display;
 
-			$public_display = array_map( 'trim', $public_display );
-			$public_display = array_unique( $public_display );
+			$public_display = array_map('trim', $public_display);
+			$public_display = array_unique($public_display);
 
-			foreach ( $public_display as $id => $item ) {
+			foreach ($public_display as $id => $item) {
 		?>
-			<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+			<option <?php selected($profileuser->display_name, $item); ?>><?php echo $item; ?></option>
 		<?php
 			}
 		?>
@@ -427,26 +427,26 @@ 
 </tr>
 </table>
 
-<h2><?php _e( 'Contact Info' ); ?></h2>
+<h2><?php _e('Contact Info'); ?></h2>
 
 <table class="form-table">
 <tr class="user-email-wrap">
 	<th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
+	<td><input type="email" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text ltr" />
 	<?php
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID) : ?>
 	<div class="updated inline">
 	<p><?php
 		printf(
 			/* translators: %s: new email */
-			__( 'There is a pending change of your email to %s.' ),
-			'<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+			__('There is a pending change of your email to %s.'),
+			'<code>'.esc_html($new_email['newemail']).'</code>'
 		);
 		printf(
 			' <a href="%1$s">%2$s</a>',
-			esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
-			__( 'Cancel' )
+			esc_url(wp_nonce_url(self_admin_url('profile.php?dismiss='.$current_user->ID.'_new_email'), 'dismiss-'.$current_user->ID.'_new_email')),
+			__('Cancel')
 		);
 	?></p>
 	</div>
@@ -456,11 +456,11 @@ 
 
 <tr class="user-url-wrap">
 	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
+	<td><input type="url" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
 </tr>
 
 <?php
-	foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+	foreach (wp_get_user_contact_methods($profileuser) as $name => $desc) {
 ?>
 <tr class="user-<?php echo $name; ?>-wrap">
 	<th><label for="<?php echo $name; ?>">
@@ -475,7 +475,7 @@ 
 		 *
 		 * @param string $desc The translatable label for the contactmethod.
 		 */
-		echo apply_filters( "user_{$name}_label", $desc );
+		echo apply_filters("user_{$name}_label", $desc);
 		?>
 	</label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
@@ -485,7 +485,7 @@ 
 ?>
 </table>
 
-<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
+<h2><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h2>
 
 <table class="form-table">
 <tr class="user-description-wrap">
@@ -494,16 +494,16 @@ 
 	<p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
 </tr>
 
-<?php if ( get_option( 'show_avatars' ) ) : ?>
+<?php if (get_option('show_avatars')) : ?>
 <tr class="user-profile-picture">
-	<th><?php _e( 'Profile Picture' ); ?></th>
+	<th><?php _e('Profile Picture'); ?></th>
 	<td>
-		<?php echo get_avatar( $user_id ); ?>
+		<?php echo get_avatar($user_id); ?>
 		<p class="description"><?php
-			if ( IS_PROFILE_PAGE ) {
+			if (IS_PROFILE_PAGE) {
 				/* translators: %s: Gravatar URL */
-				$description = sprintf( __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
-					__( 'https://en.gravatar.com/' )
+				$description = sprintf(__('You can change your profile picture on <a href="%s">Gravatar</a>.'),
+					__('https://en.gravatar.com/')
 				);
 			} else {
 				$description = '';
@@ -518,7 +518,7 @@ 
 			 * @param string  $description The description that will be printed.
 			 * @param WP_User $profileuser The current WP_User object.
 			 */
-			echo apply_filters( 'user_profile_picture_description', $description, $profileuser );
+			echo apply_filters('user_profile_picture_description', $description, $profileuser);
 		?></p>
 	</td>
 </tr>
@@ -535,80 +535,80 @@ 
  * @param bool    $show        Whether to show the password fields. Default true.
  * @param WP_User $profileuser User object for the current user to edit.
  */
-if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
+if ($show_password_fields = apply_filters('show_password_fields', true, $profileuser)) :
 ?>
 </table>
 
-<h2><?php _e( 'Account Management' ); ?></h2>
+<h2><?php _e('Account Management'); ?></h2>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
 	<td>
 		<input class="hidden" value=" " /><!-- #24364 workaround -->
-		<button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+		<button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e('Generate Password'); ?></button>
 		<div class="wp-pwd hide-if-js">
 			<span class="password-input-wrapper">
-				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr(wp_generate_password(24)); ?>" aria-describedby="pass-strength-result" />
 			</span>
-			<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+			<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 				<span class="dashicons dashicons-hidden"></span>
-				<span class="text"><?php _e( 'Hide' ); ?></span>
+				<span class="text"><?php _e('Hide'); ?></span>
 			</button>
-			<button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-				<span class="text"><?php _e( 'Cancel' ); ?></span>
+			<button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+				<span class="text"><?php _e('Cancel'); ?></span>
 			</button>
 			<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 		</div>
 	</td>
 </tr>
 <tr class="user-pass2-wrap hide-if-js">
-	<th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+	<th scope="row"><label for="pass2"><?php _e('Repeat New Password'); ?></label></th>
 	<td>
 	<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
-	<p class="description"><?php _e( 'Type your new password again.' ); ?></p>
+	<p class="description"><?php _e('Type your new password again.'); ?></p>
 	</td>
 </tr>
 <tr class="pw-weak">
-	<th><?php _e( 'Confirm Password' ); ?></th>
+	<th><?php _e('Confirm Password'); ?></th>
 	<td>
 		<label>
 			<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-			<span id="pw-weak-text-label"><?php _e( 'Confirm use of potentially weak password' ); ?></span>
+			<span id="pw-weak-text-label"><?php _e('Confirm use of potentially weak password'); ?></span>
 		</label>
 	</td>
 </tr>
 <?php endif; ?>
 
 <?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
+if (IS_PROFILE_PAGE && count($sessions->get_all()) === 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" disabled class="button"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" disabled class="button"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'You are only logged in at this location.' ); ?>
+				<?php _e('You are only logged in at this location.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
+<?php elseif (IS_PROFILE_PAGE && count($sessions->get_all()) > 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" class="button" id="destroy-sessions"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
+				<?php _e('Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
+<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all()) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td>
-			<p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
+			<p><button type="button" class="button" id="destroy-sessions"><?php _e('Log Out Everywhere'); ?></button></p>
 			<p class="description">
 				<?php
 				/* translators: 1: User's display name. */
-				printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
+				printf(__('Log %s out of all locations.'), $profileuser->display_name);
 				?>
 			</p>
 		</td>
@@ -618,7 +618,7 @@ 
 </table>
 
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
 		 *
@@ -628,7 +628,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'show_user_profile', $profileuser );
+		do_action('show_user_profile', $profileuser);
 	} else {
 		/**
 		 * Fires after the 'About the User' settings table on the 'Edit User' screen.
@@ -637,7 +637,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'edit_user_profile', $profileuser );
+		do_action('edit_user_profile', $profileuser);
 	}
 ?>
 
@@ -654,21 +654,21 @@ 
  * @param bool    $enable      Whether to display the capabilities. Default true.
  * @param WP_User $profileuser The current WP_User object.
  */
-if ( count( $profileuser->caps ) > count( $profileuser->roles )
-	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
+if (count($profileuser->caps) > count($profileuser->roles)
+	&& apply_filters('additional_capabilities_display', true, $profileuser)
 ) : ?>
-<h2><?php _e( 'Additional Capabilities' ); ?></h2>
+<h2><?php _e('Additional Capabilities'); ?></h2>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
-	<th scope="row"><?php _e( 'Capabilities' ); ?></th>
+	<th scope="row"><?php _e('Capabilities'); ?></th>
 	<td>
 <?php
 	$output = '';
-	foreach ( $profileuser->caps as $cap => $value ) {
-		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
+	foreach ($profileuser->caps as $cap => $value) {
+		if ( ! $wp_roles->is_role($cap)) {
+			if ('' != $output)
 				$output .= ', ';
-			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+			$output .= $value ? $cap : sprintf(__('Denied: %s'), $cap);
 		}
 	}
 	echo $output;
@@ -681,7 +681,7 @@ 
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
 
-<?php submit_button( IS_PROFILE_PAGE ? __('Update Profile') : __('Update User') ); ?>
+<?php submit_button(IS_PROFILE_PAGE ? __('Update Profile') : __('Update User')); ?>
 
 </form>
 </div>
@@ -695,4 +695,4 @@ 
 	}
 </script>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/nav-menus.php

Braces +88 added lines, -49 removed lines

@@ -15,8 +15,9 @@ 
 // Load all the nav menu interface functions
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
+if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) ) {
 	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+}
 
 // Permissions Check
 if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -29,8 +30,9 @@ 
 
 wp_enqueue_script( 'nav-menu' );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -76,10 +78,11 @@ 
 switch ( $action ) {
 	case 'add-menu-item':
 		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
-			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
-			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		if ( isset( $_REQUEST['nav-menu-locations'] ) ) {
+					set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
+		} elseif ( isset( $_REQUEST['menu-item'] ) ) {
+					wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		}
 		break;
 	case 'move-down-menu-item' :
 
@@ -214,10 +217,11 @@ 
 								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
 							) {
 								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
-									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
-								else
-									$menu_item_data['menu_item_parent'] = 0;
+								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) ) {
+																	$menu_item_data['menu_item_parent'] = $_possible_parent_id;
+								} else {
+																	$menu_item_data['menu_item_parent'] = 0;
+								}
 
 							// Else there isn't something before the parent.
 							} else {
@@ -259,8 +263,9 @@ 
 
 		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		}
 		break;
 
 	case 'delete':
@@ -273,20 +278,23 @@ 
 			unset( $_REQUEST['menu'] );
 		}
 
-		if ( ! isset( $deletion ) )
-			break;
+		if ( ! isset( $deletion ) ) {
+					break;
+		}
 
-		if ( is_wp_error( $deletion ) )
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
-		else
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+		if ( is_wp_error( $deletion ) ) {
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+		} else {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'delete_menus':
 		check_admin_referer( 'nav_menus_bulk_actions' );
 		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
-				continue;
+			if ( ! is_nav_menu( $menu_id_to_delete ) ) {
+							continue;
+			}
 
 			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
 			if ( is_wp_error( $deletion ) ) {
@@ -295,8 +303,9 @@ 
 			}
 		}
 
-		if ( empty( $deletion_error ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		if ( empty( $deletion_error ) ) {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'update':
@@ -304,8 +313,9 @@ 
 
 		// Remove menu locations that have been unchecked.
 		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
-				unset( $menu_locations[ $location ] );
+			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
+							unset( $menu_locations[ $location ] );
+			}
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
@@ -330,8 +340,9 @@ 
 					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
 					$nav_menu_selected_id = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
-						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+					if ( isset( $_REQUEST['menu-item'] ) ) {
+											wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+					}
 					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
 						// If there are menu items, add them
 						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
@@ -346,8 +357,9 @@ 
 					if ( isset( $_REQUEST['use-location'] ) ) {
 						$locations = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+						if ( isset( $locations[ $_REQUEST['use-location'] ] ) ) {
+													$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+						}
 						set_theme_mod( 'nav_menu_locations', $menu_locations );
 					}
 
@@ -454,21 +466,25 @@ 
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
+if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) {
 	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+}
 
 // Get recently edited nav menu.
 $recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) ) {
 	$recently_edited = $nav_menu_selected_id;
+}
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) ) {
 	$nav_menu_selected_id = $recently_edited;
+}
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] ) {
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
+}
 
 // Set $nav_menu_selected_id to 0 if no menus.
 if ( $one_theme_location_no_menus ) {
@@ -479,8 +495,9 @@ 
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
+if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) ) {
 	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+}
 
 // If there's a menu, get its name.
 if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
@@ -531,8 +548,9 @@ 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
+if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) {
 	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+}
 
 if ( ! $locations_screen ) : // Main tab
 	$overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
@@ -570,8 +588,10 @@ 
 		'title'   => __( 'Editing Menus' ),
 		'content' => $editing_menus
 	) );
-else : // Locations Tab.
+else {
+	: // Locations Tab.
 	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
+}
 	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
@@ -609,9 +629,15 @@ 
 		?>
 	</h1>
 	<h2 class="nav-tab-wrapper wp-clearfix">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+	echo ' nav-tab-active';
+}
+?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) {
+	echo ' nav-tab-active';
+}
+?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
 			endif;
 		?>
@@ -647,7 +673,10 @@ 
 								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
 								<?php foreach ( $nav_menus as $menu ) : ?>
 									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
+									<option <?php if ( $selected ) {
+	echo 'data-orig="true"';
+}
+?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
 										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
 									</option>
 								<?php endforeach; ?>
@@ -683,14 +712,20 @@ 
 	 * @since 3.6.0
 	 */
 	do_action( 'after_menu_locations_table' ); ?>
-	<?php else : ?>
+	<?php else {
+	: ?>
 	<div class="manage-menus">
  		<?php if ( $menu_count < 2 ) : ?>
 		<span class="add-edit-menu-action">
-			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) );
+}
+?>
 		</span><!-- /add-edit-menu-action -->
-		<?php else : ?>
-			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+		<?php else {
+	: ?>
+			<form method="get" action="<?php echo admin_url( 'nav-menus.php' );
+}
+?>">
 			<input type="hidden" name="action" value="edit" />
 			<label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
 			<select name="menu" id="select-menu-to-edit">
@@ -754,7 +789,10 @@ 
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+				<div class="menu-edit <?php if ( $add_new_screen ) {
+	echo 'blank-slate';
+}
+?>">
 					<input type="hidden" name="nav-menu-data">
 					<?php
 					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
@@ -808,12 +846,13 @@ 
 								<?php
 								if ( ! isset( $auto_add ) ) {
 									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
-										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
-										$auto_add = true;
-									else
-										$auto_add = false;
+									if ( ! isset( $auto_add['auto_add'] ) ) {
+																			$auto_add = false;
+									} elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) ) {
+																			$auto_add = true;
+									} else {
+																			$auto_add = false;
+									}
 								} ?>
 
 								<dl class="auto-add-pages">

Spacing +314 added lines, -314 removed lines

@@ -10,27 +10,27 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 // Load all the nav menu interface functions
-require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
+require_once(ABSPATH.'wp-admin/includes/nav-menu.php');
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
-	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+if ( ! current_theme_supports('menus') && ! current_theme_supports('widgets'))
+	wp_die(__('Your theme does not support navigation menus or widgets.'));
 
 // Permissions Check
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-wp_enqueue_script( 'nav-menu' );
+wp_enqueue_script('nav-menu');
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -39,15 +39,15 @@ 
 $nav_menu_selected_title = '';
 
 // The menu id of the current menu being edited
-$nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
+$nav_menu_selected_id = isset($_REQUEST['menu']) ? (int) $_REQUEST['menu'] : 0;
 
 // Get existing menu locations assignments
 $locations = get_registered_nav_menus();
 $menu_locations = get_nav_menu_locations();
-$num_locations = count( array_keys( $locations ) );
+$num_locations = count(array_keys($locations));
 
 // Allowed actions: add, update, delete
-$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'edit';
 
 /*
  * If a JSON blob of navigation menu data is found, expand it and inject it
@@ -55,32 +55,32 @@ 
  */
 _wp_expand_nav_menu_post_data();
 
-switch ( $action ) {
+switch ($action) {
 	case 'add-menu-item':
-		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
-			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
-			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		check_admin_referer('add-menu_item', 'menu-settings-column-nonce');
+		if (isset($_REQUEST['nav-menu-locations']))
+			set_theme_mod('nav_menu_locations', array_map('absint', $_REQUEST['menu-locations']));
+		elseif (isset($_REQUEST['menu-item']))
+			wp_save_nav_menu_items($nav_menu_selected_id, $_REQUEST['menu-item']);
 		break;
 	case 'move-down-menu-item' :
 
 		// Moving down a menu item is the same as moving up the next in order.
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -89,28 +89,28 @@ 
 
 				// Get next in order.
 				if (
-					isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
+					isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1])
 				) {
 					$next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
-					$next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
+					$next_item_data = (array) wp_setup_nav_menu_item(get_post($next_item_id));
 
 					// If not siblings of same parent, bubble menu item up but keep order.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
+						! empty($menu_item_data['menu_item_parent']) &&
 						(
-							empty( $next_item_data['menu_item_parent'] ) ||
+							empty($next_item_data['menu_item_parent']) ||
 							$next_item_data['menu_item_parent'] != $menu_item_data['menu_item_parent']
 						)
 					) {
 
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
 
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 							$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						}
 
@@ -120,7 +120,7 @@ 
 						$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
 
 						$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						wp_update_post($menu_item_data);
 						wp_update_post($next_item_data);
@@ -128,32 +128,32 @@ 
 
 				// The item is last but still has a parent, so bubble up.
 				} elseif (
-					! empty( $menu_item_data['menu_item_parent'] ) &&
-					in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
+					! empty($menu_item_data['menu_item_parent']) &&
+					in_array($menu_item_data['menu_item_parent'], $orders_to_dbids)
 				) {
-					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
-					update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+					$menu_item_data['menu_item_parent'] = (int) get_post_meta($menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
+					update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 				}
 			}
 		}
 
 		break;
 	case 'move-up-menu-item' :
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -161,19 +161,19 @@ 
 				}
 
 				// If this menu item is not first.
-				if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
+				if ( ! empty($dbids_to_orders[$menu_item_id]) && ! empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])) {
 
 					// If this menu item is a child of the previous.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
-						in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
-						isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
-						( $menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
+						! empty($menu_item_data['menu_item_parent']) &&
+						in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) &&
+						isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) &&
+						($menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])
 					) {
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 
 							/*
@@ -181,9 +181,9 @@ 
 							 * make menu item a child also of it.
 							 */
 							if (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
-								! empty( $parent_data['menu_item_parent'] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1]) &&
+								! empty($parent_data['menu_item_parent'])
 							) {
 								$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 
@@ -192,11 +192,11 @@ 
 							 * make menu item a child of that something's parent
 							 */
 							} elseif (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1])
 							) {
-								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
+								$_possible_parent_id = (int) get_post_meta($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
+								if (in_array($_possible_parent_id, array_keys($dbids_to_orders)))
 									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
 								else
 									$menu_item_data['menu_item_parent'] = 0;
@@ -213,22 +213,22 @@ 
 							$menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
 
 							// Save changes.
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 							wp_update_post($menu_item_data);
 							wp_update_post($parent_data);
 						}
 
 					// Else this menu item is not a child of the previous.
 					} elseif (
-						empty( $menu_item_data['menu_order'] ) ||
-						empty( $menu_item_data['menu_item_parent'] ) ||
-						! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
-						empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
+						empty($menu_item_data['menu_order']) ||
+						empty($menu_item_data['menu_item_parent']) ||
+						! in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) ||
+						empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) ||
 						$orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
 					) {
 						// Just make it a child of the previous; keep the order.
 						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 						wp_update_post($menu_item_data);
 					}
 				}
@@ -239,244 +239,244 @@ 
 	case 'delete-menu-item':
 		$menu_item_id = (int) $_REQUEST['menu-item'];
 
-		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
+		check_admin_referer('delete-menu_item_'.$menu_item_id);
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if (is_nav_menu_item($menu_item_id) && wp_delete_post($menu_item_id, true))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu item has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete':
-		check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
-		if ( is_nav_menu( $nav_menu_selected_id ) ) {
-			$deletion = wp_delete_nav_menu( $nav_menu_selected_id );
+		check_admin_referer('delete-nav_menu-'.$nav_menu_selected_id);
+		if (is_nav_menu($nav_menu_selected_id)) {
+			$deletion = wp_delete_nav_menu($nav_menu_selected_id);
 		} else {
 			// Reset the selected menu.
 			$nav_menu_selected_id = 0;
-			unset( $_REQUEST['menu'] );
+			unset($_REQUEST['menu']);
 		}
 
-		if ( ! isset( $deletion ) )
+		if ( ! isset($deletion))
 			break;
 
-		if ( is_wp_error( $deletion ) )
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+		if (is_wp_error($deletion))
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 		else
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete_menus':
-		check_admin_referer( 'nav_menus_bulk_actions' );
-		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
+		check_admin_referer('nav_menus_bulk_actions');
+		foreach ($_REQUEST['delete_menus'] as $menu_id_to_delete) {
+			if ( ! is_nav_menu($menu_id_to_delete))
 				continue;
 
-			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
-			if ( is_wp_error( $deletion ) ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+			$deletion = wp_delete_nav_menu($menu_id_to_delete);
+			if (is_wp_error($deletion)) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 				$deletion_error = true;
 			}
 		}
 
-		if ( empty( $deletion_error ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		if (empty($deletion_error))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Selected menus have been successfully deleted.').'</p></div>';
 		break;
 
 	case 'update':
-		check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
+		check_admin_referer('update-nav_menu', 'update-nav-menu-nonce');
 
 		// Remove menu locations that have been unchecked.
-		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
-				unset( $menu_locations[ $location ] );
+		foreach ($locations as $location => $description) {
+			if ((empty($_POST['menu-locations']) || empty($_POST['menu-locations'][$location])) && isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id)
+				unset($menu_locations[$location]);
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
-		if ( isset( $_POST['menu-locations'] ) ) {
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+		if (isset($_POST['menu-locations'])) {
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 		}
 
 		// Set menu locations.
-		set_theme_mod( 'nav_menu_locations', $menu_locations );
+		set_theme_mod('nav_menu_locations', $menu_locations);
 
 		// Add Menu.
-		if ( 0 == $nav_menu_selected_id ) {
-			$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
+		if (0 == $nav_menu_selected_id) {
+			$new_menu_title = trim(esc_html($_POST['menu-name']));
 
-			if ( $new_menu_title ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+			if ($new_menu_title) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object(0, array('menu-name' => $new_menu_title));
 
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+				if (is_wp_error($_nav_menu_selected_id)) {
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_id = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
-						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
-					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
+					if (isset($_REQUEST['menu-item']))
+						wp_save_nav_menu_items($nav_menu_selected_id, absint($_REQUEST['menu-item']));
+					if (isset($_REQUEST['zero-menu-state'])) {
 						// If there are menu items, add them
-						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
+						wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title);
 						// Auto-save nav_menu_locations
 						$locations = get_nav_menu_locations();
-						foreach ( $locations as $location => $menu_id ) {
-								$locations[ $location ] = $nav_menu_selected_id;
+						foreach ($locations as $location => $menu_id) {
+								$locations[$location] = $nav_menu_selected_id;
 								break; // There should only be 1
 						}
-						set_theme_mod( 'nav_menu_locations', $locations );
+						set_theme_mod('nav_menu_locations', $locations);
 					}
-					if ( isset( $_REQUEST['use-location'] ) ) {
+					if (isset($_REQUEST['use-location'])) {
 						$locations = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
-						set_theme_mod( 'nav_menu_locations', $menu_locations );
+						if (isset($locations[$_REQUEST['use-location']]))
+							$menu_locations[$_REQUEST['use-location']] = $nav_menu_selected_id;
+						set_theme_mod('nav_menu_locations', $menu_locations);
 					}
 
 					// $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
+					wp_redirect(admin_url('nav-menus.php?menu='.$_nav_menu_selected_id));
 					exit();
 				}
 			} else {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 			}
 
 		// Update existing menu.
 		} else {
 
-			$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
+			$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
 
-			$menu_title = trim( esc_html( $_POST['menu-name'] ) );
-			if ( ! $menu_title ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+			$menu_title = trim(esc_html($_POST['menu-name']));
+			if ( ! $menu_title) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 				$menu_title = $_menu_object->name;
 			}
 
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
+			if ( ! is_wp_error($_menu_object)) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object($nav_menu_selected_id, array('menu-name' => $menu_title));
+				if (is_wp_error($_nav_menu_selected_id)) {
 					$_menu_object = $_nav_menu_selected_id;
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_title = $_menu_object->name;
 				}
 			}
 
 			// Update menu items.
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+			if ( ! is_wp_error($_menu_object)) {
+				$messages = array_merge($messages, wp_nav_menu_update_menu_items($_nav_menu_selected_id, $nav_menu_selected_title));
 
 				// If the menu ID changed, redirect to the new URL.
-				if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+				if ($nav_menu_selected_id != $_nav_menu_selected_id) {
+					wp_redirect(admin_url('nav-menus.php?menu='.intval($_nav_menu_selected_id)));
 					exit();
 				}
 			}
 		}
 		break;
 	case 'locations':
-		if ( ! $num_locations ) {
-			wp_redirect( admin_url( 'nav-menus.php' ) );
+		if ( ! $num_locations) {
+			wp_redirect(admin_url('nav-menus.php'));
 			exit();
 		}
 
-		add_filter( 'screen_options_show_screen', '__return_false' );
+		add_filter('screen_options_show_screen', '__return_false');
 
-		if ( isset( $_POST['menu-locations'] ) ) {
-			check_admin_referer( 'save-menu-locations' );
+		if (isset($_POST['menu-locations'])) {
+			check_admin_referer('save-menu-locations');
 
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 			// Set menu locations
-			set_theme_mod( 'nav_menu_locations', $menu_locations );
+			set_theme_mod('nav_menu_locations', $menu_locations);
 
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Menu locations updated.').'</p></div>';
 		}
 		break;
 }
 
 // Get all nav menus.
 $nav_menus = wp_get_nav_menus();
-$menu_count = count( $nav_menus );
+$menu_count = count($nav_menus);
 
 // Are we on the add new screen?
-$add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : false;
+$add_new_screen = (isset($_GET['menu']) && 0 == $_GET['menu']) ? true : false;
 
-$locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
+$locations_screen = (isset($_GET['action']) && 'locations' == $_GET['action']) ? true : false;
 
 /*
  * If we have one theme location, and zero menus, we take them right
  * into editing their first menu.
  */
-$page_count = wp_count_posts( 'page' );
-$one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
+$page_count = wp_count_posts('page');
+$one_theme_location_no_menus = (1 == count(get_registered_nav_menus()) && ! $add_new_screen && empty($nav_menus) && ! empty($page_count->publish)) ? true : false;
 
 $nav_menus_l10n = array(
 	'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
-	'moveUp'       => __( 'Move up one' ),
-	'moveDown'     => __( 'Move down one' ),
-	'moveToTop'    => __( 'Move to the top' ),
+	'moveUp'       => __('Move up one'),
+	'moveDown'     => __('Move down one'),
+	'moveToTop'    => __('Move to the top'),
 	/* translators: %s: previous item name */
-	'moveUnder'    => __( 'Move under %s' ),
+	'moveUnder'    => __('Move under %s'),
 	/* translators: %s: previous item name */
-	'moveOutFrom'  => __( 'Move out from under %s' ),
+	'moveOutFrom'  => __('Move out from under %s'),
 	/* translators: %s: previous item name */
-	'under'        => __( 'Under %s' ),
+	'under'        => __('Under %s'),
 	/* translators: %s: previous item name */
-	'outFrom'      => __( 'Out from under %s' ),
+	'outFrom'      => __('Out from under %s'),
 	/* translators: 1: item name, 2: item position, 3: total number of items */
-	'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+	'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 	/* translators: 1: item name, 2: item position, 3: parent item name */
-	'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+	'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 );
-wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 
 /*
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
-	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+if (0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus)
+	wp_redirect(admin_url('nav-menus.php?action=edit&menu=0'));
 
 // Get recently edited nav menu.
-$recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+$recently_edited = absint(get_user_option('nav_menu_recently_edited'));
+if (empty($recently_edited) && is_nav_menu($nav_menu_selected_id))
 	$recently_edited = $nav_menu_selected_id;
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if (empty($nav_menu_selected_id) && ! isset($_GET['menu']) && is_nav_menu($recently_edited))
 	$nav_menu_selected_id = $recently_edited;
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset($_GET['action']) && 'delete' == $_GET['action'])
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 
 // Set $nav_menu_selected_id to 0 if no menus.
-if ( $one_theme_location_no_menus ) {
+if ($one_theme_location_no_menus) {
 	$nav_menu_selected_id = 0;
-} elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
+} elseif (empty($nav_menu_selected_id) && ! empty($nav_menus) && ! $add_new_screen) {
 	// if we have no selection yet, and we have menus, set to the first one in the list.
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
-	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+if ($nav_menu_selected_id != $recently_edited && is_nav_menu($nav_menu_selected_id))
+	update_user_meta($current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id);
 
 // If there's a menu, get its name.
-if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
-	$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
-	$nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
+if ( ! $nav_menu_selected_title && is_nav_menu($nav_menu_selected_id)) {
+	$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
+	$nav_menu_selected_title = ! is_wp_error($_menu_object) ? $_menu_object->name : '';
 }
 
 // Generate truncated menu names.
-foreach ( (array) $nav_menus as $key => $_nav_menu ) {
-	$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
+foreach ((array) $nav_menus as $key => $_nav_menu) {
+	$nav_menus[$key]->truncated_name = wp_html_excerpt($_nav_menu->name, 40, '&hellip;');
 }
 
 // Retrieve menu locations.
-if ( current_theme_supports( 'menus' ) ) {
+if (current_theme_supports('menus')) {
 	$locations = get_registered_nav_menus();
 	$menu_locations = get_nav_menu_locations();
 }
@@ -491,9 +491,9 @@ 
 $_wp_nav_menu_max_depth = 0;
 
 // Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
-if ( is_nav_menu( $nav_menu_selected_id ) ) {
-	$menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
-	$edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
+if (is_nav_menu($nav_menu_selected_id)) {
+	$menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('post_status' => 'any'));
+	$edit_markup = wp_get_nav_menu_to_edit($nav_menu_selected_id);
 }
 
 /**
@@ -503,7 +503,7 @@ 
  * @param string $classes
  * @return string
  */
-function wp_nav_menu_max_depth( $classes ) {
+function wp_nav_menu_max_depth($classes) {
 	global $_wp_nav_menu_max_depth;
 	return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
@@ -513,80 +513,80 @@ 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
-	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+if ( ! current_theme_supports('menus') && ! $num_locations)
+	$messages[] = '<div id="message" class="updated"><p>'.sprintf(__('Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.'), admin_url('widgets.php')).'</p></div>';
 
-if ( ! $locations_screen ) : // Main tab
-	$overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
+if ( ! $locations_screen) : // Main tab
+	$overview  = '<p>'.__('This screen is used for managing your custom navigation menus.').'</p>';
 	/* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
-	$overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
-	$overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
-	$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
-	$overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
+	$overview .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.'), admin_url('widgets.php'), 'Twenty Sixteen', 'Twenty Seventeen').'</p>';
+	$overview .= '<p>'.__('From this screen you can:').'</p>';
+	$overview .= '<ul><li>'.__('Create, edit, and delete menus').'</li>';
+	$overview .= '<li>'.__('Add, organize, and modify individual menu items').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $overview
-	) );
+	));
 
-	$menu_management  = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>';
-	$menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>';
-	$menu_management .= '<li>' . __( 'If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started' ) . '</li></ul>';
-	$menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';
+	$menu_management  = '<p>'.__('The menu management box at the top of the screen is used to control which menu is opened in the editor below.').'</p>';
+	$menu_management .= '<ul><li>'.__('To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>').'</li>';
+	$menu_management .= '<li>'.__('If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started').'</li></ul>';
+	$menu_management .= '<p>'.__('You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'menu-management',
-		'title'   => __( 'Menu Management' ),
+		'title'   => __('Menu Management'),
 		'content' => $menu_management
-	) );
+	));
 
-	$editing_menus  = '<p>' . __( 'Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
-	$editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
-	$editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
-	$editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
+	$editing_menus  = '<p>'.__('Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.').'</p>';
+	$editing_menus .= '<p>'.__('<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.').'</p>';
+	$editing_menus .= '<ul><li>'.__('Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu').'</li>';
+	$editing_menus .= '<li>'.__('Delete a menu item by <strong>expanding it and clicking the Remove link</strong>').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'editing-menus',
-		'title'   => __( 'Editing Menus' ),
+		'title'   => __('Editing Menus'),
 		'content' => $editing_menus
-	) );
+	));
 else : // Locations Tab.
-	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
-	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
+	$locations_overview  = '<p>'.__('This screen is used for globally assigning menus to locations defined by your theme.').'</p>';
+	$locations_overview .= '<ul><li>'.__('To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'locations-overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $locations_overview
-	) );
+	));
 endif;
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen">Documentation on Menus</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Menus_Screen">Documentation on Menus</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
 // Get the admin header.
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-	<h1 class="wp-heading-inline"><?php echo esc_html( __( 'Menus' ) ); ?></h1>
+	<h1 class="wp-heading-inline"><?php echo esc_html(__('Menus')); ?></h1>
 	<?php
-	if ( current_user_can( 'customize' ) ) :
-		$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+	if (current_user_can('customize')) :
+		$focus = $locations_screen ? array('section' => 'menu_locations') : array('panel' => 'nav_menus');
 		printf(
 			' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg( array(
-				array( 'autofocus' => $focus ),
-				'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-			), admin_url( 'customize.php' ) ) ),
-			__( 'Manage with Live Preview' )
+			esc_url(add_query_arg(array(
+				array('autofocus' => $focus),
+				'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+			), admin_url('customize.php'))),
+			__('Manage with Live Preview')
 		);
 	endif;
 	?>
@@ -594,60 +594,60 @@ 
 	<hr class="wp-header-end">
 
 	<h2 class="nav-tab-wrapper wp-clearfix">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
-		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+		<a href="<?php echo admin_url('nav-menus.php'); ?>" class="nav-tab<?php if ( ! isset($_GET['action']) || isset($_GET['action']) && 'locations' != $_GET['action']) echo ' nav-tab-active'; ?>"><?php esc_html_e('Edit Menus'); ?></a>
+		<?php if ($num_locations && $menu_count) : ?>
+			<a href="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>" class="nav-tab<?php if ($locations_screen) echo ' nav-tab-active'; ?>"><?php esc_html_e('Manage Locations'); ?></a>
 		<?php
 			endif;
 		?>
 	</h2>
 	<?php
-	foreach ( $messages as $message ) :
-		echo $message . "\n";
+	foreach ($messages as $message) :
+		echo $message."\n";
 	endforeach;
 	?>
 	<?php
-	if ( $locations_screen ) :
-		if ( 1 == $num_locations ) {
-			echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+	if ($locations_screen) :
+		if (1 == $num_locations) {
+			echo '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
-			echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			echo '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
 	?>
 	<div id="menu-locations-wrap">
-		<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
+		<form method="post" action="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>">
 			<table class="widefat fixed" id="menu-locations-table">
 				<thead>
 				<tr>
-					<th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
-					<th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
+					<th scope="col" class="manage-column column-locations"><?php _e('Theme Location'); ?></th>
+					<th scope="col" class="manage-column column-menus"><?php _e('Assigned Menu'); ?></th>
 				</tr>
 				</thead>
 				<tbody class="menu-locations">
-				<?php foreach ( $locations as $_location => $_name ) { ?>
+				<?php foreach ($locations as $_location => $_name) { ?>
 					<tr class="menu-locations-row">
 						<td class="menu-location-title"><label for="locations-<?php echo $_location; ?>"><?php echo $_name; ?></label></td>
 						<td class="menu-location-menus">
 							<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
-								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
-								<?php foreach ( $nav_menus as $menu ) : ?>
-									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
-										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
+								<option value="0"><?php printf('&mdash; %s &mdash;', esc_html__('Select a Menu')); ?></option>
+								<?php foreach ($nav_menus as $menu) : ?>
+									<?php $selected = isset($menu_locations[$_location]) && $menu_locations[$_location] == $menu->term_id; ?>
+									<option <?php if ($selected) echo 'data-orig="true"'; ?> <?php selected($selected); ?> value="<?php echo $menu->term_id; ?>">
+										<?php echo wp_html_excerpt($menu->name, 40, '&hellip;'); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 							<div class="locations-row-links">
-								<?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
+								<?php if (isset($menu_locations[$_location]) && 0 != $menu_locations[$_location]) : ?>
 								<span class="locations-edit-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => $menu_locations[$_location]), admin_url('nav-menus.php'))); ?>">
+										<span aria-hidden="true"><?php _ex('Edit', 'menu'); ?></span><span class="screen-reader-text"><?php _e('Edit selected menu'); ?></span>
 									</a>
 								</span>
 								<?php endif; ?>
 								<span class="locations-add-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, 'use-location' => $_location ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<?php _ex( 'Use new menu', 'menu' ); ?>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0, 'use-location' => $_location), admin_url('nav-menus.php'))); ?>">
+										<?php _ex('Use new menu', 'menu'); ?>
 									</a>
 								</span>
 							</div><!-- .locations-row-links -->
@@ -656,9 +656,9 @@ 
 				<?php } // foreach ?>
 				</tbody>
 			</table>
-			<p class="button-controls wp-clearfix"><?php submit_button( __( 'Save Changes' ), 'primary left', 'nav-menu-locations', false ); ?></p>
-			<?php wp_nonce_field( 'save-menu-locations' ); ?>
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<p class="button-controls wp-clearfix"><?php submit_button(__('Save Changes'), 'primary left', 'nav-menu-locations', false); ?></p>
+			<?php wp_nonce_field('save-menu-locations'); ?>
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 		</form>
 	</div><!-- #menu-locations-wrap -->
 	<?php
@@ -667,31 +667,31 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	do_action( 'after_menu_locations_table' ); ?>
+	do_action('after_menu_locations_table'); ?>
 	<?php else : ?>
 	<div class="manage-menus">
- 		<?php if ( $menu_count < 2 ) : ?>
+ 		<?php if ($menu_count < 2) : ?>
 		<span class="add-edit-menu-action">
-			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php printf(__('Edit your menu below, or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
-			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+			<form method="get" action="<?php echo admin_url('nav-menus.php'); ?>">
 			<input type="hidden" name="action" value="edit" />
-			<label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
+			<label for="select-menu-to-edit" class="selected-menu"><?php _e('Select a menu to edit:'); ?></label>
 			<select name="menu" id="select-menu-to-edit">
-				<?php if ( $add_new_screen ) : ?>
-					<option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+				<?php if ($add_new_screen) : ?>
+					<option value="0" selected="selected"><?php _e('&mdash; Select &mdash;'); ?></option>
 				<?php endif; ?>
-				<?php foreach ( (array) $nav_menus as $_nav_menu ) : ?>
-					<option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
+				<?php foreach ((array) $nav_menus as $_nav_menu) : ?>
+					<option value="<?php echo esc_attr($_nav_menu->term_id); ?>" <?php selected($_nav_menu->term_id, $nav_menu_selected_id); ?>>
 						<?php
-						echo esc_html( $_nav_menu->truncated_name ) ;
+						echo esc_html($_nav_menu->truncated_name);
 
-						if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
+						if ( ! empty($menu_locations) && in_array($_nav_menu->term_id, $menu_locations)) {
 							$locations_assigned_to_this_menu = array();
-							foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
-								if ( isset( $locations[ $menu_location_key ] ) ) {
-									$locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+							foreach (array_keys($menu_locations, $_nav_menu->term_id) as $menu_location_key) {
+								if (isset($locations[$menu_location_key])) {
+									$locations_assigned_to_this_menu[] = $locations[$menu_location_key];
 								}
 							}
 
@@ -702,13 +702,13 @@ 
 							 *
 							 * @param int $locations Number of menu locations to list. Default 3.
 							 */
-							$assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
+							$assigned_locations = array_slice($locations_assigned_to_this_menu, 0, absint(apply_filters('wp_nav_locations_listed_per_menu', 3)));
 
 							// Adds ellipses following the number of locations defined in $assigned_locations.
-							if ( ! empty( $assigned_locations ) ) {
-								printf( ' (%1$s%2$s)',
-									implode( ', ', $assigned_locations ),
-									count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
+							if ( ! empty($assigned_locations)) {
+								printf(' (%1$s%2$s)',
+									implode(', ', $assigned_locations),
+									count($locations_assigned_to_this_menu) > count($assigned_locations) ? ' &hellip;' : ''
 								);
 							}
 						}
@@ -716,111 +716,111 @@ 
 					</option>
 				<?php endforeach; ?>
 			</select>
-			<span class="submit-btn"><input type="submit" class="button" value="<?php esc_attr_e( 'Select' ); ?>"></span>
+			<span class="submit-btn"><input type="submit" class="button" value="<?php esc_attr_e('Select'); ?>"></span>
 			<span class="add-new-menu-action">
-				<?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+				<?php printf(__('or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 			</span><!-- /add-new-menu-action -->
 		</form>
 	<?php endif; ?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame" class="wp-clearfix">
-	<div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
+	<div id="menu-settings-column" class="metabox-holder<?php if (isset($_GET['menu']) && '0' == $_GET['menu']) { echo ' metabox-holder-disabled'; } ?>">
 
 		<div class="clear"></div>
 
 		<form id="nav-menu-meta" class="nav-menu-meta" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 			<input type="hidden" name="action" value="add-menu-item" />
-			<?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
-			<?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
+			<?php wp_nonce_field('add-menu_item', 'menu-settings-column-nonce'); ?>
+			<?php do_accordion_sections('nav-menus', 'side', null); ?>
 		</form>
 
 	</div><!-- /#menu-settings-column -->
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+				<div class="menu-edit <?php if ($add_new_screen) echo 'blank-slate'; ?>">
 					<input type="hidden" name="nav-menu-data">
 					<?php
-					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-					wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-					wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' );
+					wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+					wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+					wp_nonce_field('update-nav_menu', 'update-nav-menu-nonce');
 
 					$menu_name_aria_desc = $add_new_screen ? ' aria-describedby="menu-name-desc"' : '';
 
-					if ( $one_theme_location_no_menus ) {
-						$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
+					if ($one_theme_location_no_menus) {
+						$menu_name_val = 'value="'.esc_attr('Menu 1').'"';
 					?>
 						<input type="hidden" name="zero-menu-state" value="true" />
 					<?php } else {
-						$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
+						$menu_name_val = 'value="'.esc_attr($nav_menu_selected_title).'"';
 					} ?>
  					<input type="hidden" name="action" value="update" />
-					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 					<div id="nav-menu-header">
 						<div class="major-publishing-actions wp-clearfix">
-							<label class="menu-name-label" for="menu-name"><?php _e( 'Menu Name' ); ?></label>
-							<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox" <?php echo $menu_name_val . $menu_name_aria_desc; ?> />
+							<label class="menu-name-label" for="menu-name"><?php _e('Menu Name'); ?></label>
+							<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox" <?php echo $menu_name_val.$menu_name_aria_desc; ?> />
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'primary large menu-save', 'save_menu', false, array('id' => 'save_menu_header')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- END .nav-menu-header -->
 					<div id="post-body">
 						<div id="post-body-content" class="wp-clearfix">
-							<?php if ( ! $add_new_screen ) : ?>
-							<h3><?php _e( 'Menu Structure' ); ?></h3>
-							<?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
-							<div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+							<?php if ( ! $add_new_screen) : ?>
+							<h3><?php _e('Menu Structure'); ?></h3>
+							<?php $starter_copy = ($one_theme_location_no_menus) ? __('Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.') : __('Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.'); ?>
+							<div class="drag-instructions post-body-plain" <?php if (isset($menu_items) && 0 == count($menu_items)) { ?>style="display: none;"<?php } ?>>
 								<p><?php echo $starter_copy; ?></p>
 							</div>
 							<?php
-							if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+							if (isset($edit_markup) && ! is_wp_error($edit_markup)) {
 								echo $edit_markup;
 							} else {
 							?>
 							<ul class="menu" id="menu-to-edit"></ul>
 							<?php } ?>
 							<?php endif; ?>
-							<?php if ( $add_new_screen ) : ?>
-								<p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
-								<?php if ( isset( $_GET['use-location'] ) ) : ?>
-									<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
+							<?php if ($add_new_screen) : ?>
+								<p class="post-body-plain" id="menu-name-desc"><?php _e('Give your menu a name, then click Create Menu.'); ?></p>
+								<?php if (isset($_GET['use-location'])) : ?>
+									<input type="hidden" name="use-location" value="<?php echo esc_attr($_GET['use-location']); ?>" />
 								<?php endif; ?>
 							<?php endif; ?>
-							<div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
-								<h3><?php _e( 'Menu Settings' ); ?></h3>
+							<div class="menu-settings" <?php if ($one_theme_location_no_menus) { ?>style="display: none;"<?php } ?>>
+								<h3><?php _e('Menu Settings'); ?></h3>
 								<?php
-								if ( ! isset( $auto_add ) ) {
-									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
+								if ( ! isset($auto_add)) {
+									$auto_add = get_option('nav_menu_options');
+									if ( ! isset($auto_add['auto_add']))
 										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
+									elseif (false !== array_search($nav_menu_selected_id, $auto_add['auto_add']))
 										$auto_add = true;
 									else
 										$auto_add = false;
 								} ?>
 
 								<fieldset class="menu-settings-group auto-add-pages">
-									<legend class="menu-settings-group-name howto"><?php _e( 'Auto add pages' ); ?></legend>
+									<legend class="menu-settings-group-name howto"><?php _e('Auto add pages'); ?></legend>
 									<div class="menu-settings-input checkbox-input">
-										<input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
+										<input type="checkbox"<?php checked($auto_add); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf(__('Automatically add new top-level pages to this menu'), esc_url(admin_url('edit.php?post_type=page'))); ?></label>
 									</div>
 								</fieldset>
 
-								<?php if ( current_theme_supports( 'menus' ) ) : ?>
+								<?php if (current_theme_supports('menus')) : ?>
 
 									<fieldset class="menu-settings-group menu-theme-locations">
-										<legend class="menu-settings-group-name howto"><?php _e( 'Display location' ); ?></legend>
-										<?php foreach ( $locations as $location => $description ) : ?>
+										<legend class="menu-settings-group-name howto"><?php _e('Display location'); ?></legend>
+										<?php foreach ($locations as $location => $description) : ?>
 										<div class="menu-settings-input checkbox-input">
-											<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
-											<label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
-											<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
+											<input type="checkbox"<?php checked(isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id); ?> name="menu-locations[<?php echo esc_attr($location); ?>]" id="locations-<?php echo esc_attr($location); ?>" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
+											<label for="locations-<?php echo esc_attr($location); ?>"><?php echo $description; ?></label>
+											<?php if ( ! empty($menu_locations[$location]) && $menu_locations[$location] != $nav_menu_selected_id) : ?>
 												<span class="theme-location-set"><?php
 													/* translators: %s: menu name */
-													printf( _x( '(Currently set to: %s)', 'menu location' ),
-														wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+													printf(_x('(Currently set to: %s)', 'menu location'),
+														wp_get_nav_menu_object($menu_locations[$location])->name
 													);
 												?></span>
 											<?php endif; ?>
@@ -835,13 +835,13 @@ 
 					</div><!-- /#post-body -->
 					<div id="nav-menu-footer">
 						<div class="major-publishing-actions wp-clearfix">
-							<?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
+							<?php if (0 != $menu_count && ! $add_new_screen) : ?>
 							<span class="delete-action">
-								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'menu' => $nav_menu_selected_id ), admin_url( 'nav-menus.php' ) ), 'delete-nav_menu-' . $nav_menu_selected_id) ); ?>"><?php _e('Delete Menu'); ?></a>
+								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url(wp_nonce_url(add_query_arg(array('action' => 'delete', 'menu' => $nav_menu_selected_id), admin_url('nav-menus.php')), 'delete-nav_menu-'.$nav_menu_selected_id)); ?>"><?php _e('Delete Menu'); ?></a>
 							</span><!-- END .delete-action -->
 							<?php endif; ?>
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'primary large menu-save', 'save_menu', false, array('id' => 'save_menu_footer')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- /#nav-menu-footer -->
@@ -852,4 +852,4 @@ 
 	</div><!-- /#nav-menus-frame -->
 	<?php endif; ?>
 </div><!-- /.wrap-->
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/theme-editor.php

Braces +26 added lines, -12 removed lines

@@ -14,8 +14,9 @@ 
 	exit();
 }
 
-if ( !current_user_can('edit_themes') )
+if ( !current_user_can('edit_themes') ) {
 	wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
+}
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
@@ -130,8 +131,9 @@ 
 
 	update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
-		$error = true;
+	if ( ! is_file( $file ) ) {
+			$error = true;
+	}
 
 	$content = '';
 	if ( ! $error && filesize( $file ) > 0 ) {
@@ -158,15 +160,19 @@ 
 
 $description = get_file_description( $relative_file );
 $file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
+if ( $description != $file_show ) {
 	$description .= ' <span>(' . $file_show . ')</span>';
+}
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
-<h2><?php echo $theme->display( 'Name' ); if ( $description ) echo ': ' . $description; ?></h2>
+<h2><?php echo $theme->display( 'Name' ); if ( $description ) {
+	echo ': ' . $description;
+}
+?></h2>
 </div>
 <div class="alignright">
 	<form action="theme-editor.php" method="post">
@@ -174,8 +180,9 @@ 
 		<select name="theme" id="theme">
 <?php
 foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
-		continue;
+	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {
+			continue;
+	}
 
 	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
 	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
@@ -188,8 +195,9 @@ 
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
+if ( $theme->errors() ) {
 	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+}
 ?>
 	<div id="templateside">
 <?php
@@ -250,9 +258,12 @@ 
 </div>
 <?php if ( $error ) :
 	echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-else : ?>
+else {
+	: ?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
-	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet );
+}
+?>
 		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
@@ -275,8 +286,11 @@ 
 <?php
 	if ( is_writeable( $file ) ) :
 		submit_button( __( 'Update File' ), 'primary', 'submit', true );
-	else : ?>
-<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+	else {
+		: ?>
+<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.');
+	}
+	?></em></p>
 <?php endif; ?>
 		</div>
 	</form>

Switch Indentation +67 added lines, -67 removed lines

@@ -107,60 +107,60 @@ 
 $scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
 
 switch( $action ) {
-case 'update':
-	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-	if ( is_writeable( $file ) ) {
-		// is_writable() not always reliable, check return value. see comments @ https://secure.php.net/is_writable
-		$f = fopen( $file, 'w+' );
-		if ( $f !== false ) {
-			fwrite( $f, $newcontent );
-			fclose( $f );
-			$location .= '&updated=true';
-			$theme->cache_delete();
+	case 'update':
+		check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+		$newcontent = wp_unslash( $_POST['newcontent'] );
+		$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
+		if ( is_writeable( $file ) ) {
+			// is_writable() not always reliable, check return value. see comments @ https://secure.php.net/is_writable
+			$f = fopen( $file, 'w+' );
+			if ( $f !== false ) {
+				fwrite( $f, $newcontent );
+				fclose( $f );
+				$location .= '&updated=true';
+				$theme->cache_delete();
+			}
 		}
-	}
-	wp_redirect( $location );
-	exit;
+		wp_redirect( $location );
+		exit;
 
-default:
+	default:
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-	update_recently_edited( $file );
+		update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
-		$error = true;
+		if ( ! is_file( $file ) )
+			$error = true;
 
-	$content = '';
-	if ( ! $error && filesize( $file ) > 0 ) {
-		$f = fopen($file, 'r');
-		$content = fread($f, filesize($file));
+		$content = '';
+		if ( ! $error && filesize( $file ) > 0 ) {
+			$f = fopen($file, 'r');
+			$content = fread($f, filesize($file));
 
-		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-			$functions = wp_doc_link_parse( $content );
+			if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
+				$functions = wp_doc_link_parse( $content );
 
-			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function ) {
-				$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+				$docs_select = '<select name="docs-list" id="docs-list">';
+				$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
+				foreach ( $functions as $function ) {
+					$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+				}
+				$docs_select .= '</select>';
 			}
-			$docs_select .= '</select>';
-		}
 
-		$content = esc_textarea( $content );
-	}
+			$content = esc_textarea( $content );
+		}
 
-	if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
-<?php endif;
+		if ( isset( $_GET['updated'] ) ) : ?>
+	 <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+	<?php endif;
 
-$description = get_file_description( $relative_file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-	$description .= ' <span>(' . $file_show . ')</span>';
-?>
+	$description = get_file_description( $relative_file );
+	$file_show = array_search( $file, array_filter( $allowed_files ) );
+	if ( $description != $file_show )
+		$description .= ' <span>(' . $file_show . ')</span>';
+	?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
@@ -173,38 +173,38 @@ 
 		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
 		<select name="theme" id="theme">
 <?php
-foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
-		continue;
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
+		if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+			continue;
 
-	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+		$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+		echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
 }
-?>
-		</select>
+	?>
+			</select>
 		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
-	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
-?>
-	<div id="templateside">
-<?php
-if ( $allowed_files ) :
-	$previous_file_type = '';
-
-	foreach ( $allowed_files as $filename => $absolute_filename ) :
-		$file_type = substr( $filename, strrpos( $filename, '.' ) );
-
-		if ( $file_type !== $previous_file_type ) {
-			if ( '' !== $previous_file_type ) {
-				echo "\t</ul>\n";
-			}
-
-			switch ( $file_type ) {
+	if ( $theme->errors() )
+		echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+	?>
+		<div id="templateside">
+	<?php
+	if ( $allowed_files ) :
+		$previous_file_type = '';
+
+		foreach ( $allowed_files as $filename => $absolute_filename ) :
+			$file_type = substr( $filename, strrpos( $filename, '.' ) );
+
+			if ( $file_type !== $previous_file_type ) {
+				if ( '' !== $previous_file_type ) {
+					echo "\t</ul>\n";
+				}
+
+				switch ( $file_type ) {
 				case '.php':
 					if ( $has_templates || $theme->parent() ) :
 						echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
@@ -225,7 +225,7 @@ 
 					/* translators: %s: file extension */
 					echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
 					break;
-			}
+				}
 
 			echo "\t<ul>\n";
 		}

Spacing +109 added lines, -109 removed lines

@@ -7,63 +7,63 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'theme-editor.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('theme-editor.php'));
 	exit();
 }
 
-if ( !current_user_can('edit_themes') )
+if ( ! current_user_can('edit_themes'))
 	wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
-	<p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>
-	<p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
-	<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
-	<p>' . __('After typing in your edits, click Update File.') . '</p>
-	<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>
-	<p>' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '</p>' .
-	( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
-) );
+	'<p>'.__('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.').'</p>
+	<p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.').'</p>
+	<p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.').'</p>
+	<p id="newcontent-description">' . __('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.').'</p>
+	<p>' . __('After typing in your edits, click Update File.').'</p>
+	<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.').'</p>
+	<p>' . sprintf(__('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes')).'</p>'.
+	(is_network_admin() ? '<p>'.__('Any edits to files from this screen will be reflected on all sites in the network.').'</p>' : '')
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
+wp_reset_vars(array('action', 'error', 'file', 'theme'));
 
-if ( $theme ) {
+if ($theme) {
 	$stylesheet = $theme;
 } else {
 	$stylesheet = get_stylesheet();
 }
 
-$theme = wp_get_theme( $stylesheet );
+$theme = wp_get_theme($stylesheet);
 
-if ( ! $theme->exists() ) {
-	wp_die( __( 'The requested theme does not exist.' ) );
+if ( ! $theme->exists()) {
+	wp_die(__('The requested theme does not exist.'));
 }
 
-if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) {
-	wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
+if ($theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code()) {
+	wp_die(__('The requested theme does not exist.').' '.$theme->errors()->get_error_message());
 }
 
 $allowed_files = $style_files = array();
 $has_templates = false;
-$default_types = array( 'php', 'css' );
+$default_types = array('php', 'css');
 
 /**
  * Filters the list of file types allowed for editing in the Theme editor.
@@ -73,208 +73,208 @@ 
  * @param array    $default_types List of file types. Default types include 'php' and 'css'.
  * @param WP_Theme $theme         The current Theme object.
  */
-$file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme );
+$file_types = apply_filters('wp_theme_editor_filetypes', $default_types, $theme);
 
 // Ensure that default types are still there.
-$file_types = array_unique( array_merge( $file_types, $default_types ) );
+$file_types = array_unique(array_merge($file_types, $default_types));
 
-foreach ( $file_types as $type ) {
-	switch ( $type ) {
+foreach ($file_types as $type) {
+	switch ($type) {
 		case 'php':
-			$allowed_files += $theme->get_files( 'php', 1 );
-			$has_templates = ! empty( $allowed_files );
+			$allowed_files += $theme->get_files('php', 1);
+			$has_templates = ! empty($allowed_files);
 			break;
 		case 'css':
-			$style_files = $theme->get_files( 'css' );
+			$style_files = $theme->get_files('css');
 			$allowed_files['style.css'] = $style_files['style.css'];
 			$allowed_files += $style_files;
 			break;
 		default:
-			$allowed_files += $theme->get_files( $type );
+			$allowed_files += $theme->get_files($type);
 			break;
 	}
 }
 
-if ( empty( $file ) ) {
+if (empty($file)) {
 	$relative_file = 'style.css';
 	$file = $allowed_files['style.css'];
 } else {
 	$relative_file = $file;
-	$file = $theme->get_stylesheet_directory() . '/' . $relative_file;
+	$file = $theme->get_stylesheet_directory().'/'.$relative_file;
 }
 
-validate_file_to_edit( $file, $allowed_files );
-$scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
+validate_file_to_edit($file, $allowed_files);
+$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
-switch( $action ) {
+switch ($action) {
 case 'update':
-	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-	if ( is_writeable( $file ) ) {
+	check_admin_referer('edit-theme_'.$file.$stylesheet);
+	$newcontent = wp_unslash($_POST['newcontent']);
+	$location = 'theme-editor.php?file='.urlencode($relative_file).'&theme='.urlencode($stylesheet).'&scrollto='.$scrollto;
+	if (is_writeable($file)) {
 		// is_writable() not always reliable, check return value. see comments @ https://secure.php.net/is_writable
-		$f = fopen( $file, 'w+' );
-		if ( $f !== false ) {
-			fwrite( $f, $newcontent );
-			fclose( $f );
+		$f = fopen($file, 'w+');
+		if ($f !== false) {
+			fwrite($f, $newcontent);
+			fclose($f);
 			$location .= '&updated=true';
 			$theme->cache_delete();
 		}
 	}
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
 
 default:
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	update_recently_edited( $file );
+	update_recently_edited($file);
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file($file))
 		$error = true;
 
 	$content = '';
-	if ( ! $error && filesize( $file ) > 0 ) {
+	if ( ! $error && filesize($file) > 0) {
 		$f = fopen($file, 'r');
 		$content = fread($f, filesize($file));
 
-		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-			$functions = wp_doc_link_parse( $content );
+		if ('.php' == substr($file, strrpos($file, '.'))) {
+			$functions = wp_doc_link_parse($content);
 
 			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function ) {
-				$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+			$docs_select .= '<option value="">'.esc_attr__('Function Name&hellip;').'</option>';
+			foreach ($functions as $function) {
+				$docs_select .= '<option value="'.esc_attr(urlencode($function)).'">'.htmlspecialchars($function).'()</option>';
 			}
 			$docs_select .= '</select>';
 		}
 
-		$content = esc_textarea( $content );
+		$content = esc_textarea($content);
 	}
 
-	if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+	if (isset($_GET['updated'])) : ?>
+ <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif;
 
-$description = get_file_description( $relative_file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-	$description .= ' <span>(' . $file_show . ')</span>';
+$description = get_file_description($relative_file);
+$file_show = array_search($file, array_filter($allowed_files));
+if ($description != $file_show)
+	$description .= ' <span>('.$file_show.')</span>';
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
-<h2><?php echo $theme->display( 'Name' ); if ( $description ) echo ': ' . $description; ?></h2>
+<h2><?php echo $theme->display('Name'); if ($description) echo ': '.$description; ?></h2>
 </div>
 <div class="alignright">
 	<form action="theme-editor.php" method="post">
 		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
 		<select name="theme" id="theme">
 <?php
-foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+foreach (wp_get_themes(array('errors' => null)) as $a_stylesheet => $a_theme) {
+	if ($a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code())
 		continue;
 
 	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+	echo "\n\t".'<option value="'.esc_attr($a_stylesheet).'"'.$selected.'>'.$a_theme->display('Name').'</option>';
 }
 ?>
 		</select>
-		<?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
+		<?php submit_button(__('Select'), '', 'Submit', false); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
-	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+if ($theme->errors())
+	echo '<div class="error"><p><strong>'.__('This theme is broken.').'</strong> '.$theme->errors()->get_error_message().'</p></div>';
 ?>
 	<div id="templateside">
 <?php
-if ( $allowed_files ) :
+if ($allowed_files) :
 	$previous_file_type = '';
 
-	foreach ( $allowed_files as $filename => $absolute_filename ) :
-		$file_type = substr( $filename, strrpos( $filename, '.' ) );
+	foreach ($allowed_files as $filename => $absolute_filename) :
+		$file_type = substr($filename, strrpos($filename, '.'));
 
-		if ( $file_type !== $previous_file_type ) {
-			if ( '' !== $previous_file_type ) {
+		if ($file_type !== $previous_file_type) {
+			if ('' !== $previous_file_type) {
 				echo "\t</ul>\n";
 			}
 
-			switch ( $file_type ) {
+			switch ($file_type) {
 				case '.php':
-					if ( $has_templates || $theme->parent() ) :
-						echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
-						if ( $theme->parent() ) {
-							echo '<p class="howto">' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
-								sprintf( '<a href="%s">%s</a>',
-									self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
-									$theme->parent()->display( 'Name' )
+					if ($has_templates || $theme->parent()) :
+						echo "\t<h2>".__('Templates')."</h2>\n";
+						if ($theme->parent()) {
+							echo '<p class="howto">'.sprintf(__('This child theme inherits templates from a parent theme, %s.'),
+								sprintf('<a href="%s">%s</a>',
+									self_admin_url('theme-editor.php?theme='.urlencode($theme->get_template())),
+									$theme->parent()->display('Name')
 								)
-							) . "</p>\n";
+							)."</p>\n";
 						}
 					endif;
 					break;
 				case '.css':
-					echo "\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n";
+					echo "\t<h2>"._x('Styles', 'Theme stylesheets in theme editor')."</h2>\n";
 					break;
 				default:
 					/* translators: %s: file extension */
-					echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
+					echo "\t<h2>".sprintf(__('%s files'), $file_type)."</h2>\n";
 					break;
 			}
 
 			echo "\t<ul>\n";
 		}
 
-		$file_description = get_file_description( $filename );
-		if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
-			$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+		$file_description = get_file_description($filename);
+		if ($filename !== basename($absolute_filename) || $file_description !== $filename) {
+			$file_description .= '<br /><span class="nonessential">('.$filename.')</span>';
 		}
 
-		if ( $absolute_filename === $file ) {
-			$file_description = '<span class="highlight">' . $file_description . '</span>';
+		if ($absolute_filename === $file) {
+			$file_description = '<span class="highlight">'.$file_description.'</span>';
 		}
 
 		$previous_file_type = $file_type;
 ?>
-		<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
+		<li><a href="theme-editor.php?file=<?php echo urlencode($filename) ?>&amp;theme=<?php echo urlencode($stylesheet) ?>"><?php echo $file_description; ?></a></li>
 <?php
 	endforeach;
 ?>
 </ul>
 <?php endif; ?>
 </div>
-<?php if ( $error ) :
-	echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
+<?php if ($error) :
+	echo '<div class="error"><p>'.__('Oops, no such file exists! Double check the name and try again, merci.').'</p></div>';
 else : ?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
-	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+	<?php wp_nonce_field('edit-theme_'.$file.$stylesheet); ?>
 		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
-		<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
-		<input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
+		<input type="hidden" name="file" value="<?php echo esc_attr($relative_file); ?>" />
+		<input type="hidden" name="theme" value="<?php echo esc_attr($theme->get_stylesheet()); ?>" />
 		<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
 		</div>
-	<?php if ( ! empty( $functions ) ) : ?>
+	<?php if ( ! empty($functions)) : ?>
 		<div id="documentation" class="hide-if-no-js">
 		<label for="docs-list"><?php _e('Documentation:') ?></label>
 		<?php echo $docs_select; ?>
-		<input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
+		<input type="button" class="button" value="<?php esc_attr_e('Look Up'); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode(get_user_locale()) ?>&amp;version=<?php echo urlencode(get_bloginfo('version')) ?>&amp;redirect=true'); }" />
 		</div>
 	<?php endif; ?>
 
 		<div>
-		<?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
-			<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-			<?php _e( 'This is a file in your current parent theme.' ); ?></p>
+		<?php if (is_child_theme() && $theme->get_stylesheet() == get_template()) : ?>
+			<p><?php if (is_writeable($file)) { ?><strong><?php _e('Caution:'); ?></strong><?php } ?>
+			<?php _e('This is a file in your current parent theme.'); ?></p>
 		<?php endif; ?>
 <?php
-	if ( is_writeable( $file ) ) :
-		submit_button( __( 'Update File' ), 'primary', 'submit', true );
+	if (is_writeable($file)) :
+		submit_button(__('Update File'), 'primary', 'submit', true);
 	else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
@@ -295,4 +295,4 @@ 
 break;
 }
 
-include(ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/load-scripts.php

Braces +7 added lines, -4 removed lines

@@ -12,14 +12,16 @@ 
 define( 'WPINC', 'wp-includes' );
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
+if ( is_array( $load ) ) {
 	$load = implode( '', $load );
+}
 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty($load) ) {
 	exit;
+}
 
 require( ABSPATH . 'wp-admin/includes/noop.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
@@ -43,8 +45,9 @@ 
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
-		continue;
+	if ( !array_key_exists($handle, $wp_scripts->registered) ) {
+			continue;
+	}
 
 	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
 	$out .= get_file($path) . "\n";

Spacing +26 added lines, -26 removed lines

@@ -8,64 +8,64 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-if ( ! defined( 'ABSPATH' ) ) {
-	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined('ABSPATH')) {
+	define('ABSPATH', dirname(dirname(__FILE__)).'/');
 }
 
-define( 'WPINC', 'wp-includes' );
+define('WPINC', 'wp-includes');
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
-	$load = implode( '', $load );
+if (is_array($load))
+	$load = implode('', $load);
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
-$load = array_unique( explode( ',', $load ) );
+$load = preg_replace('/[^a-z0-9,_-]+/i', '', $load);
+$load = array_unique(explode(',', $load));
 
-if ( empty($load) )
+if (empty($load))
 	exit;
 
-require( ABSPATH . 'wp-admin/includes/noop.php' );
-require( ABSPATH . WPINC . '/script-loader.php' );
-require( ABSPATH . WPINC . '/version.php' );
+require(ABSPATH.'wp-admin/includes/noop.php');
+require(ABSPATH.WPINC.'/script-loader.php');
+require(ABSPATH.WPINC.'/version.php');
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
+$compress = (isset($_GET['c']) && $_GET['c']);
+$force_gzip = ($compress && 'gzip' == $_GET['c']);
 $expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_scripts = new WP_Scripts();
 wp_default_scripts($wp_scripts);
 
-if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) === $wp_version) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
-	header( "$protocol 304 Not Modified" );
+	header("$protocol 304 Not Modified");
 	exit();
 }
 
-foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
+foreach ($load as $handle) {
+	if ( ! array_key_exists($handle, $wp_scripts->registered))
 		continue;
 
-	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
-	$out .= get_file($path) . "\n";
+	$path = ABSPATH.$wp_scripts->registered[$handle]->src;
+	$out .= get_file($path)."\n";
 }
 
 header("Etag: $wp_version");
 header('Content-Type: application/javascript; charset=UTF-8');
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+if ($compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	header('Vary: Accept-Encoding'); // Handle proxies
-	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+	if (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip) {
 		header('Content-Encoding: deflate');
-		$out = gzdeflate( $out, 3 );
-	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+		$out = gzdeflate($out, 3);
+	} elseif (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode')) {
 		header('Content-Encoding: gzip');
-		$out = gzencode( $out, 3 );
+		$out = gzencode($out, 3);
 	}
 }