ntwb / wordpress

src/wp-admin/menu.php

Indentation +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
 	add_action('admin_menu', '_add_themes_utility_last', 101);
 }
 /**
- *
- */
+	 *
+	 */
 function _add_themes_utility_last() {
 	// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
 	add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');

Spacing +94 added lines, -94 removed lines

@@ -20,98 +20,98 @@ 
  * @global array $menu
  */
 
-$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
+$menu[2] = array(__('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
 
-$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
+$submenu['index.php'][0] = array(__('Home'), 'read', 'index.php');
 
-if ( is_multisite() ) {
-	$submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
+if (is_multisite()) {
+	$submenu['index.php'][5] = array(__('My Sites'), 'read', 'my-sites.php');
 }
 
-if ( ! is_multisite() || is_super_admin() )
+if ( ! is_multisite() || is_super_admin())
 	$update_data = wp_get_update_data();
 
-if ( ! is_multisite() ) {
-	if ( current_user_can( 'update_core' ) )
+if ( ! is_multisite()) {
+	if (current_user_can('update_core'))
 		$cap = 'update_core';
-	elseif ( current_user_can( 'update_plugins' ) )
+	elseif (current_user_can('update_plugins'))
 		$cap = 'update_plugins';
 	else
 		$cap = 'update_themes';
-	$submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), $cap, 'update-core.php');
-	unset( $cap );
+	$submenu['index.php'][10] = array(sprintf(__('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>".number_format_i18n($update_data['counts']['total'])."</span></span>"), $cap, 'update-core.php');
+	unset($cap);
 }
 
-$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
+$menu[4] = array('', 'read', 'separator1', '', 'wp-menu-separator');
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' );
-	$submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
+$menu[5] = array(__('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post');
+	$submenu['edit.php'][5] = array(__('All Posts'), 'edit_posts', 'edit.php');
 	/* translators: add new post */
-	$submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
+	$submenu['edit.php'][10] = array(_x('Add New', 'post'), get_post_type_object('post')->cap->create_posts, 'post-new.php');
 
 	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) )
+	foreach (get_taxonomies(array(), 'objects') as $tax) {
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true))
 			continue;
 
-		$submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
+		$submenu['edit.php'][$i++] = array(esc_attr($tax->labels->menu_name), $tax->cap->manage_terms, 'edit-tags.php?taxonomy='.$tax->name);
 	}
 	unset($tax);
 
-$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
-	$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
+$menu[10] = array(__('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media');
+	$submenu['upload.php'][5] = array(__('Library'), 'upload_files', 'upload.php');
 	/* translators: add new file */
-	$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
-	foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu )
+	$submenu['upload.php'][10] = array(_x('Add New', 'file'), 'upload_files', 'media-new.php');
+	foreach (get_taxonomies_for_attachments('objects') as $tax) {
+		if ( ! $tax->show_ui || ! $tax->show_in_menu)
 			continue;
 
-		$submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment' );
+		$submenu['upload.php'][$i++] = array(esc_attr($tax->labels->menu_name), $tax->cap->manage_terms, 'edit-tags.php?taxonomy='.$tax->name.'&amp;post_type=attachment');
 	}
 	unset($tax);
 
-$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
-	$submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
+$menu[15] = array(__('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links');
+	$submenu['link-manager.php'][5] = array(_x('All Links', 'admin menu'), 'manage_links', 'link-manager.php');
 	/* translators: add new links */
-	$submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
-	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
+	$submenu['link-manager.php'][10] = array(_x('Add New', 'link'), 'manage_links', 'link-add.php');
+	$submenu['link-manager.php'][15] = array(__('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category');
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' );
-	$submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
+$menu[20] = array(__('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page');
+	$submenu['edit.php?post_type=page'][5] = array(__('All Pages'), 'edit_pages', 'edit.php?post_type=page');
 	/* translators: add new page */
-	$submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
+	$submenu['edit.php?post_type=page'][10] = array(_x('Add New', 'page'), get_post_type_object('page')->cap->create_posts, 'post-new.php?post_type=page');
 	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true) )
+	foreach (get_taxonomies(array(), 'objects') as $tax) {
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('page', (array) $tax->object_type, true))
 			continue;
 
-		$submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page' );
+		$submenu['edit.php?post_type=page'][$i++] = array(esc_attr($tax->labels->menu_name), $tax->cap->manage_terms, 'edit-tags.php?taxonomy='.$tax->name.'&amp;post_type=page');
 	}
 	unset($tax);
 
 $awaiting_mod = wp_count_comments();
 $awaiting_mod = $awaiting_mod->moderated;
-$menu[25] = array( sprintf( __('Comments %s'), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'dashicons-admin-comments' );
+$menu[25] = array(sprintf(__('Comments %s'), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>".number_format_i18n($awaiting_mod)."</span></span>"), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'dashicons-admin-comments');
 unset($awaiting_mod);
 
-$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
+$submenu['edit-comments.php'][0] = array(__('All Comments'), 'edit_posts', 'edit-comments.php');
 
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
 
-foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) as $ptype ) {
-	$ptype_obj = get_post_type_object( $ptype );
+foreach ((array) get_post_types(array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true)) as $ptype) {
+	$ptype_obj = get_post_type_object($ptype);
 	// Check if it should be a submenu.
-	if ( $ptype_obj->show_in_menu !== true )
+	if ($ptype_obj->show_in_menu !== true)
 		continue;
-	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
-	$ptype_for_id = sanitize_html_class( $ptype );
+	$ptype_menu_position = is_int($ptype_obj->menu_position) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
+	$ptype_for_id = sanitize_html_class($ptype);
 
-	if ( is_string( $ptype_obj->menu_icon ) ) {
+	if (is_string($ptype_obj->menu_icon)) {
 		// Special handling for data:image/svg+xml and Dashicons.
-		if ( 0 === strpos( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || 0 === strpos( $ptype_obj->menu_icon, 'dashicons-' ) ) {
+		if (0 === strpos($ptype_obj->menu_icon, 'data:image/svg+xml;base64,') || 0 === strpos($ptype_obj->menu_icon, 'dashicons-')) {
 			$menu_icon = $ptype_obj->menu_icon;
 		} else {
-			$menu_icon = esc_url( $ptype_obj->menu_icon );
+			$menu_icon = esc_url($ptype_obj->menu_icon);
 		}
 		$ptype_class = $ptype_for_id;
 	} else {
@@ -124,53 +124,53 @@ 
 	 * by a hard-coded value below, increment the position.
 	 */
 	$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
-	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
+	while (isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions))
 		$ptype_menu_position++;
 
-	$menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
-	$submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
-	$submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, "post-new.php?post_type=$ptype" );
+	$menu[$ptype_menu_position] = array(esc_attr($ptype_obj->labels->menu_name), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-'.$ptype_class, 'menu-posts-'.$ptype_for_id, $menu_icon);
+	$submenu["edit.php?post_type=$ptype"][5] = array($ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
+	$submenu["edit.php?post_type=$ptype"][10] = array($ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, "post-new.php?post_type=$ptype");
 
 	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
+	foreach (get_taxonomies(array(), 'objects') as $tax) {
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true))
 			continue;
 
-		$submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
+		$submenu["edit.php?post_type=$ptype"][$i++] = array(esc_attr($tax->labels->menu_name), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype");
 	}
 }
 unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
 
-$menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
+$menu[59] = array('', 'read', 'separator2', '', 'wp-menu-separator');
 
-$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
+$appearance_cap = current_user_can('switch_themes') ? 'switch_themes' : 'edit_theme_options';
 
-$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
-	$submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
+$menu[60] = array(__('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance');
+	$submenu['themes.php'][5] = array(__('Themes'), $appearance_cap, 'themes.php');
 
-	$customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
-	$submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
+	$customize_url = add_query_arg('return', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), 'customize.php');
+	$submenu['themes.php'][6] = array(__('Customize'), 'customize', esc_url($customize_url), '', 'hide-if-no-customize');
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
-		$submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' );
+	if (current_theme_supports('menus') || current_theme_supports('widgets')) {
+		$submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
 	}
 
-	if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {
-		$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-		$submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+	if (current_theme_supports('custom-header') && current_user_can('customize')) {
+		$customize_header_url = add_query_arg(array('autofocus' => array('control' => 'header_image')), $customize_url);
+		$submenu['themes.php'][15] = array(__('Header'), $appearance_cap, esc_url($customize_header_url), '', 'hide-if-no-customize');
 	}
 
-	if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {
-		$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-		$submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+	if (current_theme_supports('custom-background') && current_user_can('customize')) {
+		$customize_background_url = add_query_arg(array('autofocus' => array('control' => 'background_image')), $customize_url);
+		$submenu['themes.php'][20] = array(__('Background'), $appearance_cap, esc_url($customize_background_url), '', 'hide-if-no-customize');
 	}
 
-	unset( $customize_url );
+	unset($customize_url);
 
-unset( $appearance_cap );
+unset($appearance_cap);
 
 // Add 'Editor' to the bottom of the Appearance menu.
-if ( ! is_multisite() ) {
+if ( ! is_multisite()) {
 	add_action('admin_menu', '_add_themes_utility_last', 101);
 }
 /**
@@ -182,35 +182,35 @@ 
 }
 
 $count = '';
-if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-	if ( ! isset( $update_data ) )
+if ( ! is_multisite() && current_user_can('update_plugins')) {
+	if ( ! isset($update_data))
 		$update_data = wp_get_update_data();
-	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
+	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>".number_format_i18n($update_data['counts']['plugins'])."</span></span>";
 }
 
-$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
+$menu[65] = array(sprintf(__('Plugins %s'), $count), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins');
 
-$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
+$submenu['plugins.php'][5] = array(__('Installed Plugins'), 'activate_plugins', 'plugins.php');
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		/* translators: add new plugin */
-		$submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
-		$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
+		$submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
+		$submenu['plugins.php'][15] = array(_x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php');
 	}
 
-unset( $update_data );
+unset($update_data);
 
-if ( current_user_can('list_users') )
-	$menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+if (current_user_can('list_users'))
+	$menu[70] = array(__('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
 else
-	$menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+	$menu[70] = array(__('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
 
-if ( current_user_can('list_users') ) {
+if (current_user_can('list_users')) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
 	$submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php');
-	if ( current_user_can( 'create_users' ) ) {
+	if (current_user_can('create_users')) {
 		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
-	} elseif ( is_multisite() ) {
+	} elseif (is_multisite()) {
 		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
 	}
 
@@ -218,23 +218,23 @@ 
 } else {
 	$_wp_real_parent_file['users.php'] = 'profile.php';
 	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
-	if ( current_user_can( 'create_users' ) ) {
+	if (current_user_can('create_users')) {
 		$submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
-	} elseif ( is_multisite() ) {
+	} elseif (is_multisite()) {
 		$submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
 	}
 }
 
-$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
-	$submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
-	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-	$submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
-	if ( is_multisite() && !is_main_site() )
-		$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
-	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
+$menu[75] = array(__('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools');
+	$submenu['tools.php'][5] = array(__('Available Tools'), 'edit_posts', 'tools.php');
+	$submenu['tools.php'][10] = array(__('Import'), 'import', 'import.php');
+	$submenu['tools.php'][15] = array(__('Export'), 'export', 'export.php');
+	if (is_multisite() && ! is_main_site())
+		$submenu['tools.php'][25] = array(__('Delete Site'), 'delete_site', 'ms-delete-site.php');
+	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE)
 		$submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
 
-$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
+$menu[80] = array(__('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
 	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
 	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
 	$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
@@ -244,7 +244,7 @@ 
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 
-$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' );
+$menu[99] = array('', 'read', 'separator-last', '', 'wp-menu-separator');
 
 // Back-compat for old top-levels
 $_wp_real_parent_file['post.php'] = 'edit.php';
@@ -268,4 +268,4 @@ 
 	'themes' => 'appearance',
 	);
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
+require_once(ABSPATH.'wp-admin/includes/menu.php');

Braces +39 added lines, -27 removed lines

@@ -28,16 +28,18 @@ 
 	$submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
 }
 
-if ( ! is_multisite() || is_super_admin() )
+if ( ! is_multisite() || is_super_admin() ) {
 	$update_data = wp_get_update_data();
+}
 
 if ( ! is_multisite() ) {
-	if ( current_user_can( 'update_core' ) )
-		$cap = 'update_core';
-	elseif ( current_user_can( 'update_plugins' ) )
-		$cap = 'update_plugins';
-	else
-		$cap = 'update_themes';
+	if ( current_user_can( 'update_core' ) ) {
+			$cap = 'update_core';
+	} elseif ( current_user_can( 'update_plugins' ) ) {
+			$cap = 'update_plugins';
+	} else {
+			$cap = 'update_themes';
+	}
 	$submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), $cap, 'update-core.php');
 	unset( $cap );
 }
@@ -51,8 +53,9 @@ 
 
 	$i = 15;
 	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) )
-			continue;
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) ) {
+					continue;
+		}
 
 		$submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
 	}
@@ -63,8 +66,9 @@ 
 	/* translators: add new file */
 	$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
 	foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu )
-			continue;
+		if ( ! $tax->show_ui || ! $tax->show_in_menu ) {
+					continue;
+		}
 
 		$submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment' );
 	}
@@ -82,8 +86,9 @@ 
 	$submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
 	$i = 15;
 	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true) )
-			continue;
+		if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true) ) {
+					continue;
+		}
 
 		$submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page' );
 	}
@@ -101,8 +106,9 @@ 
 foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) as $ptype ) {
 	$ptype_obj = get_post_type_object( $ptype );
 	// Check if it should be a submenu.
-	if ( $ptype_obj->show_in_menu !== true )
-		continue;
+	if ( $ptype_obj->show_in_menu !== true ) {
+			continue;
+	}
 	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
 	$ptype_for_id = sanitize_html_class( $ptype );
 
@@ -124,8 +130,9 @@ 
 	 * by a hard-coded value below, increment the position.
 	 */
 	$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
-	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
-		$ptype_menu_position++;
+	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) ) {
+			$ptype_menu_position++;
+	}
 
 	$menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
 	$submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
@@ -133,8 +140,9 @@ 
 
 	$i = 15;
 	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
-			continue;
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) ) {
+					continue;
+		}
 
 		$submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
 	}
@@ -183,8 +191,9 @@ 
 
 $count = '';
 if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-	if ( ! isset( $update_data ) )
-		$update_data = wp_get_update_data();
+	if ( ! isset( $update_data ) ) {
+			$update_data = wp_get_update_data();
+	}
 	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
 }
 
@@ -200,10 +209,11 @@ 
 
 unset( $update_data );
 
-if ( current_user_can('list_users') )
+if ( current_user_can('list_users') ) {
 	$menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
-else
+} else {
 	$menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+}
 
 if ( current_user_can('list_users') ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
@@ -229,10 +239,12 @@ 
 	$submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
 	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
 	$submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
-	if ( is_multisite() && !is_main_site() )
-		$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
-	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-		$submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
+	if ( is_multisite() && !is_main_site() ) {
+			$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
+	}
+	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE ) {
+			$submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
+	}
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
 	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');

src/wp-admin/admin-footer.php

Indentation +6 added lines, -6 removed lines

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

Spacing +10 added lines, -10 removed lines

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

Braces +6 added lines, -4 removed lines

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

src/wp-admin/update.php

Spacing +110 added lines, -110 removed lines

@@ -6,125 +6,125 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
-	define( 'IFRAME_REQUEST', true );
+if ( ! defined('IFRAME_REQUEST') && isset($_GET['action']) && in_array($_GET['action'], array('update-selected', 'activate-plugin', 'update-selected-themes')))
+	define('IFRAME_REQUEST', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
-if ( isset($_GET['action']) ) {
+if (isset($_GET['action'])) {
 	$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
 	$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
+	if ('update-selected' == $action) {
+		if ( ! current_user_can('update_plugins'))
+			wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
-		check_admin_referer( 'bulk-update-plugins' );
+		check_admin_referer('bulk-update-plugins');
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['plugins']))
+			$plugins = explode(',', stripslashes($_GET['plugins']));
+		elseif (isset($_POST['checked']))
 			$plugins = (array) $_POST['checked'];
 		else
 			$plugins = array();
 
 		$plugins = array_map('urldecode', $plugins);
 
-		$url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
+		$url = 'update.php?action=update-selected&plugins='.urlencode(implode(',', $plugins));
 		$nonce = 'bulk-update-plugins';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Plugin_Upgrader( new Bulk_Plugin_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $plugins );
+		$upgrader = new Plugin_Upgrader(new Bulk_Plugin_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($plugins);
 
 		iframe_footer();
 
-	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('upgrade-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
-		check_admin_referer('upgrade-plugin_' . $plugin);
+		check_admin_referer('upgrade-plugin_'.$plugin);
 
 		$title = __('Update Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugins.php';
 
-		wp_enqueue_script( 'updates' );
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		wp_enqueue_script('updates');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-plugin_' . $plugin;
-		$url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
+		$nonce = 'upgrade-plugin_'.$plugin;
+		$url = 'update.php?action=upgrade-plugin&plugin='.urlencode($plugin);
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Upgrader_Skin(compact('title', 'nonce', 'url', 'plugin')));
 		$upgrader->upgrade($plugin);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('activate-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
-		check_admin_referer('activate-plugin_' . $plugin);
-		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
-			activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-			wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
+		check_admin_referer('activate-plugin_'.$plugin);
+		if ( ! isset($_GET['failure']) && ! isset($_GET['success'])) {
+			wp_redirect(admin_url('update.php?action=activate-plugin&failure=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
+			activate_plugin($plugin, '', ! empty($_GET['networkwide']), true);
+			wp_redirect(admin_url('update.php?action=activate-plugin&success=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
 			die();
 		}
-		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		iframe_header(__('Plugin Reactivation'), true);
+		if (isset($_GET['success']))
+			echo '<p>'.__('Plugin reactivated successfully.').'</p>';
 
-		if ( isset($_GET['failure']) ){
-			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
+		if (isset($_GET['failure'])) {
+			echo '<p>'.__('Plugin failed to reactivate due to a fatal error.').'</p>';
 
-			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+			error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-			wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-			include( WP_PLUGIN_DIR . '/' . $plugin );
+			wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
+			include(WP_PLUGIN_DIR.'/'.$plugin);
 		}
 		iframe_footer();
-	} elseif ( 'install-plugin' == $action ) {
+	} elseif ('install-plugin' == $action) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins'))
+			wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+		include_once(ABSPATH.'wp-admin/includes/plugin-install.php'); //for plugins_api..
 
-		check_admin_referer('install-plugin_' . $plugin);
-		$api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+		check_admin_referer('install-plugin_'.$plugin);
+		$api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false))); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
+		if (is_wp_error($api))
 	 		wp_die($api);
 
 		$title = __('Plugin Install');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-plugin_' . $plugin;
-		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		$title = sprintf(__('Installing Plugin: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-plugin_'.$plugin;
+		$url = 'update.php?action=install-plugin&plugin='.urlencode($plugin);
+		if (isset($_GET['from']))
+			$url .= '&from='.urlencode(stripslashes($_GET['from']));
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-plugin' == $action ) {
+	} elseif ('upload-plugin' == $action) {
 
-		if ( ! current_user_can( 'upload_plugins' ) ) {
-			wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('upload_plugins')) {
+			wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 		}
 
 		check_admin_referer('plugin-upload');
@@ -134,128 +134,128 @@ 
 		$title = __('Upload Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Plugin from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'plugin-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upgrade-theme' == $action ) {
+	} elseif ('upgrade-theme' == $action) {
 
-		if ( ! current_user_can('update_themes') )
+		if ( ! current_user_can('update_themes'))
 			wp_die(__('You do not have sufficient permissions to update themes for this site.'));
 
-		check_admin_referer('upgrade-theme_' . $theme);
+		check_admin_referer('upgrade-theme_'.$theme);
 
-		wp_enqueue_script( 'customize-loader' );
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('customize-loader');
+		wp_enqueue_script('updates');
 
 		$title = __('Update Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-theme_' . $theme;
-		$url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
+		$nonce = 'upgrade-theme_'.$theme;
+		$url = 'update.php?action=upgrade-theme&theme='.urlencode($theme);
 
-		$upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Upgrader_Skin(compact('title', 'nonce', 'url', 'theme')));
 		$upgrader->upgrade($theme);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
-	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
+		include(ABSPATH.'wp-admin/admin-footer.php');
+	} elseif ('update-selected-themes' == $action) {
+		if ( ! current_user_can('update_themes'))
+			wp_die(__('You do not have sufficient permissions to update themes for this site.'));
 
-		check_admin_referer( 'bulk-update-themes' );
+		check_admin_referer('bulk-update-themes');
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['themes']))
+			$themes = explode(',', stripslashes($_GET['themes']));
+		elseif (isset($_POST['checked']))
 			$themes = (array) $_POST['checked'];
 		else
 			$themes = array();
 
 		$themes = array_map('urldecode', $themes);
 
-		$url = 'update.php?action=update-selected-themes&amp;themes=' . urlencode(implode(',', $themes));
+		$url = 'update.php?action=update-selected-themes&amp;themes='.urlencode(implode(',', $themes));
 		$nonce = 'bulk-update-themes';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Theme_Upgrader( new Bulk_Theme_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $themes );
+		$upgrader = new Theme_Upgrader(new Bulk_Theme_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($themes);
 
 		iframe_footer();
-	} elseif ( 'install-theme' == $action ) {
+	} elseif ('install-theme' == $action) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes'))
+			wp_die(__('You do not have sufficient permissions to install themes on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
+		include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php'); //for themes_api..
 
-		check_admin_referer( 'install-theme_' . $theme );
-		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		check_admin_referer('install-theme_'.$theme);
+		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false))); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
+		if (is_wp_error($api))
 	 		wp_die($api);
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Install Themes');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-theme_' . $theme;
-		$url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
+		$title = sprintf(__('Installing Theme: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-theme_'.$theme;
+		$url = 'update.php?action=install-theme&theme='.urlencode($theme);
 		$type = 'web'; //Install theme type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-theme' == $action ) {
+	} elseif ('upload-theme' == $action) {
 
-		if ( ! current_user_can( 'upload_themes' ) ) {
-			wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('upload_themes')) {
+			wp_die(__('You do not have sufficient permissions to install themes on this site.'));
 		}
 
 		check_admin_referer('theme-upload');
 
 		$file_upload = new File_Upload_Upgrader('themezip', 'package');
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Upload Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'theme-install.php';
 
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Theme from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'theme-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
 	} else {
 		/**
@@ -267,6 +267,6 @@ 
 		 *
 		 * @since 2.8.0
 		 */
-		do_action( "update-custom_{$action}" );
+		do_action("update-custom_{$action}");
 	}
 }

Braces +55 added lines, -39 removed lines

@@ -6,8 +6,9 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -20,17 +21,19 @@ 
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
 	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
+		if ( ! current_user_can( 'update_plugins' ) ) {
+					wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-plugins' );
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$plugins = (array) $_POST['checked'];
-		else
-			$plugins = array();
+		if ( isset( $_GET['plugins'] ) ) {
+					$plugins = explode( ',', stripslashes($_GET['plugins']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$plugins = (array) $_POST['checked'];
+		} else {
+					$plugins = array();
+		}
 
 		$plugins = array_map('urldecode', $plugins);
 
@@ -46,8 +49,9 @@ 
 		iframe_footer();
 
 	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
+		}
 
 		check_admin_referer('upgrade-plugin_' . $plugin);
 
@@ -67,8 +71,9 @@ 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
+		}
 
 		check_admin_referer('activate-plugin_' . $plugin);
 		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
@@ -78,8 +83,9 @@ 
 			die();
 		}
 		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		if ( isset($_GET['success']) ) {
+					echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		}
 
 		if ( isset($_GET['failure']) ){
 			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
@@ -92,16 +98,18 @@ 
 		iframe_footer();
 	} elseif ( 'install-plugin' == $action ) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins') ) {
+					wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
 		check_admin_referer('install-plugin_' . $plugin);
 		$api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
-	 		wp_die($api);
+		if ( is_wp_error($api) ) {
+			 		wp_die($api);
+		}
 
 		$title = __('Plugin Install');
 		$parent_file = 'plugins.php';
@@ -111,8 +119,9 @@ 
 		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
 		$nonce = 'install-plugin_' . $plugin;
 		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		if ( isset($_GET['from']) ) {
+					$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		}
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
@@ -144,15 +153,17 @@ 
 		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ( 'upgrade-theme' == $action ) {
 
-		if ( ! current_user_can('update_themes') )
-			wp_die(__('You do not have sufficient permissions to update themes for this site.'));
+		if ( ! current_user_can('update_themes') ) {
+					wp_die(__('You do not have sufficient permissions to update themes for this site.'));
+		}
 
 		check_admin_referer('upgrade-theme_' . $theme);
 
@@ -172,17 +183,19 @@ 
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
+		if ( ! current_user_can( 'update_themes' ) ) {
+					wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-themes' );
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$themes = (array) $_POST['checked'];
-		else
-			$themes = array();
+		if ( isset( $_GET['themes'] ) ) {
+					$themes = explode( ',', stripslashes($_GET['themes']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$themes = (array) $_POST['checked'];
+		} else {
+					$themes = array();
+		}
 
 		$themes = array_map('urldecode', $themes);
 
@@ -198,16 +211,18 @@ 
 		iframe_footer();
 	} elseif ( 'install-theme' == $action ) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes') ) {
+					wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
-	 		wp_die($api);
+		if ( is_wp_error($api) ) {
+			 		wp_die($api);
+		}
 
 		wp_enqueue_script( 'customize-loader' );
 
@@ -252,8 +267,9 @@ 
 		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 

src/wp-admin/custom-background.php

Indentation +5 added lines, -5 removed lines

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

Spacing +113 added lines, -113 removed lines

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

Braces +43 added lines, -30 removed lines

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

src/wp-admin/upgrade.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Upgrade WordPress Page.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Upgrade WordPress Page.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * We are upgrading WordPress.

Spacing +42 added lines, -42 removed lines

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

Braces +17 added lines, -12 removed lines

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

src/wp-admin/upload.php

Indentation +5 added lines, -5 removed lines

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

Spacing +130 added lines, -130 removed lines

@@ -7,84 +7,84 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('upload_files') )
-	wp_die( __( 'You do not have permission to upload files.' ) );
+if ( ! current_user_can('upload_files'))
+	wp_die(__('You do not have permission to upload files.'));
 
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
-$modes = array( 'grid', 'list' );
+$mode = get_user_option('media_library_mode', get_current_user_id()) ? get_user_option('media_library_mode', get_current_user_id()) : 'grid';
+$modes = array('grid', 'list');
 
-if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
+if (isset($_GET['mode']) && in_array($_GET['mode'], $modes)) {
 	$mode = $_GET['mode'];
-	update_user_option( get_current_user_id(), 'media_library_mode', $mode );
+	update_user_option(get_current_user_id(), 'media_library_mode', $mode);
 }
 
-if ( 'grid' === $mode ) {
+if ('grid' === $mode) {
 	wp_enqueue_media();
-	wp_enqueue_script( 'media-grid' );
-	wp_enqueue_script( 'media' );
+	wp_enqueue_script('media-grid');
+	wp_enqueue_script('media');
 
 	$q = $_GET;
 	// let JS handle this
-	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
-	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
-	foreach ( $vars as $key => $value ) {
-		if ( ! $value || in_array( $key, $ignore ) ) {
-			unset( $vars[ $key ] );
+	unset($q['s']);
+	$vars = wp_edit_attachments_query_vars($q);
+	$ignore = array('mode', 'post_type', 'post_status', 'posts_per_page');
+	foreach ($vars as $key => $value) {
+		if ( ! $value || in_array($key, $ignore)) {
+			unset($vars[$key]);
 		}
 	}
 
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
+	wp_localize_script('media-grid', '_wpMediaGridSettings', array(
+		'adminUrl' => parse_url(self_admin_url(), PHP_URL_PATH),
 		'queryVars' => (object) $vars
-	) );
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'overview',
-		'title'		=> __( 'Overview' ),
+		'title'		=> __('Overview'),
 		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
-	) );
+			'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.').'</p>'.
+			'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'.
+			'<p>'.__('To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.').'</p>'
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'attachment-details',
-		'title'		=> __( 'Attachment Details' ),
+		'title'		=> __('Attachment Details'),
 		'content'	=>
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
-	) );
+			'<p>'.__('Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.').'</p>'.
+			'<p>'.__('Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.').'</p>'.
+			'<p>'.__('You can also delete individual items and access the extended edit screen from the details dialog.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+		'<p><strong>'.__('For more information:').'</strong></p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	$title = __('Media Library');
 	$parent_file = 'upload.php';
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
 		<h1>
 		<?php
-		echo esc_html( $title );
-		if ( current_user_can( 'upload_files' ) ) { ?>
-			<a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+		echo esc_html($title);
+		if (current_user_can('upload_files')) { ?>
+			<a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 		}
 		?>
 		</h1>
 		<div class="error hide-if-js">
-			<p><?php _e( 'The grid view for the Media Library requires JavaScript. <a href="upload.php?mode=list">Switch to the list view</a>.' ); ?></p>
+			<p><?php _e('The grid view for the Media Library requires JavaScript. <a href="upload.php?mode=list">Switch to the list view</a>.'); ?></p>
 		</div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -94,75 +94,75 @@ 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-media');
 
-	if ( 'delete_all' == $doaction ) {
-		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
+	if ('delete_all' == $doaction) {
+		$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'");
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
 	}
 
 	$location = 'upload.php';
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'upload.php'))
+			$location = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer);
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'detach':
-			wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+			wp_media_attach_action($_REQUEST['parent_post_id'], 'detach');
 			break;
 
 		case 'attach':
-			wp_media_attach_action( $_REQUEST['found_post_id'] );
+			wp_media_attach_action($_REQUEST['found_post_id']);
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post to the trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this post to the trash.'));
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 			}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			$location = add_query_arg(array('trashed' => count($post_ids), 'ids' => join(',', $post_ids)), $location);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this post out of the trash.'));
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 			}
-			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
+			$location = add_query_arg('untrashed', count($post_ids), $location);
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this post.' ) );
+			foreach ((array) $post_ids as $post_id_del) {
+				if ( ! current_user_can('delete_post', $post_id_del))
+					wp_die(__('You are not allowed to delete this post.'));
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( ! wp_delete_attachment($post_id_del))
+					wp_die(__('Error in deleting.'));
 			}
-			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
+			$location = add_query_arg('deleted', count($post_ids), $location);
 			break;
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	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;
 }
 
@@ -171,111 +171,111 @@ 
 $title = __('Media Library');
 $parent_file = 'upload.php';
 
-wp_enqueue_script( 'media' );
+wp_enqueue_script('media');
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.').'</p>'.
+	'<p>'.__('You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.').'</p>'.
+	'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'actions-links',
 'title'		=> __('Available Actions'),
 'content'	=>
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'attaching-files',
 'title'		=> __('Attaching Files'),
 'content'	=>
-	'<p>' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '</p>'
-) );
+	'<p>'.__('If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</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 );
-if ( current_user_can( 'upload_files' ) ) { ?>
+echo esc_html($title);
+if (current_user_can('upload_files')) { ?>
 	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( ! empty( $_REQUEST['s'] ) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
+if ( ! empty($_REQUEST['s']))
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query()); ?>
 </h1>
 
 <?php
 $message = '';
-if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media attachment updated.' );
+if ( ! empty($_GET['posted'])) {
+	$message = __('Media attachment updated.');
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
-	$message = sprintf( _n( 'Reattached %d attachment.', 'Reattached %d attachments.', $attached ), $attached );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+if ( ! empty($_GET['attached']) && $attached = absint($_GET['attached'])) {
+	$message = sprintf(_n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached);
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
-	$message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+if ( ! empty($_GET['detach']) && $detached = absint($_GET['detach'])) {
+	$message = sprintf(_n('Detached %d attachment.', 'Detached %d attachments.', $detached), $detached);
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
-	if ( 1 == $deleted ) {
-		$message = __( 'Media attachment permanently deleted.' );
+if ( ! empty($_GET['deleted']) && $deleted = absint($_GET['deleted'])) {
+	if (1 == $deleted) {
+		$message = __('Media attachment permanently deleted.');
 	} else {
-		$message = _n( '%d media attachment permanently deleted.', '%d media attachments permanently deleted.', $deleted );
+		$message = _n('%d media attachment permanently deleted.', '%d media attachments permanently deleted.', $deleted);
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
+	$message = sprintf($message, number_format_i18n($deleted));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
-	if ( 1 == $trashed ) {
-		$message = __( 'Media attachment moved to the trash.' );
+if ( ! empty($_GET['trashed']) && $trashed = absint($_GET['trashed'])) {
+	if (1 == $trashed) {
+		$message = __('Media attachment moved to the trash.');
 	} else {
-		$message = _n( '%d media attachment moved to the trash.', '%d media attachments moved to the trash.', $trashed );
+		$message = _n('%d media attachment moved to the trash.', '%d media attachments moved to the trash.', $trashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
+	$message = sprintf($message, number_format_i18n($trashed));
+	$message .= ' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
-	if ( 1 == $untrashed ) {
-		$message = __( 'Media attachment restored from the trash.' );
+if ( ! empty($_GET['untrashed']) && $untrashed = absint($_GET['untrashed'])) {
+	if (1 == $untrashed) {
+		$message = __('Media attachment restored from the trash.');
 	} else {
-		$message = _n( '%d media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed );
+		$message = _n('%d media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
+	$message = sprintf($message, number_format_i18n($untrashed));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
 }
 
-$messages[1] = __( 'Media attachment updated.' );
-$messages[2] = __( 'Media attachment permanently deleted.' );
-$messages[3] = __( 'Error saving media attachment.' );
-$messages[4] = __( 'Media attachment moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media attachment restored from the trash.' );
+$messages[1] = __('Media attachment updated.');
+$messages[2] = __('Media attachment permanently deleted.');
+$messages[3] = __('Error saving media attachment.');
+$messages[4] = __('Media attachment moved to the trash.').' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
+$messages[5] = __('Media attachment restored from the trash.');
 
-if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
+if ( ! empty($_GET['message']) && isset($messages[$_GET['message']])) {
+	$message = $messages[$_GET['message']];
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 
-if ( !empty($message) ) { ?>
+if ( ! empty($message)) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 
@@ -291,4 +291,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +36 added lines, -23 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( !current_user_can('upload_files') ) {
 	wp_die( __( 'You do not have permission to upload files.' ) );
+}
 
 $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
@@ -108,8 +109,9 @@ 
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
+					$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -122,38 +124,47 @@ 
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post to the trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this post to the trash.' ) );
+				}
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( !wp_trash_post( $post_id ) ) {
+									wp_die( __( 'Error in moving to Trash.' ) );
+				}
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( !wp_untrash_post( $post_id ) ) {
+									wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this post.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'You are not allowed to delete this post.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( !wp_delete_attachment( $post_id_del ) ) {
+									wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;
@@ -212,8 +223,10 @@ 
 if ( current_user_can( 'upload_files' ) ) { ?>
 	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( ! empty( $_REQUEST['s'] ) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
+if ( ! empty( $_REQUEST['s'] ) ) {
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+}
+?>
 </h1>
 
 <?php

src/wp-admin/media-upload.php

Spacing +19 added lines, -19 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -9,14 +9,16 @@
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
+if ( ! isset( $_GET['inline'] ) ) {
 	define( 'IFRAME_REQUEST' , true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
+if (!current_user_can('upload_files')) {
 	wp_die(__('You do not have permission to upload files.'));
+}
 
 wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');

src/wp-admin/options.php

Spacing +86 added lines, -86 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $title = __('Settings');
 $this_file = 'options.php';
@@ -27,7 +27,7 @@ 
 $capability = 'manage_options';
 
 // This is for back compat and will eventually be removed.
-if ( empty($option_page) ) {
+if (empty($option_page)) {
 	$option_page = 'options';
 } else {
 
@@ -41,59 +41,59 @@ 
 	 *
 	 * @param string $capability The capability used for the page, which is manage_options by default.
 	 */
-	$capability = apply_filters( "option_page_capability_{$option_page}", $capability );
+	$capability = apply_filters("option_page_capability_{$option_page}", $capability);
 }
 
-if ( !current_user_can( $capability ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can($capability))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 // Handle admin email change requests
-if ( is_multisite() ) {
-	if ( ! empty($_GET[ 'adminhash' ] ) ) {
-		$new_admin_details = get_option( 'adminhash' );
+if (is_multisite()) {
+	if ( ! empty($_GET['adminhash'])) {
+		$new_admin_details = get_option('adminhash');
 		$redirect = 'options-general.php?updated=false';
-		if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
-			update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
-			delete_option( 'adminhash' );
-			delete_option( 'new_admin_email' );
+		if (is_array($new_admin_details) && $new_admin_details['hash'] == $_GET['adminhash'] && ! empty($new_admin_details['newemail'])) {
+			update_option('admin_email', $new_admin_details['newemail']);
+			delete_option('adminhash');
+			delete_option('new_admin_email');
 			$redirect = 'options-general.php?updated=true';
 		}
-		wp_redirect( admin_url( $redirect ) );
+		wp_redirect(admin_url($redirect));
 		exit;
-	} elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
-		delete_option( 'adminhash' );
-		delete_option( 'new_admin_email' );
-		wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+	} elseif ( ! empty($_GET['dismiss']) && 'new_admin_email' == $_GET['dismiss']) {
+		delete_option('adminhash');
+		delete_option('new_admin_email');
+		wp_redirect(admin_url('options-general.php?updated=true'));
 		exit;
 	}
 }
 
-if ( is_multisite() && !is_super_admin() && 'update' != $action )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if (is_multisite() && ! is_super_admin() && 'update' != $action)
+	wp_die(__('Cheatin’ uh?'), 403);
 
 $whitelist_options = array(
-	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
-	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-	'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+	'general' => array('blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG'),
+	'discussion' => array('default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration'),
+	'media' => array('thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type'),
+	'reading' => array('posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public'),
+	'writing' => array('default_category', 'default_email_category', 'default_link_category', 'default_post_format')
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8')))
 	$whitelist_options['reading'][] = 'blog_charset';
 
-if ( get_site_option( 'initial_db_version' ) < 32453 ) {
+if (get_site_option('initial_db_version') < 32453) {
 	$whitelist_options['writing'][] = 'use_smilies';
 	$whitelist_options['writing'][] = 'use_balanceTags';
 }
 
-if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
+if ( ! is_multisite()) {
+	if ( ! defined('WP_SITEURL'))
 		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
+	if ( ! defined('WP_HOME'))
 		$whitelist_options['general'][] = 'home';
 
 	$whitelist_options['general'][] = 'admin_email';
@@ -106,7 +106,7 @@ 
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
 	// If upload_url_path and upload_path are both default values, they're locked.
-	if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+	if (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path'))) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
 	}
@@ -120,7 +120,7 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+	if (apply_filters('enable_post_by_email_configuration', true))
 		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 
@@ -131,79 +131,79 @@ 
  *
  * @param array White list options.
  */
-$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
+$whitelist_options = apply_filters('whitelist_options', $whitelist_options);
 
 /*
  * If $_GET['action'] == 'update' we are saving settings sent from a settings page
  */
-if ( 'update' == $action ) {
-	if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+if ('update' == $action) {
+	if ('options' == $option_page && ! isset($_POST['option_page'])) { // This is for back compat and will eventually be removed.
 		$unregistered = true;
-		check_admin_referer( 'update-options' );
+		check_admin_referer('update-options');
 	} else {
 		$unregistered = false;
-		check_admin_referer( $option_page . '-options' );
+		check_admin_referer($option_page.'-options');
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( ! isset($whitelist_options[$option_page]))
+		wp_die(__('<strong>ERROR</strong>: options page not found.'));
 
-	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
-		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+	if ('options' == $option_page) {
+		if (is_multisite() && ! is_super_admin())
+			wp_die(__('You do not have sufficient permissions to modify unregistered settings for this site.'));
+		$options = explode(',', wp_unslash($_POST['page_options']));
 	} else {
-		$options = $whitelist_options[ $option_page ];
+		$options = $whitelist_options[$option_page];
 	}
 
-	if ( 'general' == $option_page ) {
+	if ('general' == $option_page) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+		if ( ! empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['date_format']))
 			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+		if ( ! empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['time_format']))
 			$_POST['time_format'] = $_POST['time_format_custom'];
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
-		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+		if ( ! empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string'])) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
 			$_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
 			$_POST['timezone_string'] = '';
 		}
 
 		// Handle translation install.
-		if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
-			require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+		if ( ! empty($_POST['WPLANG']) && ( ! is_multisite() || is_super_admin())) { // @todo: Skip if already installed
+			require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-			if ( wp_can_install_language_pack() ) {
-				$language = wp_download_language_pack( $_POST['WPLANG'] );
-				if ( $language ) {
+			if (wp_can_install_language_pack()) {
+				$language = wp_download_language_pack($_POST['WPLANG']);
+				if ($language) {
 					$_POST['WPLANG'] = $language;
 				}
 			}
 		}
 	}
 
-	if ( $options ) {
-		foreach ( $options as $option ) {
-			if ( $unregistered )
-				_deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+	if ($options) {
+		foreach ($options as $option) {
+			if ($unregistered)
+				_deprecated_argument('options.php', '2.7', sprintf(__('The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API'), $option, $option_page));
 
-			$option = trim( $option );
+			$option = trim($option);
 			$value = null;
-			if ( isset( $_POST[ $option ] ) ) {
-				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
-				$value = wp_unslash( $value );
+			if (isset($_POST[$option])) {
+				$value = $_POST[$option];
+				if ( ! is_array($value))
+					$value = trim($value);
+				$value = wp_unslash($value);
 			}
-			update_option( $option, $value );
+			update_option($option, $value);
 		}
 
 		// Switch translation in case WPLANG was changed.
-		$language = get_option( 'WPLANG' );
-		if ( $language ) {
-			load_default_textdomain( $language );
+		$language = get_option('WPLANG');
+		if ($language) {
+			load_default_textdomain($language);
 		} else {
-			unload_textdomain( 'default' );
+			unload_textdomain('default');
 		}
 	}
 
@@ -211,38 +211,38 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
+	if ( ! count(get_settings_errors()))
 		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
 	 * Redirect back to the settings page that was submitted
 	 */
-	$goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
-	wp_redirect( $goback );
+	$goback = add_query_arg('settings-updated', 'true', wp_get_referer());
+	wp_redirect($goback);
 	exit;
 }
 
-include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+include(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-  <h1><?php esc_html_e( 'All Settings' ); ?></h1>
+  <h1><?php esc_html_e('All Settings'); ?></h1>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type="hidden" name="option_page" value="options" />
   <table class="form-table">
 <?php
-$options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
+$options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
 
-foreach ( (array) $options as $option ) :
+foreach ((array) $options as $option) :
 	$disabled = false;
-	if ( $option->option_name == '' )
+	if ($option->option_name == '')
 		continue;
-	if ( is_serialized( $option->option_value ) ) {
-		if ( is_serialized_string( $option->option_value ) ) {
+	if (is_serialized($option->option_value)) {
+		if (is_serialized_string($option->option_value)) {
 			// This is a serialized string, so we should display it.
-			$value = maybe_unserialize( $option->option_value );
+			$value = maybe_unserialize($option->option_value);
 			$options_to_update[] = $option->option_name;
 			$class = 'all-options';
 		} else {
@@ -255,28 +255,28 @@ 
 		$options_to_update[] = $option->option_name;
 		$class = 'all-options';
 	}
-	$name = esc_attr( $option->option_name );
+	$name = esc_attr($option->option_name);
 	?>
 <tr>
-	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
+	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html($option->option_name); ?></label></th>
 <td>
-<?php if ( strpos( $value, "\n" ) !== false ) : ?>
+<?php if (strpos($value, "\n") !== false) : ?>
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
-		echo esc_textarea( $value );
+		echo esc_textarea($value);
 	?></textarea>
 	<?php else: ?>
-		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
+		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr($value) ?>"<?php disabled($disabled, true) ?> />
 	<?php endif ?></td>
 </tr>
 <?php endforeach; ?>
   </table>
 
-<input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
+<input type="hidden" name="page_options" value="<?php echo esc_attr(implode(',', $options_to_update)); ?>" />
 
-<?php submit_button( __( 'Save Changes' ), 'primary', 'Update' ); ?>
+<?php submit_button(__('Save Changes'), 'primary', 'Update'); ?>
 
   </form>
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +45 added lines, -28 removed lines

@@ -44,8 +44,9 @@ 
 	$capability = apply_filters( "option_page_capability_{$option_page}", $capability );
 }
 
-if ( !current_user_can( $capability ) )
+if ( !current_user_can( $capability ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 // Handle admin email change requests
 if ( is_multisite() ) {
@@ -68,8 +69,9 @@ 
 	}
 }
 
-if ( is_multisite() && !is_super_admin() && 'update' != $action )
+if ( is_multisite() && !is_super_admin() && 'update' != $action ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 $whitelist_options = array(
 	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
@@ -82,8 +84,9 @@ 
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	$whitelist_options['reading'][] = 'blog_charset';
+}
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
 	$whitelist_options['writing'][] = 'use_smilies';
@@ -91,10 +94,12 @@ 
 }
 
 if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
-		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
-		$whitelist_options['general'][] = 'home';
+	if ( !defined( 'WP_SITEURL' ) ) {
+			$whitelist_options['general'][] = 'siteurl';
+	}
+	if ( !defined( 'WP_HOME' ) ) {
+			$whitelist_options['general'][] = 'home';
+	}
 
 	$whitelist_options['general'][] = 'admin_email';
 	$whitelist_options['general'][] = 'users_can_register';
@@ -120,9 +125,10 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-}
+	if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+			$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	}
+	}
 
 /**
  * Filter the options white list.
@@ -145,12 +151,14 @@ 
 		check_admin_referer( $option_page . '-options' );
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( !isset( $whitelist_options[ $option_page ] ) ) {
+			wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	}
 
 	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+		if ( is_multisite() && ! is_super_admin() ) {
+					wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+		}
 		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
 	} else {
 		$options = $whitelist_options[ $option_page ];
@@ -158,10 +166,12 @@ 
 
 	if ( 'general' == $option_page ) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
-			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
-			$_POST['time_format'] = $_POST['time_format_custom'];
+		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
+					$_POST['date_format'] = $_POST['date_format_custom'];
+		}
+		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
+					$_POST['time_format'] = $_POST['time_format_custom'];
+		}
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
 		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
@@ -184,15 +194,17 @@ 
 
 	if ( $options ) {
 		foreach ( $options as $option ) {
-			if ( $unregistered )
-				_deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+			if ( $unregistered ) {
+							_deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+			}
 
 			$option = trim( $option );
 			$value = null;
 			if ( isset( $_POST[ $option ] ) ) {
 				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
+				if ( ! is_array( $value ) ) {
+									$value = trim( $value );
+				}
 				$value = wp_unslash( $value );
 			}
 			update_option( $option, $value );
@@ -211,8 +223,9 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
-		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	if ( !count( get_settings_errors() ) ) {
+			add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	}
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
@@ -237,8 +250,9 @@ 
 
 foreach ( (array) $options as $option ) :
 	$disabled = false;
-	if ( $option->option_name == '' )
-		continue;
+	if ( $option->option_name == '' ) {
+			continue;
+	}
 	if ( is_serialized( $option->option_value ) ) {
 		if ( is_serialized_string( $option->option_value ) ) {
 			// This is a serialized string, so we should display it.
@@ -264,11 +278,14 @@ 
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
 		echo esc_textarea( $value );
 	?></textarea>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
 	<?php endif ?></td>
 </tr>
-<?php endforeach; ?>
+<?php endforeach;
+}
+?>
   </table>
 
 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />

src/wp-admin/import.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Import WordPress Administration Screen
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Import WordPress Administration Screen
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 define('WP_LOAD_IMPORTERS', true);
 

Spacing +44 added lines, -44 removed lines

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

Braces +13 added lines, -8 removed lines

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