ntwb / wordpress

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

Spacing +31 added lines, -31 removed lines

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

Braces +7 added lines, -3 removed lines

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

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

Spacing +13 added lines, -13 removed lines

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

Braces +2 added lines, -1 removed lines

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

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

Spacing +31 added lines, -31 removed lines

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

Braces +4 added lines, -2 removed lines

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

src/wp-admin/link-manager.php

Indentation +3 added lines, -3 removed lines

@@ -45,14 +45,14 @@
 'title'		=> __('Overview'),
 'content'	=>
 	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
+	'<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
+	'<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
+	'<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(

Spacing +30 added lines, -30 removed lines

@@ -7,31 +7,31 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
-	wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('manage_links'))
+	wp_die(__('You do not have sufficient permissions to edit the links for this site.'));
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
 // Handle bulk deletes
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
-	check_admin_referer( 'bulk-bookmarks' );
+if ($doaction && isset($_REQUEST['linkcheck'])) {
+	check_admin_referer('bulk-bookmarks');
 
-	if ( 'delete' == $doaction ) {
+	if ('delete' == $doaction) {
 		$bulklinks = (array) $_REQUEST['linkcheck'];
-		foreach ( $bulklinks as $link_id ) {
+		foreach ($bulklinks as $link_id) {
 			$link_id = (int) $link_id;
 
-			wp_delete_link( $link_id );
+			wp_delete_link($link_id);
 		}
 
-		wp_redirect( add_query_arg('deleted', count( $bulklinks ), admin_url( 'link-manager.php' ) ) );
+		wp_redirect(add_query_arg('deleted', count($bulklinks), admin_url('link-manager.php')));
 		exit;
 	}
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -40,42 +40,42 @@ 
 $title = __('Links');
 $this_file = $parent_file = 'link-manager.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php').'</p>'.
+    '<p>'.__('Links may be separated into Link Categories; these are different than the categories used on your posts.').'</p>'.
+    '<p>'.__('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
-) );
+    '<p>'.__('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Links_Screen" target="_blank">Documentation on Managing Links</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Links_Screen" target="_blank">Documentation on Managing Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include_once( ABSPATH . 'wp-admin/admin-header.php' );
+include_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links'))
 	wp_die(__("You do not have sufficient permissions to edit the links for this site."));
 
 ?>
 
 <div class="wrap nosubsub">
-<h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
-if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+<h1><?php echo esc_html($title); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
+if ( ! empty($_REQUEST['s']))
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s']))); ?>
 </h1>
 
 <?php
-if ( isset($_REQUEST['deleted']) ) {
+if (isset($_REQUEST['deleted'])) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>';
 	$deleted = (int) $_REQUEST['deleted'];
 	printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
@@ -86,7 +86,7 @@ 
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Links' ), 'link' ); ?>
+<?php $wp_list_table->search_box(__('Search Links'), 'link'); ?>
 
 <?php $wp_list_table->display(); ?>
 
@@ -96,4 +96,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +8 added lines, -4 removed lines

@@ -8,8 +8,9 @@ 
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
+if ( ! current_user_can( 'manage_links' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
@@ -63,15 +64,18 @@ 
 
 include_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links') ) {
 	wp_die(__("You do not have sufficient permissions to edit the links for this site."));
+}
 
 ?>
 
 <div class="wrap nosubsub">
 <h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
-if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+if ( !empty($_REQUEST['s']) ) {
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) );
+}
+?>
 </h1>
 
 <?php

src/wp-admin/user-new.php

Indentation +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * New User Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * New User Administration Screen.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -184,9 +184,9 @@ 
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
@@ -317,16 +317,16 @@ 
 </table>
 <?php
 /**
- * Fires at the end of the new user form.
- *
- * Passes a contextual string to make both types of new user forms
- * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
- * and 'add-new-user' (single site and network admin).
- *
- * @since 3.7.0
- *
- * @param string $type A contextual string specifying which type of new user form the hook follows.
- */
+	 * Fires at the end of the new user form.
+	 *
+	 * Passes a contextual string to make both types of new user forms
+	 * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+	 * and 'add-new-user' (single site and network admin).
+	 *
+	 * @since 3.7.0
+	 *
+	 * @param string $type A contextual string specifying which type of new user form the hook follows.
+	 */
 do_action( 'user_new_form', 'add-existing-user' );
 ?>
 <?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>

Spacing +155 added lines, -155 removed lines

@@ -7,117 +7,117 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() ) {
-	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
-} elseif ( ! current_user_can( 'create_users' ) ) {
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if (is_multisite()) {
+	if ( ! current_user_can('create_users') && ! current_user_can('promote_users'))
+		wp_die(__('Cheatin’ uh?'), 403);
+} elseif ( ! current_user_can('create_users')) {
+	wp_die(__('Cheatin’ uh?'), 403);
 }
 
-if ( is_multisite() ) {
+if (is_multisite()) {
 	/**
 	 *
 	 * @param string $text
 	 * @return string
 	 */
-	function admin_created_user_email( $text ) {
+	function admin_created_user_email($text) {
 		$roles = get_editable_roles();
-		$role = $roles[ $_REQUEST['role'] ];
+		$role = $roles[$_REQUEST['role']];
 		/* translators: 1: Site name, 2: site URL, 3: role */
-		return sprintf( __( 'Hi,
+		return sprintf(__('Hi,
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 If you do not want to join this site please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
-%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
+%%s' ), get_bloginfo('name'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])));
 	}
-	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
+	add_filter('wpmu_signup_user_notification_email', 'admin_created_user_email');
 }
 
-if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
 	$user_details = null;
-	$user_email = wp_unslash( $_REQUEST['email'] );
-	if ( false !== strpos( $user_email, '@' ) ) {
-		$user_details = get_user_by( 'email', $user_email );
+	$user_email = wp_unslash($_REQUEST['email']);
+	if (false !== strpos($user_email, '@')) {
+		$user_details = get_user_by('email', $user_email);
 	} else {
-		if ( is_super_admin() ) {
-			$user_details = get_user_by( 'login', $user_email );
+		if (is_super_admin()) {
+			$user_details = get_user_by('login', $user_email);
 		} else {
-			wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
+			wp_redirect(add_query_arg(array('update' => 'enter_email'), 'user-new.php'));
 			die();
 		}
 	}
 
-	if ( !$user_details ) {
-		wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) );
+	if ( ! $user_details) {
+		wp_redirect(add_query_arg(array('update' => 'does_not_exist'), 'user-new.php'));
 		die();
 	}
 
-	if ( ! current_user_can('promote_user', $user_details->ID) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can('promote_user', $user_details->ID))
+		wp_die(__('Cheatin’ uh?'), 403);
 
 	// Adding an existing user to this blog
 	$new_user_email = $user_details->user_email;
 	$redirect = 'user-new.php';
 	$username = $user_details->user_login;
 	$user_id = $user_details->ID;
-	if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
-		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+	if (($username != null && ! is_super_admin($user_id)) && (array_key_exists($blog_id, get_blogs_of_user($user_id)))) {
+		$redirect = add_query_arg(array('update' => 'addexisting'), 'user-new.php');
 	} else {
-		if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-			add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-			$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+		if (isset($_POST['noconfirmation']) && is_super_admin()) {
+			add_existing_user_to_blog(array('user_id' => $user_id, 'role' => $_REQUEST['role']));
+			$redirect = add_query_arg(array('update' => 'addnoconfirmation'), 'user-new.php');
 		} else {
-			$newuser_key = substr( md5( $user_id ), 0, 5 );
-			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			$newuser_key = substr(md5($user_id), 0, 5);
+			add_option('new_user_'.$newuser_key, array('user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST['role']));
 
 			$roles = get_editable_roles();
-			$role = $roles[ $_REQUEST['role'] ];
+			$role = $roles[$_REQUEST['role']];
 			/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
-			$message = __( 'Hi,
+			$message = __('Hi,
 
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 
 Please click the following link to confirm the invite:
 %4$s' );
-			wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
-			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+			wp_mail($new_user_email, sprintf(__('[%s] Joining confirmation'), wp_specialchars_decode(get_option('blogname'))), sprintf($message, get_option('blogname'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])), home_url("/newbloguser/$newuser_key/")));
+			$redirect = add_query_arg(array('update' => 'add'), 'user-new.php');
 		}
 	}
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	die();
-} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'create-user', '_wpnonce_create-user' );
+} elseif (isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action']) {
+	check_admin_referer('create-user', '_wpnonce_create-user');
 
-	if ( ! current_user_can('create_users') )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can('create_users'))
+		wp_die(__('Cheatin’ uh?'), 403);
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$user_id = edit_user();
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
+			if (current_user_can('list_users'))
+				$redirect = 'users.php?update=add&id='.$user_id;
 			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
-			wp_redirect( $redirect );
+				$redirect = add_query_arg('update', 'add', 'user-new.php');
+			wp_redirect($redirect);
 			die();
 		}
 	} else {
 		// Adding a new user to this site
-		$new_user_email = wp_unslash( $_REQUEST['email'] );
-		$user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
-		if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
-			$add_user_errors = $user_details[ 'errors' ];
+		$new_user_email = wp_unslash($_REQUEST['email']);
+		$user_details = wpmu_validate_user_signup($_REQUEST['user_login'], $new_user_email);
+		if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+			$add_user_errors = $user_details['errors'];
 		} else {
 			/**
 			 * Filter the user_login, also known as the username, before it is added to the site.
@@ -126,20 +126,20 @@ 
 			 *
 			 * @param string $user_login The sanitized username.
 			 */
-			$new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
-				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
+			$new_user_login = apply_filters('pre_user_login', sanitize_user(wp_unslash($_REQUEST['user_login']), true));
+			if (isset($_POST['noconfirmation']) && is_super_admin()) {
+				add_filter('wpmu_signup_user_notification', '__return_false'); // Disable confirmation email
+				add_filter('wpmu_welcome_user_notification', '__return_false'); // Disable welcome email
 			}
-			wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-				$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
-				wpmu_activate_signup( $key );
-				$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+			wpmu_signup_user($new_user_login, $new_user_email, array('add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role']));
+			if (isset($_POST['noconfirmation']) && is_super_admin()) {
+				$key = $wpdb->get_var($wpdb->prepare("SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email));
+				wpmu_activate_signup($key);
+				$redirect = add_query_arg(array('update' => 'addnoconfirmation'), 'user-new.php');
 			} else {
-				$redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
+				$redirect = add_query_arg(array('update' => 'newuserconfirmation'), 'user-new.php');
 			}
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			die();
 		}
 	}
@@ -149,48 +149,48 @@ 
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if (is_multisite() && current_user_can('promote_users') && current_user_can('create_users'))
 	$do_both = true;
 
-$help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
+$help = '<p>'.__('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.').'</p>';
 
-if ( is_multisite() ) {
-	$help .= '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.') . '</p>';
+if (is_multisite()) {
+	$help .= '<p>'.__('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.').'</p>'.
+	'<p>'.__('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.').'</p>';
 } else {
-	$help .= '<p>' . __('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>';
+	$help .= '<p>'.__('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.').'</p>'.
+	'<p>'.__('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.').'</p>';
 }
 
-$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+$help .= '<p>'.__('Remember to click the Add New User button at the bottom of this screen when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'      => 'user-roles',
 'title'   => __('User Roles'),
-'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
-				'<ul>' .
-				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
-				'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
-				'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
-				'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
-				'<li>' . __('Administrators have access to all the administration features.') . '</li>' .
+'content' => '<p>'.__('Here is a basic overview of the different user roles and the permissions associated with each one:').'</p>'.
+				'<ul>'.
+				'<li>'.__('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.').'</li>'.
+				'<li>'.__('Contributors can write and manage their posts but not publish posts or upload media files.').'</li>'.
+				'<li>'.__('Authors can publish and manage their own posts, and are able to upload files.').'</li>'.
+				'<li>'.__('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.').'</li>'.
+				'<li>'.__('Administrators have access to all the administration features.').'</li>'.
 				'</ul>'
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
-wp_enqueue_script( 'user-profile' );
+wp_enqueue_script('user-profile');
 
 /**
  * Filter whether to enable user auto-complete for non-super admins in Multisite.
@@ -199,18 +199,18 @@ 
  *
  * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
  */
-if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
-	&& ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+if (is_multisite() && current_user_can('promote_users') && ! wp_is_large_network('users')
+	&& (is_super_admin() || apply_filters('autocomplete_users_for_site_admins', false))
 ) {
-	wp_enqueue_script( 'user-suggest' );
+	wp_enqueue_script('user-suggest');
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( is_multisite() ) {
-		switch ( $_GET['update'] ) {
+	if (is_multisite()) {
+		switch ($_GET['update']) {
 			case "newuserconfirmation":
 				$messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
 				break;
@@ -231,40 +231,40 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
+		if ('add' == $_GET['update'])
 			$messages[] = __('User added.');
 	}
 }
 ?>
 <div class="wrap">
 <h1 id="add-new-user"><?php
-if ( current_user_can( 'create_users' ) ) {
-	echo _x( 'Add New User', 'user' );
-} elseif ( current_user_can( 'promote_users' ) ) {
-	echo _x( 'Add Existing User', 'user' );
+if (current_user_can('create_users')) {
+	echo _x('Add New User', 'user');
+} elseif (current_user_can('promote_users')) {
+	echo _x('Add Existing User', 'user');
 } ?>
 </h1>
 
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
 
-<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
+<?php if (isset($add_user_errors) && is_wp_error($add_user_errors)) : ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -272,15 +272,15 @@ 
 <div id="ajax-response"></div>
 
 <?php
-if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
-	if ( !is_super_admin() ) {
-		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+if (is_multisite()) {
+	if ($do_both)
+		echo '<h3 id="add-existing-user">'.__('Add Existing User').'</h3>';
+	if ( ! is_super_admin()) {
+		echo '<p>'.__('Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('E-mail');
 		$type  = 'email';
 	} else {
-		echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+		echo '<p>'.__('Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('E-mail or Username');
 		$type  = 'text';
 	}
@@ -291,10 +291,10 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="adduser" />
-<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
+<?php wp_nonce_field('add-user', '_wpnonce_add-user') ?>
 
 <table class="form-table">
 	<tr class="form-field form-required">
@@ -304,14 +304,14 @@ 
 	<tr class="form-field">
 		<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="adduser-role">
-			<?php wp_dropdown_roles( get_option('default_role') ); ?>
+			<?php wp_dropdown_roles(get_option('default_role')); ?>
 			</select>
 		</td>
 	</tr>
-<?php if ( is_super_admin() ) { ?>
+<?php if (is_super_admin()) { ?>
 	<tr>
 		<th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 <?php } ?>
 </table>
@@ -327,48 +327,48 @@ 
  *
  * @param string $type A contextual string specifying which type of new user form the hook follows.
  */
-do_action( 'user_new_form', 'add-existing-user' );
+do_action('user_new_form', 'add-existing-user');
 ?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php submit_button(__('Add Existing User'), 'primary', 'adduser', true, array('id' => 'addusersub')); ?>
 </form>
 <?php
 } // is_multisite()
 
-if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
+if (current_user_can('create_users')) {
+	if ($do_both)
+		echo '<h3 id="create-new-user">'.__('Add New User').'</h3>';
 ?>
 <p><?php _e('Create a brand new user and add them to this site.'); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
 	/** This action is documented in wp-admin/user-new.php */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+<?php wp_nonce_field('create-user', '_wpnonce_create-user'); ?>
 <?php
 // Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
+$creating = isset($_POST['createuser']);
 
-$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : true;
-$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
+$new_user_login = $creating && isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
+$new_user_firstname = $creating && isset($_POST['first_name']) ? wp_unslash($_POST['first_name']) : '';
+$new_user_lastname = $creating && isset($_POST['last_name']) ? wp_unslash($_POST['last_name']) : '';
+$new_user_email = $creating && isset($_POST['email']) ? wp_unslash($_POST['email']) : '';
+$new_user_uri = $creating && isset($_POST['url']) ? wp_unslash($_POST['url']) : '';
+$new_user_role = $creating && isset($_POST['role']) ? wp_unslash($_POST['role']) : '';
+$new_user_send_password = $creating && isset($_POST['send_password']) ? wp_unslash($_POST['send_password']) : true;
+$new_user_ignore_pass = $creating && isset($_POST['noconfirmation']) ? wp_unslash($_POST['noconfirmation']) : '';
 
 ?>
 <table class="form-table">
 	<tr class="form-field form-required">
 		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" /></td>
+		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" autocapitalize="none" autocorrect="off" /></td>
 	</tr>
 	<tr class="form-field form-required">
 		<th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
+		<td><input name="email" type="email" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
 	</tr>
-<?php if ( !is_multisite() ) { ?>
+<?php if ( ! is_multisite()) { ?>
 	<tr class="form-field">
 		<th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
 		<td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr($new_user_firstname); ?>" /></td>
@@ -379,7 +379,7 @@ 
 	</tr>
 	<tr class="form-field">
 		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
-		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
+		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
 	</tr>
 <?php
 /**
@@ -389,46 +389,46 @@ 
  *
  * @param bool $show Whether to show the password fields. Default true.
  */
-if ( apply_filters( 'show_password_fields', true ) ) : ?>
+if (apply_filters('show_password_fields', true)) : ?>
 	<tr class="form-field form-required user-pass1-wrap">
 		<th scope="row">
 			<label for="pass1">
-				<?php _e( 'Password' ); ?>
-				<span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+				<?php _e('Password'); ?>
+				<span class="description hide-if-js"><?php _e('(required)'); ?></span>
 			</label>
 		</th>
 		<td>
 			<input class="hidden" value=" " /><!-- #24364 workaround -->
-			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Show password'); ?></button>
 			<div class="wp-pwd hide-if-js">
-				<?php $initial_password = wp_generate_password( 24 ); ?>
+				<?php $initial_password = wp_generate_password(24); ?>
 				<span class="password-input-wrapper">
-					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
 				</span>
-				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+				<button type="button" class="button button-secondary 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 button-secondary 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 button-secondary 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>
-			<p><span class="description"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></span></p>
+			<p><span class="description"><?php _e('A password reset link will be sent to the user via email.'); ?></span></p>
 		</td>
 	</tr>
 	<tr class="form-field form-required user-pass2-wrap hide-if-js">
-		<th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+		<th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
 		<td>
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		</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" />
-				<?php _e( 'Confirm use of weak password' ); ?>
+				<?php _e('Confirm use of weak password'); ?>
 			</label>
 		</td>
 	</tr>
@@ -438,30 +438,30 @@ 
 		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			if ( ! $new_user_role)
+				$new_user_role = ! empty($current_role) ? $current_role : get_option('default_role');
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>
 		</td>
 	</tr>
-	<?php if ( is_multisite() && is_super_admin() ) { ?>
+	<?php if (is_multisite() && is_super_admin()) { ?>
 	<tr>
 		<th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked($new_user_ignore_pass); ?> /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 	<?php } ?>
 </table>
 
 <?php
 /** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
+do_action('user_new_form', 'add-new-user');
 ?>
 
-<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+<?php submit_button(__('Add New User'), 'primary', 'createuser', true, array('id' => 'createusersub')); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +40 added lines, -28 removed lines

@@ -10,9 +10,10 @@ 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( is_multisite() ) {
-	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
-} elseif ( ! current_user_can( 'create_users' ) ) {
+	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
+	} elseif ( ! current_user_can( 'create_users' ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
 }
 
@@ -59,8 +60,9 @@ 
 		die();
 	}
 
-	if ( ! current_user_can('promote_user', $user_details->ID) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can('promote_user', $user_details->ID) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	// Adding an existing user to this blog
 	$new_user_email = $user_details->user_email;
@@ -96,8 +98,9 @@ 
 } elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
 	check_admin_referer( 'create-user', '_wpnonce_create-user' );
 
-	if ( ! current_user_can('create_users') )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can('create_users') ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	if ( ! is_multisite() ) {
 		$user_id = edit_user();
@@ -105,10 +108,11 @@ 
 		if ( is_wp_error( $user_id ) ) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
-			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			if ( current_user_can( 'list_users' ) ) {
+							$redirect = 'users.php?update=add&id=' . $user_id;
+			} else {
+							$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			}
 			wp_redirect( $redirect );
 			die();
 		}
@@ -149,8 +153,9 @@ 
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') ) {
 	$do_both = true;
+}
 
 $help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
 
@@ -231,8 +236,9 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
-			$messages[] = __('User added.');
+		if ( 'add' == $_GET['update'] ) {
+					$messages[] = __('User added.');
+		}
 	}
 }
 ?>
@@ -249,23 +255,26 @@ 
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
-				echo "<li>$err</li>\n";
+			foreach ( $errors->get_error_messages() as $err ) {
+							echo "<li>$err</li>\n";
+			}
 		?>
 		</ul>
 	</div>
 <?php endif;
 
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	} ?>
 
 <?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php endif; ?>
@@ -273,8 +282,9 @@ 
 
 <?php
 if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
+	if ( $do_both ) {
+			echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
+	}
 	if ( !is_super_admin() ) {
 		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
 		$label = __('E-mail');
@@ -335,9 +345,10 @@ 
 } // is_multisite()
 
 if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
-?>
+	if ( $do_both ) {
+			echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
+	}
+	?>
 <p><?php _e('Create a brand new user and add them to this site.'); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
 	/** This action is documented in wp-admin/user-new.php */
@@ -438,8 +449,9 @@ 
 		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			if ( !$new_user_role ) {
+							$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			}
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>

src/wp-admin/custom-header.php

Indentation +5 added lines, -5 removed lines

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

Spacing +355 added lines, -355 removed lines

@@ -56,12 +56,12 @@ 
 		$this->admin_header_callback = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
-		add_action( 'admin_menu', array( $this, 'init' ) );
+		add_action('admin_menu', array($this, 'init'));
 
-		add_action( 'customize_save_after',         array( $this, 'customize_set_last_used' ) );
-		add_action( 'wp_ajax_custom-header-crop',   array( $this, 'ajax_header_crop'        ) );
-		add_action( 'wp_ajax_custom-header-add',    array( $this, 'ajax_header_add'         ) );
-		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove'      ) );
+		add_action('customize_save_after', array($this, 'customize_set_last_used'));
+		add_action('wp_ajax_custom-header-crop', array($this, 'ajax_header_crop'));
+		add_action('wp_ajax_custom-header-add', array($this, 'ajax_header_add'));
+		add_action('wp_ajax_custom-header-remove', array($this, 'ajax_header_remove'));
 	}
 
 	/**
@@ -70,18 +70,18 @@ 
 	 * @since 2.1.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
-		if ( ! $page ) {
+		$page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
+		if ( ! $page) {
 			return;
 		}
 
-		add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );
-		add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) );
-		add_action( "admin_head-$page", array( $this, 'help' ) );
-		add_action( "admin_head-$page", array( $this, 'take_action' ), 50 );
-		add_action( "admin_head-$page", array( $this, 'js' ), 50 );
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+		add_action("admin_print_scripts-$page", array($this, 'js_includes'));
+		add_action("admin_print_styles-$page", array($this, 'css_includes'));
+		add_action("admin_head-$page", array($this, 'help'));
+		add_action("admin_head-$page", array($this, 'take_action'), 50);
+		add_action("admin_head-$page", array($this, 'js'), 50);
+		if ($this->admin_header_callback) {
+			add_action("admin_head-$page", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -91,37 +91,37 @@ 
 	 * @since 3.0.0
 	 */
 	public function help() {
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'overview',
 			'title'   => __('Overview'),
 			'content' =>
-				'<p>' . __( 'This screen is used to customize the header section of your theme.') . '</p>' .
-				'<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
-		) );
+				'<p>'.__('This screen is used to customize the header section of your theme.').'</p>'.
+				'<p>'.__('You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.').'<p>'
+		));
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'set-header-image',
 			'title'   => __('Header Image'),
 			'content' =>
-				'<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
-				'<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
-		) );
+				'<p>'.__('You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.').'</p>'.
+				'<p>'.__('Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.').'</p>'.
+				'<p>'.__('If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.').'</p>'.
+				'<p>'.__('If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.').'</p>'
+		));
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'set-header-text',
 			'title'   => __('Header Text'),
 			'content' =>
-				'<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
-				'<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-				'<p>' . __( 'Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!') . '</p>'
-		) );
+				'<p>'.sprintf(__('For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.'), admin_url('options-general.php')).'<p>'.
+				'<p>'.__('In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.').'</p>'.
+				'<p>'.__('Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!').'</p>'
+		));
 
 		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 		);
 	}
 
@@ -133,13 +133,13 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
+		if ( ! isset($_GET['step']))
 			return 1;
 
 		$step = (int) $_GET['step'];
-		if ( $step < 1 || 3 < $step ||
-			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
-			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
+		if ($step < 1 || 3 < $step ||
+			(2 == $step && ! wp_verify_nonce($_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload')) ||
+			(3 == $step && ! wp_verify_nonce($_REQUEST['_wpnonce'], 'custom-header-crop-image'))
 		)
 			return 1;
 
@@ -154,12 +154,12 @@ 
 	public function js_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) ) {
+		if ((1 == $step || 3 == $step)) {
 			wp_enqueue_media();
-			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
-		} elseif ( 2 == $step ) {
+			wp_enqueue_script('custom-header');
+			if (current_theme_supports('custom-header', 'header-text'))
+				wp_enqueue_script('wp-color-picker');
+		} elseif (2 == $step) {
 			wp_enqueue_script('imgareaselect');
 		}
 	}
@@ -172,9 +172,9 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
+		if ((1 == $step || 3 == $step) && current_theme_supports('custom-header', 'header-text'))
+			wp_enqueue_style('wp-color-picker');
+		elseif (2 == $step)
 			wp_enqueue_style('imgareaselect');
 	}
 
@@ -184,42 +184,42 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can('edit_theme_options'))
 			return;
 
-		if ( empty( $_POST ) )
+		if (empty($_POST))
 			return;
 
 		$this->updated = true;
 
-		if ( isset( $_POST['resetheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['resetheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->reset_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['removeheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['removeheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->remove_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['text-color'] ) && ! isset( $_POST['display-header-text'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			set_theme_mod( 'header_textcolor', 'blank' );
-		} elseif ( isset( $_POST['text-color'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
+		if (isset($_POST['text-color']) && ! isset($_POST['display-header-text'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			set_theme_mod('header_textcolor', 'blank');
+		} elseif (isset($_POST['text-color'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			$_POST['text-color'] = str_replace('#', '', $_POST['text-color']);
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
+			if (strlen($color) == 6 || strlen($color) == 3)
 				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			elseif ( ! $color)
+				set_theme_mod('header_textcolor', 'blank');
 		}
 
-		if ( isset( $_POST['default-header'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$this->set_header_image( $_POST['default-header'] );
+		if (isset($_POST['default-header'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			$this->set_header_image($_POST['default-header']);
 			return;
 		}
 	}
@@ -234,19 +234,19 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
+		if ( ! isset($_wp_default_headers))
 			return;
 
-		if ( ! empty( $this->default_headers ) ) {
+		if ( ! empty($this->default_headers)) {
 			return;
 		}
 
 		$this->default_headers = $_wp_default_headers;
 		$template_directory_uri = get_template_directory_uri();
 		$stylesheet_directory_uri = get_stylesheet_directory_uri();
-		foreach ( array_keys($this->default_headers) as $header ) {
-			$this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
-			$this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
+		foreach (array_keys($this->default_headers) as $header) {
+			$this->default_headers[$header]['url'] = sprintf($this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri);
+			$this->default_headers[$header]['thumbnail_url'] = sprintf($this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri);
 		}
 	}
 
@@ -258,34 +258,34 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	public function show_header_selector( $type = 'default' ) {
-		if ( 'default' == $type ) {
+	public function show_header_selector($type = 'default') {
+		if ('default' == $type) {
 			$headers = $this->default_headers;
 		} else {
 			$headers = get_uploaded_header_images();
 			$type = 'uploaded';
 		}
 
-		if ( 1 < count( $headers ) ) {
+		if (1 < count($headers)) {
 			echo '<div class="random-header">';
-			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
-			_e( '<strong>Random:</strong> Show a different image on each page.' );
+			echo '<label><input name="default-header" type="radio" value="random-'.$type.'-image"'.checked(is_random_header_image($type), true, false).' />';
+			_e('<strong>Random:</strong> Show a different image on each page.');
 			echo '</label>';
 			echo '</div>';
 		}
 
 		echo '<div class="available-headers">';
-		foreach ( $headers as $header_key => $header ) {
+		foreach ($headers as $header_key => $header) {
 			$header_thumbnail = $header['thumbnail_url'];
 			$header_url = $header['url'];
-			$header_desc = empty( $header['description'] ) ? '' : $header['description'];
-			$header_alt_text = empty( $header['alt_text'] ) ? $header_desc : $header['alt_text'];
+			$header_desc = empty($header['description']) ? '' : $header['description'];
+			$header_alt_text = empty($header['alt_text']) ? $header_desc : $header['alt_text'];
 			echo '<div class="default-header">';
-			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
+			echo '<label><input name="default-header" type="radio" value="'.esc_attr($header_key).'" '.checked($header_url, get_theme_mod('header_image'), false).' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
+			if ( ! empty($header['attachment_id']))
 				$width = ' width="230"';
-			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
+			echo '<img src="'.set_url_scheme($header_thumbnail).'" alt="'.esc_attr($header_alt_text).'" title="'.esc_attr($header_desc).'"'.$width.' /></label>';
 			echo '</div>';
 		}
 		echo '<div class="clear"></div></div>';
@@ -298,9 +298,9 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
+		if ((1 == $step || 3 == $step) && current_theme_supports('custom-header', 'header-text'))
 			$this->js_1();
-		elseif ( 2 == $step )
+		elseif (2 == $step)
 			$this->js_2();
 	}
 
@@ -311,10 +311,10 @@ 
 	 */
 	public function js_1() {
 		$default_color = '';
-		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
-				$default_color = '#' . $default_color;
+		if (current_theme_supports('custom-header', 'default-text-color')) {
+			$default_color = get_theme_support('custom-header', 'default-text-color');
+			if ($default_color && false === strpos($default_color, '#')) {
+				$default_color = '#'.$default_color;
 			}
 		}
 		?>
@@ -356,7 +356,7 @@ 
 			}
 		});
 		$('#display-header-text').click( toggle_text );
-		<?php if ( ! display_header_text() ) : ?>
+		<?php if ( ! display_header_text()) : ?>
 		toggle_text();
 		<?php endif; ?>
 	});
@@ -380,8 +380,8 @@ 
 	}
 
 	jQuery(document).ready(function() {
-		var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
-		var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
+		var xinit = <?php echo absint(get_theme_support('custom-header', 'width')); ?>;
+		var yinit = <?php echo absint(get_theme_support('custom-header', 'height')); ?>;
 		var ratio = xinit / yinit;
 		var ximg = jQuery('img#upload').width();
 		var yimg = jQuery('img#upload').height();
@@ -405,19 +405,19 @@ 
 			x2: xinit,
 			y2: yinit,
 			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
 			aspectRatio: xinit + ':' + yinit,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height')) {
 			?>
-			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
+			maxHeight: <?php echo get_theme_support('custom-header', 'height'); ?>,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
-			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
+			maxWidth: <?php echo get_theme_support('custom-header', 'width'); ?>,
 			<?php
 			}
 			?>
@@ -447,112 +447,112 @@ 
 ?>
 
 <div class="wrap">
-<h1><?php _e( 'Custom Header' ); ?></h1>
+<h1><?php _e('Custom Header'); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 		<?php
 		printf(
-			__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=header_image' )
+			__('You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.'),
+			admin_url('customize.php?autofocus[control]=header_image')
 		);
 		?>
 	</p>
 </div>
 <?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+<?php if ( ! empty($this->updated)) { ?>
 <div id="message" class="updated">
-<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/')); ?></p>
 </div>
 <?php } ?>
 
-<h3><?php _e( 'Header Image' ); ?></h3>
+<h3><?php _e('Header Image'); ?></h3>
 
 <table class="form-table">
 <tbody>
 
-<?php if ( get_custom_header() || display_header_text() ) : ?>
+<?php if (get_custom_header() || display_header_text()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
+	if ($this->admin_image_div_callback) {
+		call_user_func($this->admin_image_div_callback);
 	} else {
 		$custom_header = get_custom_header();
 		$header_image = get_header_image();
 
-		if ( $header_image ) {
-			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		if ($header_image) {
+			$header_image_style = 'background-image:url('.esc_url($header_image).');';
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ($custom_header->width)
+			$header_image_style .= 'max-width:'.$custom_header->width.'px;';
+		if ($custom_header->height)
+			$header_image_style .= 'height:'.$custom_header->height.'px;';
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
+		if (display_header_text())
+			$style = ' style="color:#'.get_header_textcolor().';"';
 		else
 			$style = ' style="display:none;"';
 		?>
-		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
+		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
+		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo('description'); ?></div>
 	</div>
 	<?php } ?>
 </td>
 </tr>
 <?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+<?php if (current_user_can('upload_files') && current_theme_supports('custom-header', 'uploads')) : ?>
 <tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<th scope="row"><?php _e('Select Image'); ?></th>
 <td>
-	<p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
+	<p><?php _e('You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.'); ?><br />
 	<?php
-	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
-	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf( __( 'Images should be at least <strong>%1$d pixels</strong> wide.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
-	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf( __( 'Images should be at least <strong>%1$d pixels</strong> tall.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+	if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
+		printf(__('Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.').'<br />', get_theme_support('custom-header', 'width'), get_theme_support('custom-header', 'height'));
+	} elseif (current_theme_supports('custom-header', 'flex-height')) {
+		if ( ! current_theme_supports('custom-header', 'flex-width'))
+			printf(__('Images should be at least <strong>%1$d pixels</strong> wide.').' ', get_theme_support('custom-header', 'width'));
+	} elseif (current_theme_supports('custom-header', 'flex-width')) {
+		if ( ! current_theme_supports('custom-header', 'flex-height'))
+			printf(__('Images should be at least <strong>%1$d pixels</strong> tall.').' ', get_theme_support('custom-header', 'height'));
 	}
-	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf( __( 'Suggested width is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+	if (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')) {
+		if (current_theme_supports('custom-header', 'width'))
+			printf(__('Suggested width is <strong>%1$d pixels</strong>.').' ', get_theme_support('custom-header', 'width'));
+		if (current_theme_supports('custom-header', 'height'))
+			printf(__('Suggested height is <strong>%1$d pixels</strong>.').' ', get_theme_support('custom-header', 'height'));
 	}
 	?></p>
-	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
+	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url(add_query_arg('step', 2)) ?>">
 	<p>
-		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+		<?php wp_nonce_field('custom-header-upload', '_wpnonce-custom-header-upload'); ?>
+		<?php submit_button(__('Upload'), 'button', 'submit', false); ?>
 	</p>
 	<?php
-		$modal_update_href = esc_url( add_query_arg( array(
+		$modal_update_href = esc_url(add_query_arg(array(
 			'page' => 'custom-header',
 			'step' => 2,
 			'_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
-		), admin_url('themes.php') ) );
+		), admin_url('themes.php')));
 	?>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-update-link="<?php echo esc_attr( $modal_update_href ); ?>"
-			data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update-link="<?php echo esc_attr($modal_update_href); ?>"
+			data-choose="<?php esc_attr_e('Choose a Custom Header'); ?>"
+			data-update="<?php esc_attr_e('Set as header'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -561,97 +561,97 @@ 
 </tbody>
 </table>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>">
-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
+<form method="post" action="<?php echo esc_url(add_query_arg('step', 1)) ?>">
+<?php submit_button(null, 'screen-reader-text', 'save-header-options', false); ?>
 <table class="form-table">
 <tbody>
-	<?php if ( get_uploaded_header_images() ) : ?>
+	<?php if (get_uploaded_header_images()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
+<th scope="row"><?php _e('Uploaded Images'); ?></th>
 <td>
-	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ) ?></p>
+	<p><?php _e('You can choose one of your previously uploaded headers, or show a random one.') ?></p>
 	<?php
-		$this->show_header_selector( 'uploaded' );
+		$this->show_header_selector('uploaded');
 	?>
 </td>
 </tr>
 	<?php endif;
-	if ( ! empty( $this->default_headers ) ) : ?>
+	if ( ! empty($this->default_headers)) : ?>
 <tr>
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<th scope="row"><?php _e('Default Images'); ?></th>
 <td>
-<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
-	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
+<?php if (current_theme_supports('custom-header', 'uploads')) : ?>
+	<p><?php _e('If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.') ?></p>
 <?php else: ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
+	<p><?php _e('You can use one of these cool headers or show a random one on each page.') ?></p>
 <?php endif; ?>
 	<?php
-		$this->show_header_selector( 'default' );
+		$this->show_header_selector('default');
 	?>
 </td>
 </tr>
 	<?php endif;
-	if ( get_header_image() ) : ?>
+	if (get_header_image()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
-	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
-	<?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
+	<p><?php _e('This will remove the header image. You will not be able to restore any customizations.') ?></p>
+	<?php submit_button(__('Remove Header Image'), 'button', 'removeheader', false); ?>
 </td>
 </tr>
 	<?php endif;
 
-	$default_image = get_theme_support( 'custom-header', 'default-image' );
-	if ( $default_image && get_header_image() != $default_image ) : ?>
+	$default_image = get_theme_support('custom-header', 'default-image');
+	if ($default_image && get_header_image() != $default_image) : ?>
 <tr>
-<th scope="row"><?php _e( 'Reset Image' ); ?></th>
+<th scope="row"><?php _e('Reset Image'); ?></th>
 <td>
-	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
-	<?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
+	<p><?php _e('This will restore the original header image. You will not be able to restore any customizations.') ?></p>
+	<?php submit_button(__('Restore Original Header Image'), 'button', 'resetheader', false); ?>
 </td>
 </tr>
 	<?php endif; ?>
 </tbody>
 </table>
 
-<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+<?php if (current_theme_supports('custom-header', 'header-text')) : ?>
 
-<h3><?php _e( 'Header Text' ); ?></h3>
+<h3><?php _e('Header Text'); ?></h3>
 
 <table class="form-table">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Header Text' ); ?></th>
+<th scope="row"><?php _e('Header Text'); ?></th>
 <td>
 	<p>
-	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
+	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked(display_header_text()); ?> /> <?php _e('Show header text with your image.'); ?></label>
 	</p>
 </td>
 </tr>
 
 <tr class="displaying-header-text">
-<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<th scope="row"><?php _e('Text Color'); ?></th>
 <td>
 	<p>
 	<?php
 	$default_color = '';
-	if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-		$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-		if ( $default_color && false === strpos( $default_color, '#' ) ) {
-			$default_color = '#' . $default_color;
+	if (current_theme_supports('custom-header', 'default-text-color')) {
+		$default_color = get_theme_support('custom-header', 'default-text-color');
+		if ($default_color && false === strpos($default_color, '#')) {
+			$default_color = '#'.$default_color;
 		}
 	}
 
-	$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
+	$default_color_attr = $default_color ? ' data-default-color="'.esc_attr($default_color).'"' : '';
 
-	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-	if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
-		$header_textcolor = '#' . $header_textcolor;
+	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support('custom-header', 'default-text-color');
+	if ($header_textcolor && false === strpos($header_textcolor, '#')) {
+		$header_textcolor = '#'.$header_textcolor;
 	}
 
-	echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-	if ( $default_color ) {
-		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+	echo '<input type="text" name="text-color" id="text-color" value="'.esc_attr($header_textcolor).'"'.$default_color_attr.' />';
+	if ($default_color) {
+		echo ' <span class="description hide-if-js">'.sprintf(_x('Default: %s', 'color'), esc_html($default_color)).'</span>';
 	}
 	?>
 	</p>
@@ -666,11 +666,11 @@ 
  *
  * @since 3.1.0
  */
-do_action( 'custom_header_options' );
+do_action('custom_header_options');
 
-wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
+wp_nonce_field('custom-header-options', '_wpnonce-custom-header-options'); ?>
 
-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+<?php submit_button(null, 'primary', 'save-header-options'); ?>
 </form>
 </div>
 
@@ -683,48 +683,48 @@ 
 	 */
 	public function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! current_theme_supports('custom-header', 'uploads'))
+			wp_die(__('Cheatin&#8217; uh?'), 403);
 
-		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
-			$attachment_id = absint( $_GET['file'] );
-			$file = get_attached_file( $attachment_id, true );
-			$url = wp_get_attachment_image_src( $attachment_id, 'full' );
+		if (empty($_POST) && isset($_GET['file'])) {
+			$attachment_id = absint($_GET['file']);
+			$file = get_attached_file($attachment_id, true);
+			$url = wp_get_attachment_image_src($attachment_id, 'full');
 			$url = $url[0];
-		} elseif ( isset( $_POST ) ) {
+		} elseif (isset($_POST)) {
 			$data = $this->step_2_manage_upload();
 			$attachment_id = $data['attachment_id'];
 			$file = $data['file'];
 			$url = $data['url'];
 		}
 
-		if ( file_exists( $file ) ) {
-			list( $width, $height, $type, $attr ) = getimagesize( $file );
+		if (file_exists($file)) {
+			list($width, $height, $type, $attr) = getimagesize($file);
 		} else {
-			$data = wp_get_attachment_metadata( $attachment_id );
-			$height = isset( $data[ 'height' ] ) ? $data[ 'height' ] : 0;
-			$width = isset( $data[ 'width' ] ) ? $data[ 'width' ] : 0;
-			unset( $data );
+			$data = wp_get_attachment_metadata($attachment_id);
+			$height = isset($data['height']) ? $data['height'] : 0;
+			$width = isset($data['width']) ? $data['width'] : 0;
+			unset($data);
 		}
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
+		if (current_theme_supports('custom-header', 'flex-width'))
 			$max_width = 1500;
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
-		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
+		if (current_theme_supports('custom-header', 'max-width'))
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
+		$max_width = max($max_width, get_theme_support('custom-header', 'width'));
 
 		// If flexible height isn't supported and the image is the exact right size
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )
-			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
+		if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')
+			&& $width == get_theme_support('custom-header', 'width') && $height == get_theme_support('custom-header', 'height'))
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if (file_exists($file))
+				wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
 
-			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+			$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 			/**
 			 * Fires after the header image is set or an error is returned.
@@ -734,17 +734,17 @@ 
 			 * @param string $file          Path to the file.
 			 * @param int    $attachment_id Attachment ID.
 			 */
-			do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication
+			do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
 
 			return $this->finished();
-		} elseif ( $width > $max_width ) {
+		} elseif ($width > $max_width) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error($image))
+				wp_die(__('Image could not be processed. Please go back and try again.'), __('Image Processing Error'));
 
 			/** This filter is documented in wp-admin/custom-header.php */
-			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
+			$image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication
 
 			$url = str_replace(basename($url), basename($image), $url);
 			$width = $width / $oitar;
@@ -755,32 +755,32 @@ 
 		?>
 
 <div class="wrap">
-<h1><?php _e( 'Crop Header Image' ); ?></h1>
+<h1><?php _e('Crop Header Image'); ?></h1>
 
 <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
 	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-	<p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p>
+	<p class="hide-if-js"><strong><?php _e('You need JavaScript to choose a part of the image.'); ?></strong></p>
 
 	<div id="crop_image" style="position: relative">
-		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
+		<img src="<?php echo esc_url($url); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
 	</div>
 
 	<input type="hidden" name="x1" id="x1" value="0"/>
 	<input type="hidden" name="y1" id="y1" value="0"/>
-	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
-	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
-	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-	<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+	<input type="hidden" name="width" id="width" value="<?php echo esc_attr($width); ?>"/>
+	<input type="hidden" name="height" id="height" value="<?php echo esc_attr($height); ?>"/>
+	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($attachment_id); ?>" />
+	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
+	<?php if (empty($_POST) && isset($_GET['file'])) { ?>
 	<input type="hidden" name="create-new-attachment" value="true" />
 	<?php } ?>
-	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
+	<?php wp_nonce_field('custom-header-crop-image') ?>
 
 	<p class="submit">
-	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+	<?php submit_button(__('Crop and Publish'), 'primary', 'submit', false); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	if (isset($oitar) && 1 == $oitar && (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')))
+		submit_button(__('Skip Cropping, Publish Image as Is'), 'secondary', 'skip-cropping', false);
 	?>
 	</p>
 </form>
@@ -798,14 +798,14 @@ 
 		$overrides = array('test_form' => false);
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		$wp_filetype = wp_check_filetype_and_ext($uploaded_file['tmp_name'], $uploaded_file['name']);
+		if ( ! wp_match_mime_types('image', $wp_filetype['type']))
+			wp_die(__('The uploaded file is not a valid image. Please try again.'));
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if (isset($file['error']))
+			wp_die($file['error'], __('Image Upload Error'));
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -822,8 +822,8 @@ 
 		);
 
 		// Save the data
-		$attachment_id = wp_insert_attachment( $object, $file );
-		return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+		$attachment_id = wp_insert_attachment($object, $file);
+		return compact('attachment_id', 'file', 'filename', 'url', 'type');
 	}
 
 	/**
@@ -832,63 +832,63 @@ 
 	 * @since 2.1.0
 	 */
 	public function step_3() {
-		check_admin_referer( 'custom-header-crop-image' );
+		check_admin_referer('custom-header-crop-image');
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! current_theme_supports('custom-header', 'uploads'))
+			wp_die(__('Cheatin&#8217; uh?'), 403);
 
-		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! empty($_POST['skip-cropping']) && ! (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')))
+			wp_die(__('Cheatin&#8217; uh?'), 403);
 
-		if ( $_POST['oitar'] > 1 ) {
+		if ($_POST['oitar'] > 1) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
 			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
 			$_POST['width'] = $_POST['width'] * $_POST['oitar'];
 			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
+		$attachment_id = absint($_POST['attachment_id']);
 		$original = get_attached_file($attachment_id);
 
-		$dimensions = $this->get_header_dimensions( array(
+		$dimensions = $this->get_header_dimensions(array(
 			'height' => $_POST['height'],
 			'width'  => $_POST['width'],
-		) );
+		));
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
+		if (empty($_POST['skip-cropping']))
+			$cropped = wp_crop_image($attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height);
+		elseif ( ! empty($_POST['create-new-attachment']))
+			$cropped = _copy_image_file($attachment_id);
 		else
-			$cropped = get_attached_file( $attachment_id );
+			$cropped = get_attached_file($attachment_id);
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error($cropped))
+			wp_die(__('Image could not be processed. Please go back and try again.'), __('Image Processing Error'));
 
 		/** This filter is documented in wp-admin/custom-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty($_POST['create-new-attachment']))
+			unset($object['ID']);
 
 		// Update the attachment
-		$attachment_id = $this->insert_attachment( $object, $cropped );
+		$attachment_id = $this->insert_attachment($object, $cropped);
 
 		$url = $object['guid'];
-		$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+		$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 		// Cleanup.
-		$medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
-		if ( file_exists( $medium ) ) {
-			wp_delete_file( $medium );
+		$medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+		if (file_exists($medium)) {
+			wp_delete_file($medium);
 		}
 
-		if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-			wp_delete_file( $original );
+		if (empty($_POST['create-new-attachment']) && empty($_POST['skip-cropping'])) {
+			wp_delete_file($original);
 		}
 
 		return $this->finished();
@@ -910,12 +910,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can('edit_theme_options'))
 			wp_die(__('You do not have permission to customize headers.'));
 		$step = $this->step();
-		if ( 2 == $step )
+		if (2 == $step)
 			$this->step_2();
-		elseif ( 3 == $step )
+		elseif (3 == $step)
 			$this->step_3();
 		else
 			$this->step_1();
@@ -929,7 +929,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -941,7 +941,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -959,13 +959,13 @@ 
 	 *
 	 * @param array|object|string $choice
 	 */
-	final public function set_header_image( $choice ) {
-		if ( is_array( $choice ) || is_object( $choice ) ) {
+	final public function set_header_image($choice) {
+		if (is_array($choice) || is_object($choice)) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
+			if ( ! isset($choice['attachment_id']) || ! isset($choice['url']))
 				return;
 
-			$choice['url'] = esc_url_raw( $choice['url'] );
+			$choice['url'] = esc_url_raw($choice['url']);
 
 			$header_image_data = (object) array(
 				'attachment_id' => $choice['attachment_id'],
@@ -975,32 +975,32 @@ 
 				'width'         => $choice['width'],
 			);
 
-			update_post_meta( $choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet() );
-			set_theme_mod( 'header_image', $choice['url'] );
-			set_theme_mod( 'header_image_data', $header_image_data );
+			update_post_meta($choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet());
+			set_theme_mod('header_image', $choice['url']);
+			set_theme_mod('header_image_data', $header_image_data);
 			return;
 		}
 
-		if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ) ) ) {
-			set_theme_mod( 'header_image', $choice );
-			remove_theme_mod( 'header_image_data' );
+		if (in_array($choice, array('remove-header', 'random-default-image', 'random-uploaded-image'))) {
+			set_theme_mod('header_image', $choice);
+			remove_theme_mod('header_image_data');
 			return;
 		}
 
 		$uploaded = get_uploaded_header_images();
-		if ( $uploaded && isset( $uploaded[ $choice ] ) ) {
-			$header_image_data = $uploaded[ $choice ];
+		if ($uploaded && isset($uploaded[$choice])) {
+			$header_image_data = $uploaded[$choice];
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
+			if (isset($this->default_headers[$choice]))
+				$header_image_data = $this->default_headers[$choice];
 			else
 				return;
 		}
 
-		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
-		set_theme_mod( 'header_image_data', $header_image_data );
+		set_theme_mod('header_image', esc_url_raw($header_image_data['url']));
+		set_theme_mod('header_image_data', $header_image_data);
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 	 * @since 3.4.0
 	 */
 	final public function remove_header_image() {
-		$this->set_header_image( 'remove-header' );
+		$this->set_header_image('remove-header');
 	}
 
 	/**
@@ -1021,24 +1021,24 @@ 
 	 */
 	final public function reset_header_image() {
 		$this->process_default_headers();
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) {
+		if ( ! $default) {
 			$this->remove_header_image();
 			return;
 		}
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 		$default_data = array();
-		foreach ( $this->default_headers as $header => $details ) {
-			if ( $details['url'] == $default ) {
+		foreach ($this->default_headers as $header => $details) {
+			if ($details['url'] == $default) {
 				$default_data = $details;
 				break;
 			}
 		}
 
-		set_theme_mod( 'header_image', $default );
-		set_theme_mod( 'header_image_data', (object) $default_data );
+		set_theme_mod('header_image', $default);
+		set_theme_mod('header_image_data', (object) $default_data);
 	}
 
 	/**
@@ -1047,41 +1047,41 @@ 
 	 * @param array $dimensions
 	 * @return array dst_height and dst_width of header image.
 	 */
-	final public function get_header_dimensions( $dimensions ) {
+	final public function get_header_dimensions($dimensions) {
 		$max_width = 0;
-		$width = absint( $dimensions['width'] );
-		$height = absint( $dimensions['height'] );
-		$theme_height = get_theme_support( 'custom-header', 'height' );
-		$theme_width = get_theme_support( 'custom-header', 'width' );
-		$has_flex_width = current_theme_supports( 'custom-header', 'flex-width' );
-		$has_flex_height = current_theme_supports( 'custom-header', 'flex-height' );
-		$has_max_width = current_theme_supports( 'custom-header', 'max-width' ) ;
-		$dst = array( 'dst_height' => null, 'dst_width' => null );
+		$width = absint($dimensions['width']);
+		$height = absint($dimensions['height']);
+		$theme_height = get_theme_support('custom-header', 'height');
+		$theme_width = get_theme_support('custom-header', 'width');
+		$has_flex_width = current_theme_supports('custom-header', 'flex-width');
+		$has_flex_height = current_theme_supports('custom-header', 'flex-height');
+		$has_max_width = current_theme_supports('custom-header', 'max-width');
+		$dst = array('dst_height' => null, 'dst_width' => null);
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( $has_flex_width ) {
+		if ($has_flex_width) {
 			$max_width = 1500;
 		}
 
-		if ( $has_max_width ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ($has_max_width) {
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
 		}
-		$max_width = max( $max_width, $theme_width );
+		$max_width = max($max_width, $theme_width);
 
-		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
-			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
+		if ($has_flex_height && ( ! $has_flex_width || $width > $max_width)) {
+			$dst['dst_height'] = absint($height * ($max_width / $width));
 		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		elseif ($has_flex_height && $has_flex_width) {
 			$dst['dst_height'] = $height;
 		}
 		else {
 			$dst['dst_height'] = $theme_height;
 		}
 
-		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
-			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
+		if ($has_flex_width && ( ! $has_flex_height || $width > $max_width)) {
+			$dst['dst_width'] = absint($width * ($max_width / $width));
 		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		elseif ($has_flex_width && $has_flex_height) {
 			$dst['dst_width'] = $width;
 		}
 		else {
@@ -1099,13 +1099,13 @@ 
 	 *
 	 * @return array Attachment object.
 	 */
-	final public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent = get_post( $parent_attachment_id );
+	final public function create_attachment_object($cropped, $parent_attachment_id) {
+		$parent = get_post($parent_attachment_id);
 		$parent_url = $parent->guid;
-		$url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+		$url = str_replace(basename($parent_url), basename($cropped), $parent_url);
 
-		$size = @getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size = @getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
 			'ID' => $parent_attachment_id,
@@ -1127,9 +1127,9 @@ 
 	 *
 	 * @return int Attachment ID.
 	 */
-	final public function insert_attachment( $object, $cropped ) {
-		$attachment_id = wp_insert_attachment( $object, $cropped );
-		$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+	final public function insert_attachment($object, $cropped) {
+		$attachment_id = wp_insert_attachment($object, $cropped);
+		$metadata = wp_generate_attachment_metadata($attachment_id, $cropped);
 		/**
 		 * Filter the header image attachment metadata.
 		 *
@@ -1139,8 +1139,8 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		$metadata = apply_filters('wp_header_image_attachment_metadata', $metadata);
+		wp_update_attachment_metadata($attachment_id, $metadata);
 		return $attachment_id;
 	}
 
@@ -1149,24 +1149,24 @@ 
 	 * new object. Returns JSON-encoded object details.
 	 */
 	public function ajax_header_crop() {
-		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
+		check_ajax_referer('image_editor-'.$_POST['id'], 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_send_json_error();
 		}
 
 		$crop_details = $_POST['cropDetails'];
 
-		$dimensions = $this->get_header_dimensions( array(
+		$dimensions = $this->get_header_dimensions(array(
 			'height' => $crop_details['height'],
 			'width'  => $crop_details['width'],
-		) );
+		));
 
-		$attachment_id = absint( $_POST['id'] );
+		$attachment_id = absint($_POST['id']);
 
 		$cropped = wp_crop_image(
 			$attachment_id,
@@ -1178,24 +1178,24 @@ 
 			(int) $dimensions['dst_height']
 		);
 
-		if ( ! $cropped || is_wp_error( $cropped ) ) {
-			wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) );
+		if ( ! $cropped || is_wp_error($cropped)) {
+			wp_send_json_error(array('message' => __('Image could not be processed. Please go back and try again.')));
 		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		unset( $object['ID'] );
+		unset($object['ID']);
 
-		$new_attachment_id = $this->insert_attachment( $object, $cropped );
+		$new_attachment_id = $this->insert_attachment($object, $cropped);
 
 		$object['attachment_id'] = $new_attachment_id;
 		$object['width']         = $dimensions['dst_width'];
 		$object['height']        = $dimensions['dst_height'];
 
-		wp_send_json_success( $object );
+		wp_send_json_success($object);
 	}
 
 	/**
@@ -1206,20 +1206,20 @@ 
 	 * Media Manager, even if s/he doesn't save that change.
 	 */
 	public function ajax_header_add() {
-		check_ajax_referer( 'header-add', 'nonce' );
+		check_ajax_referer('header-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1232,20 +1232,20 @@ 
 	 * choice in the Customizer's Header tool.
 	 */
 	public function ajax_header_remove() {
-		check_ajax_referer( 'header-remove', 'nonce' );
+		check_ajax_referer('header-remove', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		delete_post_meta( $attachment_id, $key );
-		delete_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		delete_post_meta($attachment_id, $key);
+		delete_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1254,16 +1254,16 @@ 
 	 *
 	 * @param WP_Customize_Manager $wp_customize
 	 */
-	public function customize_set_last_used( $wp_customize ) {
-		$data = $wp_customize->get_setting( 'header_image_data' )->post_value();
+	public function customize_set_last_used($wp_customize) {
+		$data = $wp_customize->get_setting('header_image_data')->post_value();
 
-		if ( ! isset( $data['attachment_id'] ) ) {
+		if ( ! isset($data['attachment_id'])) {
 			return;
 		}
 
 		$attachment_id = $data['attachment_id'];
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
 	}
 
 	/**
@@ -1274,23 +1274,23 @@ 
 		$this->process_default_headers();
 
 		// Get the default image if there is one.
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) { // If not,
+		if ( ! $default) { // If not,
 			return $this->default_headers; // easy peasy.
 		}
 
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 		$already_has_default = false;
 
-		foreach ( $this->default_headers as $k => $h ) {
-			if ( $h['url'] === $default ) {
+		foreach ($this->default_headers as $k => $h) {
+			if ($h['url'] === $default) {
 				$already_has_default = true;
 				break;
 			}
 		}
 
-		if ( $already_has_default ) {
+		if ($already_has_default) {
 			return $this->default_headers;
 		}
 
@@ -1303,7 +1303,7 @@ 
 		);
 
 		// The rest of the set comes after.
-		return array_merge( $header_images, $this->default_headers );
+		return array_merge($header_images, $this->default_headers);
 	}
 
 	/**
@@ -1312,13 +1312,13 @@ 
 	 */
 	public function get_uploaded_header_images() {
 		$header_images = get_uploaded_header_images();
-		$timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
+		$timestamp_key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
 		$alt_text_key = '_wp_attachment_image_alt';
 
-		foreach ( $header_images as &$header_image ) {
-			$header_meta = get_post_meta( $header_image['attachment_id'] );
-			$header_image['timestamp'] = isset( $header_meta[ $timestamp_key ] ) ? $header_meta[ $timestamp_key ] : '';
-			$header_image['alt_text'] = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : '';
+		foreach ($header_images as &$header_image) {
+			$header_meta = get_post_meta($header_image['attachment_id']);
+			$header_image['timestamp'] = isset($header_meta[$timestamp_key]) ? $header_meta[$timestamp_key] : '';
+			$header_image['alt_text'] = isset($header_meta[$alt_text_key]) ? $header_meta[$alt_text_key] : '';
 		}
 
 		return $header_images;

Braces +130 added lines, -97 removed lines

@@ -133,15 +133,17 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
+		if ( ! isset( $_GET['step'] ) ) {
+					return 1;
+		}
 
 		$step = (int) $_GET['step'];
 		if ( $step < 1 || 3 < $step ||
 			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
 			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
-		)
-			return 1;
+		) {
+					return 1;
+		}
 
 		return $step;
 	}
@@ -157,8 +159,9 @@ 
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
+							wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
 			wp_enqueue_script('imgareaselect');
 		}
@@ -172,10 +175,11 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
-			wp_enqueue_style('imgareaselect');
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					wp_enqueue_style( 'wp-color-picker' );
+		} elseif ( 2 == $step ) {
+					wp_enqueue_style('imgareaselect');
+		}
 	}
 
 	/**
@@ -184,11 +188,13 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
-			return;
+		if ( ! current_user_can('edit_theme_options') ) {
+					return;
+		}
 
-		if ( empty( $_POST ) )
-			return;
+		if ( empty( $_POST ) ) {
+					return;
+		}
 
 		$this->updated = true;
 
@@ -211,10 +217,11 @@ 
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			if ( strlen($color) == 6 || strlen($color) == 3 ) {
+							set_theme_mod('header_textcolor', $color);
+			} elseif ( ! $color ) {
+							set_theme_mod( 'header_textcolor', 'blank' );
+			}
 		}
 
 		if ( isset( $_POST['default-header'] ) ) {
@@ -234,8 +241,9 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
-			return;
+		if ( !isset($_wp_default_headers) ) {
+					return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
@@ -283,8 +291,9 @@ 
 			echo '<div class="default-header">';
 			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
-				$width = ' width="230"';
+			if ( !empty( $header['attachment_id'] ) ) {
+							$width = ' width="230"';
+			}
 			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
 			echo '</div>';
 		}
@@ -298,10 +307,11 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					$this->js_1();
+		} elseif ( 2 == $step ) {
+					$this->js_2();
+		}
 	}
 
 	/**
@@ -486,21 +496,24 @@ 
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+		}
+		if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		}
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
-			$style = ' style="display:none;"';
+		if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+		} else {
+					$style = ' style="display:none;"';
+		}
 		?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
@@ -519,17 +532,21 @@ 
 	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
 	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf( __( 'Images should be at least <strong>%1$d pixels</strong> wide.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf( __( 'Images should be at least <strong>%1$d pixels</strong> wide.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf( __( 'Images should be at least <strong>%1$d pixels</strong> tall.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf( __( 'Images should be at least <strong>%1$d pixels</strong> tall.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+		}
 	}
 	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf( __( 'Suggested width is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf( __( 'Suggested width is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+		}
 	}
 	?></p>
 	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
@@ -582,9 +599,12 @@ 
 <td>
 <?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
-<?php else: ?>
+<?php else {
+	: ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 		$this->show_header_selector( 'default' );
 	?>
@@ -683,8 +703,9 @@ 
 	 */
 	public function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+					wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		}
 
 		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
 			$attachment_id = absint( $_GET['file'] );
@@ -709,11 +730,13 @@ 
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
-			$max_width = 1500;
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
+					$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		}
 		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
 		// If flexible height isn't supported and the image is the exact right size
@@ -721,8 +744,9 @@ 
 			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if ( file_exists( $file ) ) {
+							wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			}
 
 			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
@@ -740,8 +764,9 @@ 
 		} elseif ( $width > $max_width ) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error( $image ) ) {
+							wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
 			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
@@ -779,8 +804,9 @@ 
 	<p class="submit">
 	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	}
 	?>
 	</p>
 </form>
@@ -799,13 +825,15 @@ 
 
 		$uploaded_file = $_FILES['import'];
 		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+					wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if ( isset($file['error']) ) {
+					wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		}
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -834,11 +862,13 @@ 
 	public function step_3() {
 		check_admin_referer( 'custom-header-crop-image' );
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+					wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		}
 
-		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+					wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		}
 
 		if ( $_POST['oitar'] > 1 ) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
@@ -857,23 +887,26 @@ 
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
-		else
-			$cropped = get_attached_file( $attachment_id );
+		if ( empty( $_POST['skip-cropping'] ) ) {
+					$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
+		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
+					$cropped = _copy_image_file( $attachment_id );
+		} else {
+					$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error( $cropped ) ) {
+					wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
 		$object = $this->create_attachment_object( $cropped, $attachment_id );
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
+					unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -910,15 +943,17 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('You do not have permission to customize headers.'));
+		if ( ! current_user_can('edit_theme_options') ) {
+					wp_die(__('You do not have permission to customize headers.'));
+		}
 		$step = $this->step();
-		if ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-		else
-			$this->step_1();
+		if ( 2 == $step ) {
+					$this->step_2();
+		} elseif ( 3 == $step ) {
+					$this->step_3();
+		} else {
+					$this->step_1();
+		}
 	}
 
 	/**
@@ -962,8 +997,9 @@ 
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
-				return;
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+							return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -993,10 +1029,11 @@ 
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
-			else
-				return;
+			if ( isset( $this->default_headers[ $choice ] ) ) {
+							$header_image_data = $this->default_headers[ $choice ];
+			} else {
+							return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1070,21 +1107,17 @@ 
 
 		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
 			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		} elseif ( $has_flex_height && $has_flex_width ) {
 			$dst['dst_height'] = $height;
-		}
-		else {
+		} else {
 			$dst['dst_height'] = $theme_height;
 		}
 
 		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
 			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		} elseif ( $has_flex_width && $has_flex_height ) {
 			$dst['dst_width'] = $width;
-		}
-		else {
+		} else {
 			$dst['dst_width'] = $theme_width;
 		}
 

src/wp-admin/admin.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Administration Bootstrap
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Bootstrap
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * In WordPress Administration Screens

Spacing +86 added lines, -86 removed lines

@@ -11,40 +11,40 @@ 
  *
  * @since 2.3.2
  */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN'))
 	define('WP_NETWORK_ADMIN', false);
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN'))
 	define('WP_USER_ADMIN', false);
 
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if (isset($_GET['import']) && ! defined('WP_LOAD_IMPORTERS'))
 	define('WP_LOAD_IMPORTERS', true);
 
-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 nocache_headers();
 
-if ( get_option('db_upgraded') ) {
+if (get_option('db_upgraded')) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option('db_upgraded', false);
 
 	/**
 	 * Fires on the next page load after a successful DB upgrade.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
-		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	do_action('after_db_upgrade');
+} elseif (get_option('db_version') != $wp_db_version && empty($_POST)) {
+	if ( ! is_multisite()) {
+		wp_redirect(admin_url('upgrade.php?_wp_http_referer='.urlencode(wp_unslash($_SERVER['REQUEST_URI']))));
 		exit;
 
 	/**
@@ -61,30 +61,30 @@ 
 	 *
 	 * @param bool true Whether to perform the Multisite upgrade routine. Default true.
 	 */
-	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
+	} elseif (apply_filters('do_mu_upgrade', true)) {
 		$c = get_blog_count();
 
 		/*
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
-			require_once( ABSPATH . WPINC . '/http.php' );
-			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+		if ($c <= 50 || ($c > 50 && mt_rand(0, (int) ($c / 50)) == 1)) {
+			require_once(ABSPATH.WPINC.'/http.php');
+			$response = wp_remote_get(admin_url('upgrade.php?step=1'), array('timeout' => 120, 'httpversion' => '1.1'));
 			/** This action is documented in wp-admin/network/upgrade.php */
-			do_action( 'after_mu_upgrade', $response );
+			do_action('after_mu_upgrade', $response);
 			unset($response);
 		}
 		unset($c);
 	}
 }
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 auth_redirect();
 
 // Schedule trash collection
-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
+if ( ! wp_next_scheduled('wp_scheduled_delete') && ! defined('WP_INSTALLING'))
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
 
 set_screen_options();
@@ -92,7 +92,7 @@ 
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');
 
-wp_enqueue_script( 'common' );
+wp_enqueue_script('common');
 
 
 
@@ -115,29 +115,29 @@ 
 
 $editing = false;
 
-if ( isset($_GET['page']) ) {
-	$plugin_page = wp_unslash( $_GET['page'] );
+if (isset($_GET['page'])) {
+	$plugin_page = wp_unslash($_GET['page']);
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if (isset($_REQUEST['post_type']) && post_type_exists($_REQUEST['post_type']))
 	$typenow = $_REQUEST['post_type'];
 else
 	$typenow = '';
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if (isset($_REQUEST['taxonomy']) && taxonomy_exists($_REQUEST['taxonomy']))
 	$taxnow = $_REQUEST['taxonomy'];
 else
 	$taxnow = '';
 
-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
+if (WP_NETWORK_ADMIN)
+	require(ABSPATH.'wp-admin/network/menu.php');
+elseif (WP_USER_ADMIN)
+	require(ABSPATH.'wp-admin/user/menu.php');
 else
-	require(ABSPATH . 'wp-admin/menu.php');
+	require(ABSPATH.'wp-admin/menu.php');
 
-if ( current_user_can( 'manage_options' ) ) {
+if (current_user_can('manage_options')) {
 	/**
 	 * Filter the maximum memory limit available for administration screens.
 	 *
@@ -152,7 +152,7 @@ 
 	 *
 	 * @param string 'WP_MAX_MEMORY_LIMIT' The maximum WordPress memory limit. Default 256M.
 	 */
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+	@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 }
 
 /**
@@ -165,24 +165,24 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'admin_init' );
+do_action('admin_init');
 
-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
+if (isset($plugin_page)) {
+	if ( ! empty($typenow))
+		$the_parent = $pagenow.'?post_type='.$typenow;
 	else
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
+	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent)) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Backwards compatibility for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if (empty($page_hook) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php')) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
+			if ( ! empty($_SERVER['QUERY_STRING']))
+				$query_string = $_SERVER['QUERY_STRING'];
 			else
-				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+				$query_string = 'page='.$plugin_page;
+			wp_redirect(admin_url('tools.php?'.$query_string));
 			exit;
 		}
 	}
@@ -190,19 +190,19 @@ 
 }
 
 $hook_suffix = '';
-if ( isset( $page_hook ) ) {
+if (isset($page_hook)) {
 	$hook_suffix = $page_hook;
-} elseif ( isset( $plugin_page ) ) {
+} elseif (isset($plugin_page)) {
 	$hook_suffix = $plugin_page;
-} elseif ( isset( $pagenow ) ) {
+} elseif (isset($pagenow)) {
 	$hook_suffix = $pagenow;
 }
 
 set_current_screen();
 
 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
-	if ( $page_hook ) {
+if (isset($plugin_page)) {
+	if ($page_hook) {
 		/**
 		 * Fires before a particular screen is loaded.
 		 *
@@ -223,9 +223,9 @@ 
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( 'load-' . $page_hook );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		do_action('load-'.$page_hook);
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -233,12 +233,12 @@ 
 		 * @ignore
 		 * @since 1.5.0
 		 */
-		do_action( $page_hook );
+		do_action($page_hook);
 	} else {
-		if ( validate_file($plugin_page) )
+		if (validate_file($plugin_page))
 			wp_die(__('Invalid plugin page'));
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+		if ( ! (file_exists(WP_PLUGIN_DIR."/$plugin_page") && is_file(WP_PLUGIN_DIR."/$plugin_page")) && ! (file_exists(WPMU_PLUGIN_DIR."/$plugin_page") && is_file(WPMU_PLUGIN_DIR."/$plugin_page")))
 			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
 		/**
@@ -253,34 +253,34 @@ 
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( 'load-' . $plugin_page );
+		do_action('load-'.$plugin_page);
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		if (file_exists(WPMU_PLUGIN_DIR."/$plugin_page"))
+			include(WPMU_PLUGIN_DIR."/$plugin_page");
 		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+			include(WP_PLUGIN_DIR."/$plugin_page");
 	}
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit();
-} elseif ( isset( $_GET['import'] ) ) {
+} elseif (isset($_GET['import'])) {
 
 	$importer = $_GET['import'];
 
-	if ( ! current_user_can('import') )
+	if ( ! current_user_can('import'))
 		wp_die(__('You are not allowed to import.'));
 
-	if ( validate_file($importer) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if (validate_file($importer)) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
@@ -291,16 +291,16 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'load-importer-' . $importer );
+	do_action('load-importer-'.$importer);
 
 	$parent_file = 'tools.php';
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset($_GET['noheader']))
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	define('WP_IMPORTING', true);
 
@@ -314,13 +314,13 @@ 
 	 *
 	 * @param bool false Whether to force data to be filtered through kses. Default false.
 	 */
-	if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
-		kses_init_filters();  // Always filter imported data with kses on multisite.
+	if (apply_filters('force_filtered_html_on_import', false)) {
+		kses_init_filters(); // Always filter imported data with kses on multisite.
 	}
 
 	call_user_func($wp_importers[$importer][2]);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	// Make sure rules are flushed
 	flush_rewrite_rules(false);
@@ -339,26 +339,26 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'load-' . $pagenow );
+	do_action('load-'.$pagenow);
 
 	/*
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
-	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
+	if ($typenow == 'page') {
+		if ($pagenow == 'post-new.php')
+			do_action('load-page-new.php');
+		elseif ($pagenow == 'post.php')
+			do_action('load-page.php');
+	}  elseif ($pagenow == 'edit-tags.php') {
+		if ($taxnow == 'category')
+			do_action('load-categories.php');
+		elseif ($taxnow == 'link_category')
+			do_action('load-edit-link-categories.php');
 	}
 }
 
-if ( ! empty( $_REQUEST['action'] ) ) {
+if ( ! empty($_REQUEST['action'])) {
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
@@ -367,5 +367,5 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'admin_action_' . $_REQUEST['action'] );
+	do_action('admin_action_'.$_REQUEST['action']);
 }

Braces +62 added lines, -44 removed lines

@@ -15,18 +15,21 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN') ) {
 	define('WP_NETWORK_ADMIN', false);
+}
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN') ) {
 	define('WP_USER_ADMIN', false);
+}
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') ) {
 	define('WP_LOAD_IMPORTERS', true);
+}
 
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
@@ -84,8 +87,9 @@ 
 auth_redirect();
 
 // Schedule trash collection
-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
+if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') ) {
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+}
 
 set_screen_options();
 
@@ -120,22 +124,25 @@ 
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}
 
-if ( WP_NETWORK_ADMIN )
+if ( WP_NETWORK_ADMIN ) {
 	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
+} elseif ( WP_USER_ADMIN ) {
 	require(ABSPATH . 'wp-admin/user/menu.php');
-else
+} else {
 	require(ABSPATH . 'wp-admin/menu.php');
+}
 
 if ( current_user_can( 'manage_options' ) ) {
 	/**
@@ -168,20 +175,22 @@ 
 do_action( 'admin_init' );
 
 if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
-		$the_parent = $pagenow;
+	if ( !empty($typenow) ) {
+			$the_parent = $pagenow . '?post_type=' . $typenow;
+	} else {
+			$the_parent = $pagenow;
+	}
 	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Backwards compatibility for plugins using add_management_page().
 		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
-				$query_string = 'page=' . $plugin_page;
+			if ( !empty($_SERVER[ 'QUERY_STRING' ]) ) {
+							$query_string = $_SERVER[ 'QUERY_STRING' ];
+			} else {
+							$query_string = 'page=' . $plugin_page;
+			}
 			wp_redirect( admin_url('tools.php?' . $query_string) );
 			exit;
 		}
@@ -224,8 +233,9 @@ 
 		 * @since 2.1.0
 		 */
 		do_action( 'load-' . $page_hook );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if (! isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -235,11 +245,13 @@ 
 		 */
 		do_action( $page_hook );
 	} else {
-		if ( validate_file($plugin_page) )
-			wp_die(__('Invalid plugin page'));
+		if ( validate_file($plugin_page) ) {
+					wp_die(__('Invalid plugin page'));
+		}
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) {
+					wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		}
 
 		/**
 		 * Fires before a particular screen is loaded.
@@ -255,13 +267,15 @@ 
 		 */
 		do_action( 'load-' . $plugin_page );
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( !isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") ) {
+					include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		} else {
+					include(WP_PLUGIN_DIR . "/$plugin_page");
+		}
 	}
 
 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -271,8 +285,9 @@ 
 
 	$importer = $_GET['import'];
 
-	if ( ! current_user_can('import') )
-		wp_die(__('You are not allowed to import.'));
+	if ( ! current_user_can('import') ) {
+			wp_die(__('You are not allowed to import.'));
+	}
 
 	if ( validate_file($importer) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
@@ -297,8 +312,9 @@ 
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if (! isset($_GET['noheader'])) {
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+	}
 
 	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
@@ -346,15 +362,17 @@ 
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
+		if ( $pagenow == 'post-new.php' ) {
+					do_action( 'load-page-new.php' );
+		} elseif ( $pagenow == 'post.php' ) {
+					do_action( 'load-page.php' );
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
+					do_action( 'load-categories.php' );
+		} elseif ( $taxnow == 'link_category' ) {
+					do_action( 'load-edit-link-categories.php' );
+		}
 	}
 }
 

src/wp-admin/press-this.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Press This Display and Handler.
- *
- * @package WordPress
- * @subpackage Press_This
- */
+	 * Press This Display and Handler.
+	 *
+	 * @package WordPress
+	 * @subpackage Press_This
+	 */
 
 define('IFRAME_REQUEST' , true);
 

Spacing +6 added lines, -6 removed lines

@@ -6,19 +6,19 @@
  * @subpackage Press_This
  */
 
-define('IFRAME_REQUEST' , true);
+define('IFRAME_REQUEST', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('edit_posts') || ! current_user_can(get_post_type_object('post')->cap->create_posts))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 /**
  * @global WP_Press_This $wp_press_this
  */
-if ( empty( $GLOBALS['wp_press_this'] ) ) {
-	include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+if (empty($GLOBALS['wp_press_this'])) {
+	include(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 }
 
 $GLOBALS['wp_press_this']->html();

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) )
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 /**
  * @global WP_Press_This $wp_press_this

src/wp-admin/admin-functions.php

Spacing +2 added lines, -2 removed lines

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