ntwb / wordpress

src/wp-admin/user/admin.php

Spacing +8 added lines, -8 removed lines

@@ -9,14 +9,14 @@ 
 
 define('WP_USER_ADMIN', true);
 
-require_once( dirname(dirname(__FILE__)) . '/admin.php');
+require_once(dirname(dirname(__FILE__)).'/admin.php');
 
-if ( ! is_multisite() ) {
-	wp_redirect( admin_url() );
+if ( ! is_multisite()) {
+	wp_redirect(admin_url());
 	exit;
 }
 
-$redirect_user_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
+$redirect_user_admin_request = (($current_blog->domain != $current_site->domain) || ($current_blog->path != $current_site->path));
 /**
  * Filter whether to redirect the request to the User Admin in Multisite.
  *
@@ -24,9 +24,9 @@ 
  *
  * @param bool $redirect_user_admin_request Whether the request should be redirected.
  */
-$redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
-if ( $redirect_user_admin_request ) {
-	wp_redirect( user_admin_url() );
+$redirect_user_admin_request = apply_filters('redirect_user_admin_request', $redirect_user_admin_request);
+if ($redirect_user_admin_request) {
+	wp_redirect(user_admin_url());
 	exit;
 }
-unset( $redirect_user_admin_request );
+unset($redirect_user_admin_request);

src/wp-admin/user/profile.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * User Profile Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * User Profile Administration Screen.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/user/freedoms.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/user/about.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/customize.php

Spacing +89 added lines, -89 removed lines

@@ -7,27 +7,27 @@ 
  * @since 3.4.0
  */
 
-define( 'IFRAME_REQUEST', true );
+define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'customize' ) ) {
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('customize')) {
+	wp_die(__('Cheatin’ uh?'), 403);
 }
 
-wp_reset_vars( array( 'url', 'return' ) );
-$url = wp_unslash( $url );
-$url = wp_validate_redirect( $url, home_url( '/' ) );
-if ( $return ) {
-	$return = wp_unslash( $return );
-	$return = wp_validate_redirect( $return );
+wp_reset_vars(array('url', 'return'));
+$url = wp_unslash($url);
+$url = wp_validate_redirect($url, home_url('/'));
+if ($return) {
+	$return = wp_unslash($return);
+	$return = wp_validate_redirect($return);
 }
-if ( ! $return ) {
-	if ( $url ) {
+if ( ! $return) {
+	if ($url) {
 		$return = $url;
-	} elseif ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) {
-		$return = admin_url( 'themes.php' );
+	} elseif (current_user_can('edit_theme_options') || current_user_can('switch_themes')) {
+		$return = admin_url('themes.php');
 	} else {
 		$return = admin_url();
 	}
@@ -43,64 +43,64 @@ 
 $wp_scripts = new WP_Scripts;
 $wp_scripts->registered = $registered;
 
-add_action( 'customize_controls_print_scripts',        'print_head_scripts', 20 );
-add_action( 'customize_controls_print_footer_scripts', '_wp_footer_scripts'     );
-add_action( 'customize_controls_print_styles',         'print_admin_styles', 20 );
+add_action('customize_controls_print_scripts', 'print_head_scripts', 20);
+add_action('customize_controls_print_footer_scripts', '_wp_footer_scripts');
+add_action('customize_controls_print_styles', 'print_admin_styles', 20);
 
 /**
  * Fires when Customizer controls are initialized, before scripts are enqueued.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_init' );
+do_action('customize_controls_init');
 
-wp_enqueue_script( 'customize-controls' );
-wp_enqueue_style( 'customize-controls' );
+wp_enqueue_script('customize-controls');
+wp_enqueue_style('customize-controls');
 
 /**
  * Enqueue Customizer control scripts.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_enqueue_scripts' );
+do_action('customize_controls_enqueue_scripts');
 
 // Let's roll.
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 wp_user_settings();
 _wp_admin_html_begin();
 
 $body_class = 'wp-core-ui wp-customizer js';
 
-if ( wp_is_mobile() ) :
+if (wp_is_mobile()) :
 	$body_class .= ' mobile';
 
 	?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
 endif;
 
-$is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
+$is_ios = wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']);
 
-if ( $is_ios ) {
+if ($is_ios) {
 	$body_class .= ' ios';
 }
 
-if ( is_rtl() ) {
+if (is_rtl()) {
 	$body_class .= ' rtl';
 }
-$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
-if ( $wp_customize->is_theme_active() ) {
-	$document_title_tmpl = _x( 'Customize: %s', 'Placeholder is the document title from the preview' );
+if ($wp_customize->is_theme_active()) {
+	$document_title_tmpl = _x('Customize: %s', 'Placeholder is the document title from the preview');
 } else {
-	$document_title_tmpl = _x( 'Live Preview: %s', 'Placeholder is the document title from the preview' );
+	$document_title_tmpl = _x('Live Preview: %s', 'Placeholder is the document title from the preview');
 }
-$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // because exported to JS and assigned to document.title
-$admin_title = sprintf( $document_title_tmpl, __( 'Loading&hellip;' ) );
+$document_title_tmpl = html_entity_decode($document_title_tmpl, ENT_QUOTES, 'UTF-8'); // because exported to JS and assigned to document.title
+$admin_title = sprintf($document_title_tmpl, __('Loading&hellip;'));
 
 ?><title><?php echo $admin_title; ?></title>
 
 <script type="text/javascript">
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>';
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>';
 </script>
 
 <?php
@@ -109,45 +109,45 @@ 
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_print_styles' );
+do_action('customize_controls_print_styles');
 
 /**
  * Fires when Customizer control scripts are printed.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_print_scripts' );
+do_action('customize_controls_print_scripts');
 ?>
 </head>
-<body class="<?php echo esc_attr( $body_class ); ?>">
+<body class="<?php echo esc_attr($body_class); ?>">
 <div class="wp-full-overlay expanded">
 	<form id="customize-controls" class="wrap wp-full-overlay-sidebar">
 		<div id="customize-header-actions" class="wp-full-overlay-header">
 			<?php
-			$save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-			submit_button( $save_text, 'primary save', 'save', false );
+			$save_text = $wp_customize->is_theme_active() ? __('Save &amp; Publish') : __('Save &amp; Activate');
+			submit_button($save_text, 'primary save', 'save', false);
 			?>
 			<span class="spinner"></span>
 			<a class="customize-controls-preview-toggle" href="#">
-				<span class="controls"><?php _e( 'Customize' ); ?></span>
-				<span class="preview"><?php _e( 'Preview' ); ?></span>
+				<span class="controls"><?php _e('Customize'); ?></span>
+				<span class="preview"><?php _e('Preview'); ?></span>
 			</a>
-			<a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
-				<span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
+			<a class="customize-controls-close" href="<?php echo esc_url($return); ?>">
+				<span class="screen-reader-text"><?php _e('Cancel'); ?></span>
 			</a>
 		</div>
 
 		<div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
 		<div class="wp-full-overlay-sidebar-content" tabindex="-1">
 			<div id="customize-info" class="accordion-section customize-info">
-				<div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Customizer Options' ); ?>">
+				<div class="accordion-section-title" aria-label="<?php esc_attr_e('Customizer Options'); ?>">
 					<span class="preview-notice"><?php
-						echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name' ) . '</strong>' );
+						echo sprintf(__('You are customizing %s'), '<strong class="panel-title site-title">'.get_bloginfo('name').'</strong>');
 					?></span>
-					<button class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+					<button class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e('Help'); ?></span></button>
 				</div>
 				<div class="customize-panel-description"><?php
-					_e( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );
+					_e('The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.');
 				?></div>
 			</div>
 
@@ -158,9 +158,9 @@ 
 		</div>
 
 		<div id="customize-footer-actions" class="wp-full-overlay-footer">
-			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 				<span class="collapse-sidebar-arrow"></span>
-				<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 			</button>
 		</div>
 	</form>
@@ -177,7 +177,7 @@ 
 	 *
 	 * @since 3.4.0
 	 */
-	do_action( 'customize_controls_print_footer_scripts' );
+	do_action('customize_controls_print_footer_scripts');
 
 	/*
 	 * If the frontend and the admin are served from the same domain, load the
@@ -188,13 +188,13 @@ 
 	 * using the customize_allowed_urls filter.
 	 */
 
-	$allowed_urls = array( home_url('/') );
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$allowed_urls = array(home_url('/'));
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
-	if ( is_ssl() && ! $cross_domain )
-		$allowed_urls[] = home_url( '/', 'https' );
+	if (is_ssl() && ! $cross_domain)
+		$allowed_urls[] = home_url('/', 'https');
 
 	/**
 	 * Filter the list of URLs allowed to be clicked and followed in the Customizer preview.
@@ -203,12 +203,12 @@ 
 	 *
 	 * @param array $allowed_urls An array of allowed URLs.
 	 */
-	$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+	$allowed_urls = array_unique(apply_filters('customize_allowed_urls', $allowed_urls));
 
-	$login_url = add_query_arg( array(
+	$login_url = add_query_arg(array(
 		'interim-login' => 1,
 		'customize-login' => 1
-	), wp_login_url() );
+	), wp_login_url());
 
 	// Prepare Customizer settings to pass to JavaScript.
 	$settings = array(
@@ -217,14 +217,14 @@ 
 			'active'     => $wp_customize->is_theme_active(),
 		),
 		'url'      => array(
-			'preview'       => esc_url_raw( $url ? $url : home_url( '/' ) ),
-			'parent'        => esc_url_raw( admin_url() ),
-			'activated'     => esc_url_raw( home_url( '/' ) ),
-			'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
-			'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
+			'preview'       => esc_url_raw($url ? $url : home_url('/')),
+			'parent'        => esc_url_raw(admin_url()),
+			'activated'     => esc_url_raw(home_url('/')),
+			'ajax'          => esc_url_raw(admin_url('admin-ajax.php', 'relative')),
+			'allowed'       => array_map('esc_url_raw', $allowed_urls),
 			'isCrossDomain' => $cross_domain,
-			'home'          => esc_url_raw( home_url( '/' ) ),
-			'login'         => esc_url_raw( $login_url ),
+			'home'          => esc_url_raw(home_url('/')),
+			'login'         => esc_url_raw($login_url),
 		),
 		'browser'  => array(
 			'mobile' => wp_is_mobile(),
@@ -235,17 +235,17 @@ 
 		'panels'   => array(),
 		'sections' => array(),
 		'nonce'    => array(
-			'save'    => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
+			'save'    => wp_create_nonce('save-customize_'.$wp_customize->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$wp_customize->get_stylesheet())
 		),
 		'autofocus' => array(),
 		'documentTitleTmpl' => $document_title_tmpl,
 	);
 
 	// Prepare Customize Setting objects to pass to JavaScript.
-	foreach ( $wp_customize->settings() as $id => $setting ) {
-		if ( $setting->check_capabilities() ) {
-			$settings['settings'][ $id ] = array(
+	foreach ($wp_customize->settings() as $id => $setting) {
+		if ($setting->check_capabilities()) {
+			$settings['settings'][$id] = array(
 				'value'     => $setting->js_value(),
 				'transport' => $setting->transport,
 				'dirty'     => $setting->dirty,
@@ -254,38 +254,38 @@ 
 	}
 
 	// Prepare Customize Control objects to pass to JavaScript.
-	foreach ( $wp_customize->controls() as $id => $control ) {
-		if ( $control->check_capabilities() ) {
-			$settings['controls'][ $id ] = $control->json();
+	foreach ($wp_customize->controls() as $id => $control) {
+		if ($control->check_capabilities()) {
+			$settings['controls'][$id] = $control->json();
 		}
 	}
 
 	// Prepare Customize Section objects to pass to JavaScript.
-	foreach ( $wp_customize->sections() as $id => $section ) {
-		if ( $section->check_capabilities() ) {
-			$settings['sections'][ $id ] = $section->json();
+	foreach ($wp_customize->sections() as $id => $section) {
+		if ($section->check_capabilities()) {
+			$settings['sections'][$id] = $section->json();
 		}
 	}
 
 	// Prepare Customize Panel objects to pass to JavaScript.
-	foreach ( $wp_customize->panels() as $panel_id => $panel ) {
-		if ( $panel->check_capabilities() ) {
-			$settings['panels'][ $panel_id ] = $panel->json();
-			foreach ( $panel->sections as $section_id => $section ) {
-				if ( $section->check_capabilities() ) {
-					$settings['sections'][ $section_id ] = $section->json();
+	foreach ($wp_customize->panels() as $panel_id => $panel) {
+		if ($panel->check_capabilities()) {
+			$settings['panels'][$panel_id] = $panel->json();
+			foreach ($panel->sections as $section_id => $section) {
+				if ($section->check_capabilities()) {
+					$settings['sections'][$section_id] = $section->json();
 				}
 			}
 		}
 	}
 
 	// Pass to frontend the Customizer construct being deeplinked
-	if ( isset( $_GET['autofocus'] ) ) {
-		$autofocus = wp_unslash( $_GET['autofocus'] );
-		if ( is_array( $autofocus ) ) {
-			foreach ( $autofocus as $type => $id ) {
-				if ( isset( $settings[ $type . 's' ][ $id ] ) ) {
-					$settings['autofocus'][ $type ] = $id;
+	if (isset($_GET['autofocus'])) {
+		$autofocus = wp_unslash($_GET['autofocus']);
+		if (is_array($autofocus)) {
+			foreach ($autofocus as $type => $id) {
+				if (isset($settings[$type.'s'][$id])) {
+					$settings['autofocus'][$type] = $id;
 				}
 			}
 		}
@@ -293,7 +293,7 @@ 
 
 	?>
 	<script type="text/javascript">
-		var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+		var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 	</script>
 </div>
 </body>

Braces +3 added lines, -2 removed lines

@@ -193,8 +193,9 @@
 	$home_origin  = parse_url( home_url() );
 	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
 
-	if ( is_ssl() && ! $cross_domain )
-		$allowed_urls[] = home_url( '/', 'https' );
+	if ( is_ssl() && ! $cross_domain ) {
+			$allowed_urls[] = home_url( '/', 'https' );
+	}
 
 	/**
 	 * Filter the list of URLs allowed to be clicked and followed in the Customizer preview.

src/wp-admin/theme-install.php

Indentation +5 added lines, -5 removed lines

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

Spacing +85 added lines, -85 removed lines

@@ -7,59 +7,59 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require( ABSPATH . 'wp-admin/includes/theme-install.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require(ABSPATH.'wp-admin/includes/theme-install.php');
 
-wp_reset_vars( array( 'tab' ) );
+wp_reset_vars(array('tab'));
 
-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.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'theme-install.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('theme-install.php'));
 	exit();
 }
 
-$title = __( 'Add Themes' );
+$title = __('Add Themes');
 $parent_file = 'themes.php';
 
-if ( ! is_network_admin() ) {
+if ( ! is_network_admin()) {
 	$submenu_file = 'themes.php';
 }
 
 $installed_themes = search_theme_directories();
-foreach ( $installed_themes as $k => $v ) {
-	if ( false !== strpos( $k, '/' ) ) {
-		unset( $installed_themes[ $k ] );
+foreach ($installed_themes as $k => $v) {
+	if (false !== strpos($k, '/')) {
+		unset($installed_themes[$k]);
 	}
 }
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
+wp_localize_script('theme', '_wpThemeSettings', array(
 	'themes'   => false,
 	'settings' => array(
 		'isInstall'     => true,
-		'canInstall'    => current_user_can( 'install_themes' ),
-		'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-		'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
+		'canInstall'    => current_user_can('install_themes'),
+		'installURI'    => current_user_can('install_themes') ? self_admin_url('theme-install.php') : null,
+		'adminUrl'      => parse_url(self_admin_url(), PHP_URL_PATH)
 	),
 	'l10n' => array(
-		'addNew' => __( 'Add New Theme' ),
-		'search' => __( 'Search Themes' ),
-		'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
-		'upload' => __( 'Upload Theme' ),
-		'back'   => __( 'Back' ),
-		'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
-		'themesFound'   => __( 'Number of Themes found: %d' ),
-		'noThemesFound' => __( 'No themes found. Try a different search.' ),
-		'collapseSidebar'    => __( 'Collapse Sidebar' ),
-		'expandSidebar'      => __( 'Expand Sidebar' ),
+		'addNew' => __('Add New Theme'),
+		'search' => __('Search Themes'),
+		'searchPlaceholder' => __('Search themes...'), // placeholder (no ellipsis)
+		'upload' => __('Upload Theme'),
+		'back'   => __('Back'),
+		'error'  => __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'),
+		'themesFound'   => __('Number of Themes found: %d'),
+		'noThemesFound' => __('No themes found. Try a different search.'),
+		'collapseSidebar'    => __('Collapse Sidebar'),
+		'expandSidebar'      => __('Expand Sidebar'),
 	),
-	'installedThemes' => array_keys( $installed_themes ),
-) );
+	'installedThemes' => array_keys($installed_themes),
+));
 
-wp_enqueue_script( 'theme' );
+wp_enqueue_script('theme');
 
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires before each of the tabs are rendered on the Install Themes page.
 	 *
@@ -69,43 +69,43 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( "install_themes_pre_{$tab}" );
+	do_action("install_themes_pre_{$tab}");
 }
 
 $help_overview =
-	'<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '</p>' .
-	'<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
-	'<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
+	'<p>'.sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/').'</p>'.
+	'<p>'.__('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.').' <span id="live-search-desc">'.__('The search results will be updated as you type.').'</span></p>'.
+	'<p>'.__('Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.').'</p>'.
+	'<p>'.__('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help_overview
-) );
+));
 
 $help_installing =
-	'<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
-	'<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
+	'<p>'.__('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.').'</p>'.
+	'<p>'.__('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'installing',
 	'title'   => __('Previewing and Installing'),
 	'content' => $help_installing
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</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/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
 	<h1><?php
-	echo esc_html( $title );
+	echo esc_html($title);
 
 	/**
 	 * Filter the tabs shown on the Add Themes screen.
@@ -117,10 +117,10 @@ 
 	 *
 	 * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
 	 */
-	$tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
-		echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>';
-		echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>';
+	$tabs = apply_filters('install_themes_tabs', array('upload' => __('Upload Theme')));
+	if ( ! empty($tabs['upload']) && current_user_can('upload_themes')) {
+		echo ' <a href="#" class="upload page-title-action">'.__('Upload Theme').'</a>';
+		echo ' <a href="#" class="browse-themes page-title-action">'._x('Browse', 'themes').'</a>';
 	}
 	?></h1>
 
@@ -134,52 +134,52 @@ 
 		</div>
 
 		<ul class="filter-links">
-			<li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
+			<li><a href="#" data-sort="featured"><?php _ex('Featured', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="popular"><?php _ex('Popular', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="new"><?php _ex('Latest', 'themes'); ?></a></li>
 		</ul>
 
-		<a class="drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
+		<a class="drawer-toggle" href="#"><?php _e('Feature Filter'); ?></a>
 
 		<div class="search-form"></div>
 
 		<div class="filter-drawer">
 			<div class="buttons">
-				<a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>
-				<a class="clear-filters button button-secondary" href="#"><?php _e( 'Clear' ); ?></a>
+				<a class="apply-filters button button-secondary" href="#"><?php _e('Apply Filters'); ?><span></span></a>
+				<a class="clear-filters button button-secondary" href="#"><?php _e('Clear'); ?></a>
 			</div>
 		<?php
 		$feature_list = get_theme_feature_list();
-		foreach ( $feature_list as $feature_name => $features ) {
+		foreach ($feature_list as $feature_name => $features) {
 			echo '<div class="filter-group">';
-			$feature_name = esc_html( $feature_name );
-			echo '<h4>' . $feature_name . '</h4>';
+			$feature_name = esc_html($feature_name);
+			echo '<h4>'.$feature_name.'</h4>';
 			echo '<ol class="feature-group">';
-			foreach ( $features as $feature => $feature_name ) {
-				$feature = esc_attr( $feature );
-				echo '<li><input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label></li>';
+			foreach ($features as $feature => $feature_name) {
+				$feature = esc_attr($feature);
+				echo '<li><input type="checkbox" id="filter-id-'.$feature.'" value="'.$feature.'" /> ';
+				echo '<label for="filter-id-'.$feature.'">'.$feature_name.'</label></li>';
 			}
 			echo '</ol>';
 			echo '</div>';
 		}
 		?>
 			<div class="filtered-by">
-				<span><?php _e( 'Filtering by:' ); ?></span>
+				<span><?php _e('Filtering by:'); ?></span>
 				<div class="tags"></div>
-				<a href="#"><?php _e( 'Edit' ); ?></a>
+				<a href="#"><?php _e('Edit'); ?></a>
 			</div>
 		</div>
 	</div>
 	<div class="theme-browser content-filterable"></div>
 	<div class="theme-install-overlay wp-full-overlay expanded"></div>
 
-	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+	<p class="no-themes"><?php _e('No themes found. Try a different search.'); ?></p>
 	<span class="spinner"></span>
 
 	<br class="clear" />
 <?php
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires at the top of each of the tabs on the Install Themes page.
 	 *
@@ -191,7 +191,7 @@ 
 	 *
 	 * @param int $paged Number of the current page of results being viewed.
 	 */
-	do_action( "install_themes_{$tab}", $paged );
+	do_action("install_themes_{$tab}", $paged);
 }
 ?>
 </div>
@@ -204,36 +204,36 @@ 
 	<# } else { #>
 		<div class="theme-screenshot blank"></div>
 	<# } #>
-	<span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
-	<div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></div>
+	<span class="more-details"><?php _ex('Details &amp; Preview', 'theme'); ?></span>
+	<div class="theme-author"><?php printf(__('By %s'), '{{ data.author }}'); ?></div>
 	<h3 class="theme-name">{{ data.name }}</h3>
 
 	<div class="theme-actions">
-		<a class="button button-primary" href="{{ data.install_url }}"><?php esc_html_e( 'Install' ); ?></a>
-		<a class="button button-secondary preview install-theme-preview" href="#"><?php esc_html_e( 'Preview' ); ?></a>
+		<a class="button button-primary" href="{{ data.install_url }}"><?php esc_html_e('Install'); ?></a>
+		<a class="button button-secondary preview install-theme-preview" href="#"><?php esc_html_e('Preview'); ?></a>
 	</div>
 
 	<# if ( data.installed ) { #>
-		<div class="theme-installed"><?php _ex( 'Already Installed', 'theme' ); ?></div>
+		<div class="theme-installed"><?php _ex('Already Installed', 'theme'); ?></div>
 	<# } #>
 </script>
 
 <script id="tmpl-theme-preview" type="text/template">
 	<div class="wp-full-overlay-sidebar">
 		<div class="wp-full-overlay-header">
-			<a href="#" class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></a>
-			<a href="#" class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></a>
-			<a href="#" class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></a>
+			<a href="#" class="close-full-overlay"><span class="screen-reader-text"><?php _e('Close'); ?></span></a>
+			<a href="#" class="previous-theme"><span class="screen-reader-text"><?php _ex('Previous', 'Button label for a theme'); ?></span></a>
+			<a href="#" class="next-theme"><span class="screen-reader-text"><?php _ex('Next', 'Button label for a theme'); ?></span></a>
 		<# if ( data.installed ) { #>
-			<a href="#" class="button button-primary theme-install disabled"><?php _ex( 'Installed', 'theme' ); ?></a>
+			<a href="#" class="button button-primary theme-install disabled"><?php _ex('Installed', 'theme'); ?></a>
 		<# } else { #>
-			<a href="{{ data.install_url }}" class="button button-primary theme-install"><?php _e( 'Install' ); ?></a>
+			<a href="{{ data.install_url }}" class="button button-primary theme-install"><?php _e('Install'); ?></a>
 		<# } #>
 		</div>
 		<div class="wp-full-overlay-sidebar-content">
 			<div class="install-theme-info">
 				<h3 class="theme-name">{{ data.name }}</h3>
-				<span class="theme-by"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></span>
+				<span class="theme-by"><?php printf(__('By %s'), '{{ data.author }}'); ?></span>
 
 				<img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
 
@@ -245,25 +245,25 @@ 
 						</div>
 					<# } else { #>
 						<div class="star-rating">
-							<small class="ratings"><?php _e( 'This theme has not been rated yet.' ); ?></small>
+							<small class="ratings"><?php _e('This theme has not been rated yet.'); ?></small>
 						</div>
 					<# } #>
-					<div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
+					<div class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></div>
 					<div class="theme-description">{{{ data.description }}}</div>
 				</div>
 			</div>
 		</div>
 		<div class="wp-full-overlay-footer">
-			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 				<span class="collapse-sidebar-arrow"></span>
-				<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 			</button>
 		</div>
 	</div>
 	<div class="wp-full-overlay-main">
-		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>" />
+		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e('Preview'); ?>" />
 	</div>
 </script>
 
 <?php
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +2 added lines, -1 removed lines

@@ -12,8 +12,9 @@
 
 wp_reset_vars( array( 'tab' ) );
 
-if ( ! current_user_can('install_themes') )
+if ( ! current_user_can('install_themes') ) {
 	wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-install.php' ) );

src/wp-admin/includes/class-wp-plugins-list-table.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Plugins List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Plugins List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_Plugins_List_Table extends WP_List_Table {
 
 	/**

Spacing +189 added lines, -189 removed lines

@@ -22,20 +22,20 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'plugins',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
+		if (isset($_REQUEST['plugin_status']) && in_array($_REQUEST['plugin_status'], array('active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search')))
 			$status = $_REQUEST['plugin_status'];
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if (isset($_REQUEST['s']))
+			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']));
 
 		$page = $this->get_pagenum();
 	}
@@ -44,7 +44,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	public function prepare_items() {
 		global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('orderby', 'order', 's'));
 
 		/**
 		 * Filter the full array of plugins to list in the Plugins list table.
@@ -79,7 +79,7 @@ 
 		 * @param array $plugins An array of plugins to display in the list table.
 		 */
 		$plugins = array(
-			'all' => apply_filters( 'all_plugins', get_plugins() ),
+			'all' => apply_filters('all_plugins', get_plugins()),
 			'search' => array(),
 			'active' => array(),
 			'inactive' => array(),
@@ -91,7 +91,7 @@ 
 
 		$screen = $this->screen;
 
-		if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
+		if ( ! is_multisite() || ($screen->in_admin('network') && current_user_can('manage_network_plugins'))) {
 
 			/**
 			 * Filter whether to display the advanced plugins list table.
@@ -108,118 +108,118 @@ 
 			 *                     plugin type. Default true.
 			 * @param string $type The plugin type. Accepts 'mustuse', 'dropins'.
 			 */
-			if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) ) {
+			if (apply_filters('show_advanced_plugins', true, 'mustuse')) {
 				$plugins['mustuse'] = get_mu_plugins();
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+			if (apply_filters('show_advanced_plugins', true, 'dropins'))
 				$plugins['dropins'] = get_dropins();
 
-			if ( current_user_can( 'update_plugins' ) ) {
-				$current = get_site_transient( 'update_plugins' );
-				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-					if ( isset( $current->response[ $plugin_file ] ) ) {
-						$plugins['all'][ $plugin_file ]['update'] = true;
-						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+			if (current_user_can('update_plugins')) {
+				$current = get_site_transient('update_plugins');
+				foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
+					if (isset($current->response[$plugin_file])) {
+						$plugins['all'][$plugin_file]['update'] = true;
+						$plugins['upgrade'][$plugin_file] = $plugins['all'][$plugin_file];
 					}
 				}
 			}
 		}
 
-		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
+		set_transient('plugin_slugs', array_keys($plugins['all']), DAY_IN_SECONDS);
 
-		if ( ! $screen->in_admin( 'network' ) ) {
-			$recently_activated = get_option( 'recently_activated', array() );
+		if ( ! $screen->in_admin('network')) {
+			$recently_activated = get_option('recently_activated', array());
 
-			foreach ( $recently_activated as $key => $time )
-				if ( $time + WEEK_IN_SECONDS < time() )
-					unset( $recently_activated[$key] );
-			update_option( 'recently_activated', $recently_activated );
+			foreach ($recently_activated as $key => $time)
+				if ($time + WEEK_IN_SECONDS < time())
+					unset($recently_activated[$key]);
+			update_option('recently_activated', $recently_activated);
 		}
 
-		$plugin_info = get_site_transient( 'update_plugins' );
+		$plugin_info = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+		foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
 			// Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
-			if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+			if (isset($plugin_info->response[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				}
 
-			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+			} elseif (isset($plugin_info->no_update[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				}
 			}
 
 			// Filter into individual sections
-			if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
+			if (is_multisite() && ! $screen->in_admin('network') && is_network_only_plugin($plugin_file) && ! is_plugin_active($plugin_file)) {
 				// On the non-network screen, filter out network-only plugins as long as they're not individually activated
-				unset( $plugins['all'][ $plugin_file ] );
-			} elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
+				unset($plugins['all'][$plugin_file]);
+			} elseif ( ! $screen->in_admin('network') && is_plugin_active_for_network($plugin_file)) {
 				// On the non-network screen, filter out network activated plugins
-				unset( $plugins['all'][ $plugin_file ] );
-			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
-				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
+				unset($plugins['all'][$plugin_file]);
+			} elseif (( ! $screen->in_admin('network') && is_plugin_active($plugin_file))
+				|| ($screen->in_admin('network') && is_plugin_active_for_network($plugin_file))) {
 				// On the non-network screen, populate the active list with plugins that are individually activated
 				// On the network-admin screen, populate the active list with plugins that are network activated
-				$plugins['active'][ $plugin_file ] = $plugin_data;
+				$plugins['active'][$plugin_file] = $plugin_data;
 			} else {
-				if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) {
+				if ( ! $screen->in_admin('network') && isset($recently_activated[$plugin_file])) {
 					// On the non-network screen, populate the recently activated list with plugins that have been recently activated
-					$plugins['recently_activated'][ $plugin_file ] = $plugin_data;
+					$plugins['recently_activated'][$plugin_file] = $plugin_data;
 				}
 				// Populate the inactive list with plugins that aren't activated
-				$plugins['inactive'][ $plugin_file ] = $plugin_data;
+				$plugins['inactive'][$plugin_file] = $plugin_data;
 			}
 		}
 
-		if ( $s ) {
+		if ($s) {
 			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
+			$plugins['search'] = array_filter($plugins['all'], array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($plugins as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($plugins[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
 		$this->items = array();
-		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
+		foreach ($plugins[$status] as $plugin_file => $plugin_data) {
 			// Translate, Don't Apply Markup, Sanitize HTML
-			$this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			$this->items[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true);
 		}
 
-		$total_this_page = $totals[ $status ];
+		$total_this_page = $totals[$status];
 
-		if ( ! $orderby ) {
+		if ( ! $orderby) {
 			$orderby = 'Name';
 		} else {
-			$orderby = ucfirst( $orderby );
+			$orderby = ucfirst($orderby);
 		}
 
-		$order = strtoupper( $order );
+		$order = strtoupper($order);
 
-		uasort( $this->items, array( $this, '_order_callback' ) );
+		uasort($this->items, array($this, '_order_callback'));
 
-		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
+		$plugins_per_page = $this->get_items_per_page(str_replace('-', '_', $screen->id.'_per_page'), 999);
 
-		$start = ( $page - 1 ) * $plugins_per_page;
+		$start = ($page - 1) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ($total_this_page > $plugins_per_page)
+			$this->items = array_slice($this->items, $start, $plugins_per_page);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $plugins_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -227,13 +227,13 @@ 
 	 * @param array $plugin
 	 * @return bool
 	 */
-	public function _search_callback( $plugin ) {
+	public function _search_callback($plugin) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if (is_null($term))
+			$term = wp_unslash($_REQUEST['s']);
 
-		foreach ( $plugin as $value ) {
-			if ( false !== stripos( strip_tags( $value ), $term ) ) {
+		foreach ($plugin as $value) {
+			if (false !== stripos(strip_tags($value), $term)) {
 				return true;
 			}
 		}
@@ -248,19 +248,19 @@ 
 	 * @param array $plugin_b
 	 * @return int
 	 */
-	public function _order_callback( $plugin_a, $plugin_b ) {
+	public function _order_callback($plugin_a, $plugin_b) {
 		global $orderby, $order;
 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' == $order ) {
-			return strcasecmp( $b, $a );
+		if ('DESC' == $order) {
+			return strcasecmp($b, $a);
 		} else {
-			return strcasecmp( $a, $b );
+			return strcasecmp($a, $b);
 		}
 	}
 
@@ -271,10 +271,10 @@ 
 	public function no_items() {
 		global $plugins;
 
-		if ( !empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
+		if ( ! empty($plugins['all']))
+			_e('No plugins found.');
 		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+			_e('You do not appear to have any plugins available at this time.');
 	}
 
 	/**
@@ -286,9 +286,9 @@ 
 		global $status;
 
 		return array(
-			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
-			'name'        => __( 'Plugin' ),
-			'description' => __( 'Description' ),
+			'cb'          => ! in_array($status, array('mustuse', 'dropins')) ? '<input type="checkbox" />' : '',
+			'name'        => __('Plugin'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -309,39 +309,39 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins');
 					break;
 				case 'active':
-					$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
+					$text = _n('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'recently_activated':
-					$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
+					$text = _n('Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'inactive':
-					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
+					$text = _n('Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count);
 					break;
 				case 'mustuse':
-					$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
+					$text = _n('Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count);
 					break;
 				case 'dropins':
-					$text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
+					$text = _n('Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( 'search' != $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+			if ('search' != $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
 					add_query_arg('plugin_status', $type, 'plugins.php'),
-					( $type == $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+					($type == $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 					);
 			}
 		}
@@ -359,17 +359,17 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ('active' != $status)
+			$actions['activate-selected'] = $this->screen->in_admin('network') ? __('Network Activate') : __('Activate');
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ('inactive' != $status && 'recent' != $status)
+			$actions['deactivate-selected'] = $this->screen->in_admin('network') ? __('Network Deactivate') : __('Deactivate');
 
-		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ( ! is_multisite() || $this->screen->in_admin('network')) {
+			if (current_user_can('update_plugins'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_plugins') && ('active' != $status))
+				$actions['delete-selected'] = __('Delete');
 		}
 
 		return $actions;
@@ -379,33 +379,33 @@ 
 	 * @global string $status
 	 * @param string $which
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		parent::bulk_actions( $which );
+		parent::bulk_actions($which);
 	}
 
 	/**
 	 * @global string $status
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins')))
 			return;
 
 		echo '<div class="alignleft actions">';
 
-		if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
-			submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-		elseif ( 'top' == $which && 'mustuse' == $status )
-			echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
-		elseif ( 'top' == $which && 'dropins' == $status )
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
+		if ( ! $this->screen->in_admin('network') && 'recently_activated' == $status)
+			submit_button(__('Clear List'), 'button', 'clear-recent-list', false);
+		elseif ('top' == $which && 'mustuse' == $status)
+			echo '<p>'.sprintf(__('Files in the <code>%s</code> directory are executed automatically.'), str_replace(ABSPATH, '/', WPMU_PLUGIN_DIR)).'</p>';
+		elseif ('top' == $which && 'dropins' == $status)
+			echo '<p>'.sprintf(__('Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.'), str_replace(ABSPATH, '', WP_CONTENT_DIR)).'</p>';
 
 		echo '</div>';
 	}
@@ -414,7 +414,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
+		if (isset($_POST['clear-recent-list']))
 			return 'clear-recent-list';
 
 		return parent::current_action();
@@ -427,11 +427,11 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (is_multisite() && ! $this->screen->in_admin('network') && in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ($this->items as $plugin_file => $plugin_data)
+			$this->single_row(array($plugin_file, $plugin_data));
 	}
 
 	/**
@@ -442,10 +442,10 @@ 
 	 *
 	 * @param array $item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		global $status, $page, $s, $totals;
 
-		list( $plugin_file, $plugin_data ) = $item;
+		list($plugin_file, $plugin_data) = $item;
 		$context = $status;
 		$screen = $this->screen;
 
@@ -458,70 +458,70 @@ 
 			'delete' => '',
 		);
 
-		if ( 'mustuse' == $context ) {
+		if ('mustuse' == $context) {
 			$is_active = true;
-		} elseif ( 'dropins' == $context ) {
+		} elseif ('dropins' == $context) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
-			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+			if ($plugin_file != $plugin_data['Name'])
+				$plugin_name .= '<br/>'.$plugin_data['Name'];
+			if (true === ($dropins[$plugin_file][1])) { // Doesn't require a constant
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
+			} elseif (defined($dropins[$plugin_file][1]) && constant($dropins[$plugin_file][1])) { // Constant is true
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
 			} else {
 				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
+				$description = '<p><strong>'.$dropins[$plugin_file][0].' <span class="error-message">'.__('Inactive:').'</span></strong> '.sprintf(__('Requires <code>%s</code> in <code>wp-config.php</code>.'), "define('".$dropins[$plugin_file][1]."', true);").'</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ($plugin_data['Description'])
+				$description .= '<p>'.$plugin_data['Description'].'</p>';
 		} else {
-			if ( $screen->in_admin( 'network' ) )
-				$is_active = is_plugin_active_for_network( $plugin_file );
+			if ($screen->in_admin('network'))
+				$is_active = is_plugin_active_for_network($plugin_file);
 			else
-				$is_active = is_plugin_active( $plugin_file );
+				$is_active = is_plugin_active($plugin_file);
 
-			if ( $screen->in_admin( 'network' ) ) {
-				if ( $is_active ) {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+			if ($screen->in_admin('network')) {
+				if ($is_active) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+						$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Network deactivate %s'), $plugin_data['Name'])).'">'.__('Network Deactivate').'</a>';
 						}
 				} else {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Network Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+						$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Network Activate %s'), $plugin_data['Name'])).'">'.__('Network Activate').'</a>';
 					}
-					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+					if (current_user_can('delete_plugins') && ! is_plugin_active($plugin_file)) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				}
 			} else {
-				if ( $is_active ) {
+				if ($is_active) {
 					/* translators: %s: plugin name */
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+					$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Deactivate %s'), $plugin_data['Name'])).'">'.__('Deactivate').'</a>';
 				} else {
 					/* translators: %s: plugin name */
-					$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
+					$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Activate %s'), $plugin_data['Name'])).'">'.__('Activate').'</a>';
 
-					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+					if ( ! is_multisite() && current_user_can('delete_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				} // end if $is_active
 
 			 } // end if $screen->in_admin( 'network' )
 
-			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+			if (( ! is_multisite() || $screen->in_admin('network')) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR.'/'.$plugin_file)) {
 				/* translators: %s: plugin name */
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="plugin-editor.php?file='.$plugin_file.'" class="edit" aria-label="'.esc_attr(sprintf(__('Edit %s'), $plugin_data['Name'])).'">'.__('Edit').'</a>';
 			}
 		} // end if $context
 
-		$prefix = $screen->in_admin( 'network' ) ? 'network_admin_' : '';
+		$prefix = $screen->in_admin('network') ? 'network_admin_' : '';
 
 		/**
 		 * Filter the action links displayed for each plugin in the Plugins list table.
@@ -547,7 +547,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade',
 		 *                            'Must-Use', 'Drop-ins', 'Search'.
 		 */
-		$actions = apply_filters( $prefix . 'plugin_action_links', array_filter( $actions ), $plugin_file, $plugin_data, $context );
+		$actions = apply_filters($prefix.'plugin_action_links', array_filter($actions), $plugin_file, $plugin_data, $context);
 
 		/**
 		 * Filter the list of action links displayed for a specific plugin.
@@ -569,47 +569,47 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade',
 		 *                            'Must-Use', 'Drop-ins', 'Search'.
 		 */
-		$actions = apply_filters( $prefix . "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
+		$actions = apply_filters($prefix."plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context);
 
 		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+		$checkbox_id = "checkbox_".md5($plugin_data['Name']);
+		if (in_array($status, array('mustuse', 'dropins'))) {
 			$checkbox = '';
 		} else {
-			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-				. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+			$checkbox = "<label class='screen-reader-text' for='".$checkbox_id."' >".sprintf(__('Select %s'), $plugin_data['Name'])."</label>"
+				. "<input type='checkbox' name='checked[]' value='".esc_attr($plugin_file)."' id='".$checkbox_id."' />";
 		}
-		if ( 'dropins' != $context ) {
-			$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
+		if ('dropins' != $context) {
+			$description = '<p>'.($plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;').'</p>';
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		$id = sanitize_title( $plugin_name );
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+		$id = sanitize_title($plugin_name);
+		if ( ! empty($totals['upgrade']) && ! empty($plugin_data['update']))
 			$class .= ' update';
 
-		$plugin_slug = ( isset( $plugin_data['slug'] ) ) ? $plugin_data['slug'] : '';
-		printf( "<tr id='%s' class='%s' data-slug='%s'>",
+		$plugin_slug = (isset($plugin_data['slug'])) ? $plugin_data['slug'] : '';
+		printf("<tr id='%s' class='%s' data-slug='%s'>",
 			$id,
 			$class,
 			$plugin_slug
 		);
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes = ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
 					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
-					echo $this->row_actions( $actions, true );
+					echo $this->row_actions($actions, true);
 					echo "</td>";
 					break;
 				case 'description':
@@ -620,28 +620,28 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-					if ( !empty( $plugin_data['Author'] ) ) {
+					if ( ! empty($plugin_data['Version']))
+						$plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']);
+					if ( ! empty($plugin_data['Author'])) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
-						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
+						if ( ! empty($plugin_data['AuthorURI']))
+							$author = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
+						$plugin_meta[] = sprintf(__('By %s'), $author);
 					}
 
 					// Details link using API info, if available
-					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox" aria-label="%s" data-title="%s">%s</a>',
-							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) ),
-							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
-							esc_attr( $plugin_name ),
-							__( 'View details' )
+					if (isset($plugin_data['slug']) && current_user_can('install_plugins')) {
+						$plugin_meta[] = sprintf('<a href="%s" class="thickbox" aria-label="%s" data-title="%s">%s</a>',
+							esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_data['slug'].
+								'&TB_iframe=true&width=600&height=550')),
+							esc_attr(sprintf(__('More information about %s'), $plugin_name)),
+							esc_attr($plugin_name),
+							__('View details')
 						);
-					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
-							esc_url( $plugin_data['PluginURI'] ),
-							__( 'Visit plugin site' )
+					} elseif ( ! empty($plugin_data['PluginURI'])) {
+						$plugin_meta[] = sprintf('<a href="%s">%s</a>',
+							esc_url($plugin_data['PluginURI']),
+							__('Visit plugin site')
 						);
 					}
 
@@ -659,8 +659,8 @@ 
 					 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 					 *                            'Drop-ins', 'Search'.
 					 */
-					$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
-					echo implode( ' | ', $plugin_meta );
+					$plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status);
+					echo implode(' | ', $plugin_meta);
 
 					echo "</div></td>";
 					break;
@@ -678,7 +678,7 @@ 
 					 * @param string $plugin_file Path to the plugin file.
 					 * @param array  $plugin_data An array of plugin data.
 					 */
-					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+					do_action('manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data);
 
 					echo "</td>";
 			}
@@ -697,7 +697,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+		do_action('after_plugin_row', $plugin_file, $plugin_data, $status);
 
 		/**
 		 * Fires after each specific row in the Plugins list table.
@@ -713,7 +713,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
+		do_action("after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status);
 	}
 
 	/**

Braces +89 added lines, -62 removed lines

@@ -31,11 +31,13 @@ 
 		) );
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-			$status = $_REQUEST['plugin_status'];
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
+					$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset($_REQUEST['s']) ) {
+					$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -113,8 +115,9 @@ 
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-				$plugins['dropins'] = get_dropins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
+							$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
@@ -132,9 +135,10 @@ 
 		if ( ! $screen->in_admin( 'network' ) ) {
 			$recently_activated = get_option( 'recently_activated', array() );
 
-			foreach ( $recently_activated as $key => $time )
-				if ( $time + WEEK_IN_SECONDS < time() )
+			foreach ( $recently_activated as $key => $time ) {
+							if ( $time + WEEK_IN_SECONDS < time() )
 					unset( $recently_activated[$key] );
+			}
 			update_option( 'recently_activated', $recently_activated );
 		}
 
@@ -185,11 +189,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $plugins as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
@@ -213,8 +219,9 @@ 
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ( $total_this_page > $plugins_per_page ) {
+					$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -229,8 +236,9 @@ 
 	 */
 	public function _search_callback( $plugin ) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if ( is_null( $term ) ) {
+					$term = wp_unslash( $_REQUEST['s'] );
+		}
 
 		foreach ( $plugin as $value ) {
 			if ( false !== stripos( strip_tags( $value ), $term ) ) {
@@ -254,8 +262,9 @@ 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
 		if ( 'DESC' == $order ) {
 			return strcasecmp( $b, $a );
@@ -271,10 +280,11 @@ 
 	public function no_items() {
 		global $plugins;
 
-		if ( !empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
-		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+		if ( !empty( $plugins['all'] ) ) {
+					_e( 'No plugins found.' );
+		} else {
+					_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -310,8 +320,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -359,17 +370,21 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ( 'active' != $status ) {
+					$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ( 'inactive' != $status && 'recent' != $status ) {
+					$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
 		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_plugins' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -382,8 +397,9 @@ 
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -395,17 +411,19 @@ 
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-			return;
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) {
+					return;
+		}
 
 		echo '<div class="alignleft actions">';
 
-		if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
-			submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-		elseif ( 'top' == $which && 'mustuse' == $status )
-			echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
-		elseif ( 'top' == $which && 'dropins' == $status )
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
+		if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status ) {
+					submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
+		} elseif ( 'top' == $which && 'mustuse' == $status ) {
+					echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
+		} elseif ( 'top' == $which && 'dropins' == $status ) {
+					echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
+		}
 
 		echo '</div>';
 	}
@@ -414,8 +432,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
-			return 'clear-recent-list';
+		if ( isset($_POST['clear-recent-list']) ) {
+					return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
@@ -427,11 +446,13 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+					$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -463,8 +484,9 @@ 
 		} elseif ( 'dropins' == $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			if ( $plugin_file != $plugin_data['Name'] ) {
+							$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
 				$is_active = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
@@ -475,13 +497,15 @@ 
 				$is_active = false;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ( $plugin_data['Description'] ) {
+							$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
-			if ( $screen->in_admin( 'network' ) )
-				$is_active = is_plugin_active_for_network( $plugin_file );
-			else
-				$is_active = is_plugin_active( $plugin_file );
+			if ( $screen->in_admin( 'network' ) ) {
+							$is_active = is_plugin_active_for_network( $plugin_file );
+			} else {
+							$is_active = is_plugin_active( $plugin_file );
+			}
 
 			if ( $screen->in_admin( 'network' ) ) {
 				if ( $is_active ) {
@@ -585,8 +609,9 @@ 
 		}
 
 		$id = sanitize_title( $plugin_name );
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+					$class .= ' update';
+		}
 
 		$plugin_slug = ( isset( $plugin_data['slug'] ) ) ? $plugin_data['slug'] : '';
 		printf( "<tr id='%s' class='%s' data-slug='%s'>",
@@ -620,12 +645,14 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					if ( !empty( $plugin_data['Version'] ) ) {
+											$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					}
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						if ( !empty( $plugin_data['AuthorURI'] ) ) {
+													$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 

src/wp-admin/includes/schema.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * WordPress Administration Scheme API
- *
- * Here we keep the DB structure and option values.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Scheme API
+	 *
+	 * Here we keep the DB structure and option values.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Declare these as global in case schema.php is included from a function.

Spacing +149 added lines, -149 removed lines

@@ -33,21 +33,21 @@ 
  * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
  * @return string The SQL needed to create the requested tables.
  */
-function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
+function wp_get_db_schema($scope = 'all', $blog_id = null) {
 	global $wpdb;
 
 	$charset_collate = '';
 
-	if ( ! empty($wpdb->charset) )
+	if ( ! empty($wpdb->charset))
 		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-	if ( ! empty($wpdb->collate) )
+	if ( ! empty($wpdb->collate))
 		$charset_collate .= " COLLATE $wpdb->collate";
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ($blog_id && $blog_id != $wpdb->blogid)
+		$old_blog_id = $wpdb->set_blog_id($blog_id);
 
 	// Engage multisite if in the middle of turning it on from network.php.
-	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
+	$is_multisite = is_multisite() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK);
 
 	/*
 	 * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
@@ -229,10 +229,10 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
+	if ($is_multisite)
+		$global_tables = $users_multi_table.$usermeta_table;
 	else
-		$global_tables = $users_single_table . $usermeta_table;
+		$global_tables = $users_single_table.$usermeta_table;
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -303,13 +303,13 @@ 
   KEY domain_path (domain(140),path(51))
 ) $charset_collate;";
 
-	switch ( $scope ) {
+	switch ($scope) {
 		case 'blog' :
 			$queries = $blog_tables;
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 		case 'ms_global' :
@@ -317,20 +317,20 @@ 
 			break;
 		case 'all' :
 		default:
-			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
+			$queries = $global_tables.$blog_tables;
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if (isset($old_blog_id))
+		$wpdb->set_blog_id($old_blog_id);
 
 	return $queries;
 }
 
 // Populate for back compat.
-$wp_queries = wp_get_db_schema( 'all' );
+$wp_queries = wp_get_db_schema('all');
 
 /**
  * Create WordPress options and set the default values.
@@ -350,9 +350,9 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'populate_options' );
+	do_action('populate_options');
 
-	if ( ini_get('safe_mode') ) {
+	if (ini_get('safe_mode')) {
 		// Safe mode can break mkdir() so use a flat structure by default.
 		$uploads_use_yearmonth_folders = 0;
 	} else {
@@ -361,8 +361,8 @@ 
 
 	$template = WP_DEFAULT_THEME;
 	// If default theme is a child theme, we need to get its template
-	$theme = wp_get_theme( $template );
-	if ( ! $theme->errors() )
+	$theme = wp_get_theme($template);
+	if ( ! $theme->errors())
 		$template = $theme->get_template();
 
 	$timezone_string = '';
@@ -371,10 +371,10 @@ 
 	   or a valid timezone string (America/New_York). See http://us3.php.net/manual/en/timezones.php
 	   for all timezone strings supported by PHP.
 	*/
-	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
+	$offset_or_tz = _x('0', 'default GMT offset or timezone string');
+	if (is_numeric($offset_or_tz))
 		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
+	elseif ($offset_or_tz && in_array($offset_or_tz, timezone_identifiers_list()))
 			$timezone_string = $offset_or_tz;
 
 	$options = array(
@@ -386,7 +386,7 @@ 
 	'users_can_register' => 0,
 	'admin_email' => 'you@example.com',
 	/* translators: default start of the week. 0 = Sunday, 1 = Monday */
-	'start_of_week' => _x( '1', 'start of week' ),
+	'start_of_week' => _x('1', 'start of week'),
 	'use_balanceTags' => 0,
 	'use_smilies' => 1,
 	'require_name_email' => 1,
@@ -502,45 +502,45 @@ 
 	);
 
 	// 3.3
-	if ( ! is_multisite() ) {
-		$options['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+	if ( ! is_multisite()) {
+		$options['initial_db_version'] = ! empty($wp_current_db_version) && $wp_current_db_version < $wp_db_version
 			? $wp_current_db_version : $wp_db_version;
 	}
 
 	// 3.0 multisite
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		/* translators: blog tagline */
-		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
-		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
+		$options['blogdescription'] = sprintf(__('Just another %s site'), get_current_site()->site_name);
+		$options['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 
 	// Set autoload to no for these options
-	$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
+	$fat_options = array('moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins');
 
-	$keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
-	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
+	$keys = "'".implode("', '", array_keys($options))."'";
+	$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )");
 
 	$insert = '';
-	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
+	foreach ($options as $option => $value) {
+		if (in_array($option, $existing_options))
 			continue;
-		if ( in_array($option, $fat_options) )
+		if (in_array($option, $fat_options))
 			$autoload = 'no';
 		else
 			$autoload = 'yes';
 
-		if ( is_array($value) )
+		if (is_array($value))
 			$value = serialize($value);
-		if ( !empty($insert) )
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+		$insert .= $wpdb->prepare("(%s, %s, %s)", $option, $value, $autoload);
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( ! empty($insert))
+		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES ".$insert);
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( ! __get_option('home')) update_option('home', $guessurl);
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -561,7 +561,7 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows',
 	);
-	foreach ( $unusedoptions as $option )
+	foreach ($unusedoptions as $option)
 		delete_option($option);
 
 	// Delete obsolete magpie stuff.
@@ -578,15 +578,15 @@ 
 		AND a.option_name NOT LIKE %s
 		AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
 		AND b.option_value < %d";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_transient_').'%', $wpdb->esc_like('_transient_timeout_').'%', $time));
 
-	if ( is_main_site() && is_main_network() ) {
+	if (is_main_site() && is_main_network()) {
 		$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
 			WHERE a.option_name LIKE %s
 			AND a.option_name NOT LIKE %s
 			AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
 			AND b.option_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 }
 
@@ -720,7 +720,7 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
+		if (empty($role))
 			continue;
 
 		$role->add_cap('edit_others_pages');
@@ -741,19 +741,19 @@ 
 	}
 
 	$role = get_role('administrator');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_users');
 		$role->add_cap('create_users');
 	}
 
 	$role = get_role('author');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 		$role->add_cap('delete_published_posts');
 	}
 
 	$role = get_role('contributor');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 	}
 }
@@ -764,10 +764,10 @@ 
  * @since 2.3.0
  */
 function populate_roles_230() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'unfiltered_upload' );
+	if ( ! empty($role)) {
+		$role->add_cap('unfiltered_upload');
 	}
 }
 
@@ -777,10 +777,10 @@ 
  * @since 2.5.0
  */
 function populate_roles_250() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'edit_dashboard' );
+	if ( ! empty($role)) {
+		$role->add_cap('edit_dashboard');
 	}
 }
 
@@ -790,11 +790,11 @@ 
  * @since 2.6.0
  */
 function populate_roles_260() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_plugins' );
-		$role->add_cap( 'delete_plugins' );
+	if ( ! empty($role)) {
+		$role->add_cap('update_plugins');
+		$role->add_cap('delete_plugins');
 	}
 }
 
@@ -804,11 +804,11 @@ 
  * @since 2.7.0
  */
 function populate_roles_270() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_plugins' );
-		$role->add_cap( 'update_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_plugins');
+		$role->add_cap('update_themes');
 	}
 }
 
@@ -818,10 +818,10 @@ 
  * @since 2.8.0
  */
 function populate_roles_280() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_themes');
 	}
 }
 
@@ -831,23 +831,23 @@ 
  * @since 3.0.0
  */
 function populate_roles_300() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_core' );
-		$role->add_cap( 'list_users' );
-		$role->add_cap( 'remove_users' );
+	if ( ! empty($role)) {
+		$role->add_cap('update_core');
+		$role->add_cap('list_users');
+		$role->add_cap('remove_users');
 
 		/*
 		 * Never used, will be removed. create_users or promote_users
 		 * is the capability you're looking for.
 		 */
-		$role->add_cap( 'add_users' );
+		$role->add_cap('add_users');
 
-		$role->add_cap( 'promote_users' );
-		$role->add_cap( 'edit_theme_options' );
-		$role->add_cap( 'delete_themes' );
-		$role->add_cap( 'export' );
+		$role->add_cap('promote_users');
+		$role->add_cap('edit_theme_options');
+		$role->add_cap('delete_themes');
+		$role->add_cap('export');
 	}
 }
 
@@ -857,12 +857,12 @@ 
  * @since 3.0.0
  *
  */
-if ( !function_exists( 'install_network' ) ) :
+if ( ! function_exists('install_network')) :
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined('WP_INSTALLING_NETWORK'))
+		define('WP_INSTALLING_NETWORK', true);
 
-	dbDelta( wp_get_db_schema( 'global' ) );
+	dbDelta(wp_get_db_schema('global'));
 }
 endif;
 
@@ -880,59 +880,59 @@ 
  * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
  *                       so the error code must be checked) or failure.
  */
-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
+function populate_network($network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false) {
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ('' == $domain)
+		$errors->add('empty_domain', __('You must provide a domain name.'));
+	if ('' == $site_name)
+		$errors->add('empty_sitename', __('You must provide a name for your network of sites.'));
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ($network_id == $wpdb->get_var($wpdb->prepare("SELECT id FROM $wpdb->site WHERE id = %d", $network_id)))
+		$errors->add('siteid_exists', __('The network already exists.'));
 
-	$site_user = get_user_by( 'email', $email );
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
+	$site_user = get_user_by('email', $email);
+	if ( ! is_email($email))
+		$errors->add('invalid_email', __('You must provide a valid e-mail address.'));
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
 	// Set up site tables.
-	$template = get_option( 'template' );
-	$stylesheet = get_option( 'stylesheet' );
-	$allowed_themes = array( $stylesheet => true );
-	if ( $template != $stylesheet )
-		$allowed_themes[ $template ] = true;
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
-		$allowed_themes[ WP_DEFAULT_THEME ] = true;
-
-	if ( 1 == $network_id ) {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
+	$template = get_option('template');
+	$stylesheet = get_option('stylesheet');
+	$allowed_themes = array($stylesheet => true);
+	if ($template != $stylesheet)
+		$allowed_themes[$template] = true;
+	if (WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template)
+		$allowed_themes[WP_DEFAULT_THEME] = true;
+
+	if (1 == $network_id) {
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path));
 		$network_id = $wpdb->insert_id;
 	} else {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path, 'id' => $network_id));
 	}
 
-	wp_cache_delete( 'networks_have_paths', 'site-options' );
+	wp_cache_delete('networks_have_paths', 'site-options');
 
-	if ( !is_multisite() ) {
-		$site_admins = array( $site_user->user_login );
-		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
-		if ( $users ) {
-			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
+	if ( ! is_multisite()) {
+		$site_admins = array($site_user->user_login);
+		$users = get_users(array('fields' => array('ID', 'user_login')));
+		if ($users) {
+			foreach ($users as $user) {
+				if (is_super_admin($user->ID) && ! in_array($user->user_login, $site_admins))
 					$site_admins[] = $user->user_login;
 			}
 		}
 	} else {
-		$site_admins = get_site_option( 'site_admins' );
+		$site_admins = get_site_option('site_admins');
 	}
 
 	/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-	$welcome_email = __( 'Howdy USERNAME,
+	$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -959,34 +959,34 @@ 
 	);
 	$audio_exts = wp_get_audio_extensions();
 	$video_exts = wp_get_video_extensions();
-	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
+	$upload_filetypes = array_unique(array_merge($misc_exts, $audio_exts, $video_exts));
 
 	$sitemeta = array(
 		'site_name' => $site_name,
 		'admin_email' => $site_user->user_email,
 		'admin_user_id' => $site_user->ID,
 		'registration' => 'none',
-		'upload_filetypes' => implode( ' ', $upload_filetypes ),
+		'upload_filetypes' => implode(' ', $upload_filetypes),
 		'blog_upload_space' => 100,
 		'fileupload_maxk' => 1500,
 		'site_admins' => $site_admins,
 		'allowedthemes' => $allowed_themes,
-		'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
+		'illegal_names' => array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files'),
 		'wpmu_upgrade_site' => $wp_db_version,
 		'welcome_email' => $welcome_email,
-		'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
+		'first_post' => __('Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!'),
 		// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
-		'siteurl' => get_option( 'siteurl' ) . '/',
+		'siteurl' => get_option('siteurl').'/',
 		'add_new_users' => '0',
-		'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-		'subdomain_install' => intval( $subdomain_install ),
+		'upload_space_check_disabled' => is_multisite() ? get_site_option('upload_space_check_disabled') : '1',
+		'subdomain_install' => intval($subdomain_install),
 		'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'initial_db_version' => get_option( 'initial_db_version' ),
+		'ms_files_rewriting' => is_multisite() ? get_site_option('ms_files_rewriting') : '0',
+		'initial_db_version' => get_option('initial_db_version'),
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
+	if ( ! $subdomain_install)
 		$sitemeta['illegal_names'][] = 'blog';
 
 	/**
@@ -997,17 +997,17 @@ 
 	 * @param array $sitemeta   Associative array of network meta keys and values to be inserted.
 	 * @param int   $network_id ID of network to populate.
 	 */
-	$sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );
+	$sitemeta = apply_filters('populate_network_meta', $sitemeta, $network_id);
 
 	$insert = '';
-	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
+	foreach ($sitemeta as $meta_key => $meta_value) {
+		if (is_array($meta_value))
+			$meta_value = serialize($meta_value);
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
+		$insert .= $wpdb->prepare("( %d, %s, %s)", $network_id, $meta_key, $meta_value);
 	}
-	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
+	$wpdb->query("INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES ".$insert);
 
 	/*
 	 * When upgrading from single to multisite, assume the current site will
@@ -1016,44 +1016,44 @@ 
 	 * these steps since the main site of the new network has not yet been
 	 * created.
 	 */
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$current_site = new stdClass;
 		$current_site->domain = $domain;
 		$current_site->path = $path;
-		$current_site->site_name = ucfirst( $domain );
-		$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+		$current_site->site_name = ucfirst($domain);
+		$wpdb->insert($wpdb->blogs, array('site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
 		$current_site->blog_id = $blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
+		update_user_meta($site_user->ID, 'source_domain', $domain);
+		update_user_meta($site_user->ID, 'primary_blog', $blog_id);
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		if ($subdomain_install)
+			$wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
 		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+			$wp_rewrite->set_permalink_structure('/blog/%year%/%monthnum%/%day%/%postname%/');
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
+		if ( ! $subdomain_install)
 			return true;
 
 		$vhost_ok = false;
 		$errstr = '';
-		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
-		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
+		$hostname = substr(md5(time()), 0, 6).'.'.$domain; // Very random hostname!
+		$page = wp_remote_get('http://'.$hostname, array('timeout' => 5, 'httpversion' => '1.1'));
+		if (is_wp_error($page))
 			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
+		elseif (200 == wp_remote_retrieve_response_code($page))
 				$vhost_ok = true;
 
-		if ( ! $vhost_ok ) {
-			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
-			$msg .= '<p>' . sprintf( __( 'The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.' ), $hostname );
-			if ( ! empty ( $errstr ) )
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+		if ( ! $vhost_ok) {
+			$msg = '<p><strong>'.__('Warning! Wildcard DNS may not be configured correctly!').'</strong></p>';
+			$msg .= '<p>'.sprintf(__('The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.'), $hostname);
+			if ( ! empty ($errstr))
+				$msg .= ' '.sprintf(__('This resulted in an error message: %s'), '<code>'.$errstr.'</code>');
 			$msg .= '</p>';
-			$msg .= '<p>' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.' ) . '</p>';
-			$msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
-			return new WP_Error( 'no_wildcard_dns', $msg );
+			$msg .= '<p>'.__('To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.').'</p>';
+			$msg .= '<p>'.__('You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.').'</p>';
+			return new WP_Error('no_wildcard_dns', $msg);
 		}
 	}
 

Braces +110 added lines, -76 removed lines

@@ -38,13 +38,16 @@ 
 
 	$charset_collate = '';
 
-	if ( ! empty($wpdb->charset) )
-		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-	if ( ! empty($wpdb->collate) )
-		$charset_collate .= " COLLATE $wpdb->collate";
+	if ( ! empty($wpdb->charset) ) {
+			$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+	}
+	if ( ! empty($wpdb->collate) ) {
+			$charset_collate .= " COLLATE $wpdb->collate";
+	}
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ( $blog_id && $blog_id != $wpdb->blogid ) {
+			$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	}
 
 	// Engage multisite if in the middle of turning it on from network.php.
 	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
@@ -229,10 +232,11 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
-	else
-		$global_tables = $users_single_table . $usermeta_table;
+	if ( $is_multisite ) {
+			$global_tables = $users_multi_table . $usermeta_table;
+	} else {
+			$global_tables = $users_single_table . $usermeta_table;
+	}
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -309,8 +313,9 @@ 
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 		case 'ms_global' :
 			$queries = $ms_global_tables;
@@ -318,13 +323,15 @@ 
 		case 'all' :
 		default:
 			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if ( isset( $old_blog_id ) ) {
+			$wpdb->set_blog_id( $old_blog_id );
+	}
 
 	return $queries;
 }
@@ -362,8 +369,9 @@ 
 	$template = WP_DEFAULT_THEME;
 	// If default theme is a child theme, we need to get its template
 	$theme = wp_get_theme( $template );
-	if ( ! $theme->errors() )
-		$template = $theme->get_template();
+	if ( ! $theme->errors() ) {
+			$template = $theme->get_template();
+	}
 
 	$timezone_string = '';
 	$gmt_offset = 0;
@@ -372,10 +380,11 @@ 
 	   for all timezone strings supported by PHP.
 	*/
 	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
-		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
-			$timezone_string = $offset_or_tz;
+	if ( is_numeric( $offset_or_tz ) ) {
+			$gmt_offset = $offset_or_tz;
+	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) ) {
+				$timezone_string = $offset_or_tz;
+	}
 
 	$options = array(
 	'siteurl' => $guessurl,
@@ -522,25 +531,32 @@ 
 
 	$insert = '';
 	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
-			continue;
-		if ( in_array($option, $fat_options) )
-			$autoload = 'no';
-		else
-			$autoload = 'yes';
-
-		if ( is_array($value) )
-			$value = serialize($value);
-		if ( !empty($insert) )
-			$insert .= ', ';
+		if ( in_array($option, $existing_options) ) {
+					continue;
+		}
+		if ( in_array($option, $fat_options) ) {
+					$autoload = 'no';
+		} else {
+					$autoload = 'yes';
+		}
+
+		if ( is_array($value) ) {
+					$value = serialize($value);
+		}
+		if ( !empty($insert) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( !empty($insert) ) {
+			$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	}
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( !__get_option('home') ) {
+		update_option('home', $guessurl);
+	}
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -561,8 +577,9 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows',
 	);
-	foreach ( $unusedoptions as $option )
-		delete_option($option);
+	foreach ( $unusedoptions as $option ) {
+			delete_option($option);
+	}
 
 	// Delete obsolete magpie stuff.
 	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
@@ -720,8 +737,9 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
-			continue;
+		if ( empty($role) ) {
+					continue;
+		}
 
 		$role->add_cap('edit_others_pages');
 		$role->add_cap('edit_published_pages');
@@ -859,8 +877,9 @@ 
  */
 if ( !function_exists( 'install_network' ) ) :
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
+			define( 'WP_INSTALLING_NETWORK', true );
+	}
 
 	dbDelta( wp_get_db_schema( 'global' ) );
 }
@@ -884,30 +903,37 @@ 
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ( '' == $domain ) {
+			$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
+	}
+	if ( '' == $site_name ) {
+			$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	}
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	}
 
 	$site_user = get_user_by( 'email', $email );
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
+	if ( ! is_email( $email ) ) {
+			$errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
+	}
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	// Set up site tables.
 	$template = get_option( 'template' );
 	$stylesheet = get_option( 'stylesheet' );
 	$allowed_themes = array( $stylesheet => true );
-	if ( $template != $stylesheet )
-		$allowed_themes[ $template ] = true;
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
-		$allowed_themes[ WP_DEFAULT_THEME ] = true;
+	if ( $template != $stylesheet ) {
+			$allowed_themes[ $template ] = true;
+	}
+	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
+			$allowed_themes[ WP_DEFAULT_THEME ] = true;
+	}
 
 	if ( 1 == $network_id ) {
 		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
@@ -923,8 +949,9 @@ 
 		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
 		if ( $users ) {
 			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
-					$site_admins[] = $user->user_login;
+				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) ) {
+									$site_admins[] = $user->user_login;
+				}
 			}
 		}
 	} else {
@@ -986,8 +1013,9 @@ 
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
-		$sitemeta['illegal_names'][] = 'blog';
+	if ( ! $subdomain_install ) {
+			$sitemeta['illegal_names'][] = 'blog';
+	}
 
 	/**
 	 * Filter meta for a network on creation.
@@ -1001,10 +1029,12 @@ 
 
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
-			$insert .= ', ';
+		if ( is_array( $meta_value ) ) {
+					$meta_value = serialize( $meta_value );
+		}
+		if ( !empty( $insert ) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
 	}
 	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
@@ -1026,30 +1056,34 @@ 
 		update_user_meta( $site_user->ID, 'source_domain', $domain );
 		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		if ( $subdomain_install ) {
+					$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		} else {
+					$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		}
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
-			return true;
+		if ( ! $subdomain_install ) {
+					return true;
+		}
 
 		$vhost_ok = false;
 		$errstr = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
 		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
-			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
-				$vhost_ok = true;
+		if ( is_wp_error( $page ) ) {
+					$errstr = $page->get_error_message();
+		} elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
+						$vhost_ok = true;
+		}
 
 		if ( ! $vhost_ok ) {
 			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
 			$msg .= '<p>' . sprintf( __( 'The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.' ), $hostname );
-			if ( ! empty ( $errstr ) )
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+			if ( ! empty ( $errstr ) ) {
+							$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+			}
 			$msg .= '</p>';
 			$msg .= '<p>' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.' ) . '</p>';
 			$msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';

src/wp-admin/includes/meta-boxes.php

Indentation +11 added lines, -11 removed lines

@@ -487,9 +487,9 @@ 
 
 		<div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
 			<?php
-            $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-            echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-            ?>
+			$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+			echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+			?>
 			<ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
 				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
 			</ul>
@@ -756,14 +756,14 @@ 
 <label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
 <?php
 /**
- * Filter the title of the default page template displayed in the drop-down.
- *
- * @since 4.1.0
- *
- * @param string $label   The display value for the default page template title.
- * @param string $context Where the option label is displayed. Possible values
- *                        include 'meta-box' or 'quick-edit'.
- */
+		 * Filter the title of the default page template displayed in the drop-down.
+		 *
+		 * @since 4.1.0
+		 *
+		 * @param string $label   The display value for the default page template title.
+		 * @param string $context Where the option label is displayed. Possible values
+		 *                        include 'meta-box' or 'quick-edit'.
+		 */
 $default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
 ?>
 <option value="default"><?php echo esc_html( $default_title ); ?></option>

Spacing +196 added lines, -196 removed lines

@@ -11,7 +11,7 @@ 
  *
  * @param object $post
  */
-function post_submit_meta_box($post, $args = array() ) {
+function post_submit_meta_box($post, $args = array()) {
 	global $action;
 
 	$post_type = $post->post_type;
@@ -24,27 +24,27 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="save-action">
-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
-<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
+<?php if ('publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status) { ?>
+<input <?php if ('private' == $post->post_status) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
 <span class="spinner"></span>
-<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
+<?php } elseif ('pending' == $post->post_status && $can_publish) { ?>
 <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
 <span class="spinner"></span>
 <?php } ?>
 </div>
-<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
+<?php if (is_post_type_viewable($post_type_object)) : ?>
 <div id="preview-action">
 <?php
-if ( 'publish' == $post->post_status ) {
-	$preview_link = esc_url( get_permalink( $post->ID ) );
-	$preview_button = __( 'Preview Changes' );
+if ('publish' == $post->post_status) {
+	$preview_link = esc_url(get_permalink($post->ID));
+	$preview_button = __('Preview Changes');
 } else {
-	$preview_link = set_url_scheme( get_permalink( $post->ID ) );
+	$preview_link = set_url_scheme(get_permalink($post->ID));
 
 	/**
 	 * Filter the URI of a post preview in the post submit box.
@@ -55,8 +55,8 @@ 
 	 * @param string  $preview_link URI the user will be directed to for a post preview.
 	 * @param WP_Post $post         Post object.
 	 */
-	$preview_link = esc_url( apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ) );
-	$preview_button = __( 'Preview' );
+	$preview_link = esc_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', $preview_link), $post));
+	$preview_button = __('Preview');
 }
 ?>
 <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
@@ -71,7 +71,7 @@ 
 <div class="misc-pub-section misc-pub-post-status"><label for="post_status"><?php _e('Status:') ?></label>
 <span id="post-status-display">
 <?php
-switch ( $post->post_status ) {
+switch ($post->post_status) {
 	case 'private':
 		_e('Privately Published');
 		break;
@@ -91,24 +91,24 @@ 
 }
 ?>
 </span>
-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
+<?php if ('publish' == $post->post_status || 'private' == $post->post_status || $can_publish) { ?>
+<a href="#post_status" <?php if ('private' == $post->post_status) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit status'); ?></span></a>
 
 <div id="post-status-select" class="hide-if-js">
-<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr(('auto-draft' == $post->post_status) ? 'draft' : $post->post_status); ?>" />
 <select name='post_status' id='post_status'>
-<?php if ( 'publish' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
-<?php elseif ( 'private' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
-<?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php if ('publish' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'publish'); ?> value='publish'><?php _e('Published') ?></option>
+<?php elseif ('private' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'private'); ?> value='publish'><?php _e('Privately Published') ?></option>
+<?php elseif ('future' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'future'); ?> value='future'><?php _e('Scheduled') ?></option>
 <?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'pending'); ?> value='pending'><?php _e('Pending Review') ?></option>
+<?php if ('auto-draft' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'auto-draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -121,14 +121,14 @@ 
 <div class="misc-pub-section misc-pub-visibility" id="visibility">
 <?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
 
-if ( 'private' == $post->post_status ) {
+if ('private' == $post->post_status) {
 	$post->post_password = '';
 	$visibility = 'private';
 	$visibility_trans = __('Private');
-} elseif ( !empty( $post->post_password ) ) {
+} elseif ( ! empty($post->post_password)) {
 	$visibility = 'password';
 	$visibility_trans = __('Password protected');
-} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
+} elseif ($post_type == 'post' && is_sticky($post->ID)) {
 	$visibility = 'public';
 	$visibility_trans = __('Public, Sticky');
 } else {
@@ -136,23 +136,23 @@ 
 	$visibility_trans = __('Public');
 }
 
-echo esc_html( $visibility_trans ); ?></span>
-<?php if ( $can_publish ) { ?>
-<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
+echo esc_html($visibility_trans); ?></span>
+<?php if ($can_publish) { ?>
+<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit visibility'); ?></span></a>
 
 <div id="post-visibility-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($post->post_password); ?>" />
 <?php if ($post_type == 'post'): ?>
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
 <?php endif; ?>
-<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
-<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
-<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr($visibility); ?>" />
+<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked($visibility, 'public'); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
+<?php if ($post_type == 'post' && current_user_can('edit_others_posts')) : ?>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page'); ?></label><br /></span>
 <?php endif; ?>
-<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked($visibility, 'password'); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>"  maxlength="20" /><br /></span>
-<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked($visibility, 'private'); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
 
 <p>
  <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -165,51 +165,51 @@ 
 
 <?php
 /* translators: Publish box date format, see http://php.net/date */
-$datef = __( 'M j, Y @ H:i' );
-if ( 0 != $post->ID ) {
-	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+$datef = __('M j, Y @ H:i');
+if (0 != $post->ID) {
+	if ('future' == $post->post_status) { // scheduled for publishing at a future date
 		$stamp = __('Scheduled for: <b>%1$s</b>');
-	} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+	} elseif ('publish' == $post->post_status || 'private' == $post->post_status) { // already published
 		$stamp = __('Published on: <b>%1$s</b>');
-	} elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+	} elseif ('0000-00-00 00:00:00' == $post->post_date_gmt) { // draft, 1 or more saves, no date specified
 		$stamp = __('Publish <b>immediately</b>');
-	} elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+	} elseif (time() < strtotime($post->post_date_gmt.' +0000')) { // draft, 1 or more saves, future date specified
 		$stamp = __('Schedule for: <b>%1$s</b>');
 	} else { // draft, 1 or more saves, date specified
 		$stamp = __('Publish on: <b>%1$s</b>');
 	}
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 } else { // draft (no saves, and thus no date specified)
 	$stamp = __('Publish <b>immediately</b>');
-	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+	$date = date_i18n($datef, strtotime(current_time('mysql')));
 }
 
-if ( ! empty( $args['args']['revisions_count'] ) ) :
-	$revisions_to_keep = wp_revisions_to_keep( $post );
+if ( ! empty($args['args']['revisions_count'])) :
+	$revisions_to_keep = wp_revisions_to_keep($post);
 ?>
 <div class="misc-pub-section misc-pub-revisions">
 <?php
-	if ( $revisions_to_keep > 0 && $revisions_to_keep <= $args['args']['revisions_count'] ) {
-		echo '<span title="' . esc_attr( sprintf( __( 'Your site is configured to keep only the last %s revisions.' ),
-			number_format_i18n( $revisions_to_keep ) ) ) . '">';
-		printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '+</b>' );
+	if ($revisions_to_keep > 0 && $revisions_to_keep <= $args['args']['revisions_count']) {
+		echo '<span title="'.esc_attr(sprintf(__('Your site is configured to keep only the last %s revisions.'),
+			number_format_i18n($revisions_to_keep))).'">';
+		printf(__('Revisions: %s'), '<b>'.number_format_i18n($args['args']['revisions_count']).'+</b>');
 		echo '</span>';
 	} else {
-		printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
+		printf(__('Revisions: %s'), '<b>'.number_format_i18n($args['args']['revisions_count']).'</b>');
 	}
 ?>
-	<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
+	<a class="hide-if-no-js" href="<?php echo esc_url(get_edit_post_link($args['args']['revision_id'])); ?>"><span aria-hidden="true"><?php _ex('Browse', 'revisions'); ?></span> <span class="screen-reader-text"><?php _e('Browse revisions'); ?></span></a>
 </div>
 <?php endif;
 
-if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+if ($can_publish) : // Contributors don't get to choose the date of publish ?>
 <div class="misc-pub-section curtime misc-pub-curtime">
 	<span id="timestamp">
 	<?php printf($stamp, $date); ?></span>
-	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit date and time'); ?></span></a>
 	<fieldset id="timestampdiv" class="hide-if-js">
-	<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-	<?php touch_time( ( $action === 'edit' ), 1 ); ?>
+	<legend class="screen-reader-text"><?php _e('Date and time'); ?></legend>
+	<?php touch_time(($action === 'edit'), 1); ?>
 	</fieldset>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
@@ -220,7 +220,7 @@ 
  *
  * @since 2.9.0
  */
-do_action( 'post_submitbox_misc_actions' );
+do_action('post_submitbox_misc_actions');
 ?>
 </div>
 <div class="clear"></div>
@@ -233,12 +233,12 @@ 
  *
  * @since 2.7.0
  */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
+if (current_user_can("delete_post", $post->ID)) {
+	if ( ! EMPTY_TRASH_DAYS)
 		$delete_text = __('Delete Permanently');
 	else
 		$delete_text = __('Move to Trash');
@@ -250,23 +250,23 @@ 
 <div id="publishing-action">
 <span class="spinner"></span>
 <?php
-if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
-	if ( $can_publish ) :
-		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+if ( ! in_array($post->post_status, array('publish', 'future', 'private')) || 0 == $post->ID) {
+	if ($can_publish) :
+		if ( ! empty($post->post_date_gmt) && time() < strtotime($post->post_date_gmt.' +0000')) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
-		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Schedule'), 'primary button-large', 'publish', false); ?>
 <?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Publish'), 'primary button-large', 'publish', false); ?>
 <?php	endif;
 	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Submit for Review'), 'primary button-large', 'publish', false); ?>
 <?php
 	endif;
 } else { ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 <?php
 } ?>
 </div>
@@ -284,7 +284,7 @@ 
  *
  * @param object $post
  */
-function attachment_submit_meta_box( $post ) {
+function attachment_submit_meta_box($post) {
 ?>
 <div class="submitbox" id="submitpost">
 
@@ -292,16 +292,16 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 
 <div id="misc-publishing-actions">
 	<?php
 	/* translators: Publish box date format, see http://php.net/date */
-	$datef = __( 'M j, Y @ H:i' );
+	$datef = __('M j, Y @ H:i');
 	$stamp = __('Uploaded on: <b>%1$s</b>');
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 	?>
 	<div class="misc-pub-section curtime misc-pub-curtime">
 		<span id="timestamp"><?php printf($stamp, $date); ?></span>
@@ -314,7 +314,7 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'attachment_submitbox_misc_actions' );
+	do_action('attachment_submitbox_misc_actions');
 	?>
 </div><!-- #misc-publishing-actions -->
 <div class="clear"></div>
@@ -323,12 +323,12 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+	if (current_user_can('delete_post', $post->ID))
+		if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
+			echo "<a class='submitdelete deletion' href='".get_delete_post_link($post->ID)."'>".__('Trash')."</a>";
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			echo  "<a class='submitdelete deletion'$delete_ays href='".get_delete_post_link($post->ID, null, true)."'>".__('Delete Permanently')."</a>";
 		}
 	?>
 	</div>
@@ -336,7 +336,7 @@ 
 	<div id="publishing-action">
 		<span class="spinner"></span>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 	</div>
 	<div class="clear"></div>
 </div><!-- #major-publishing-actions -->
@@ -361,24 +361,24 @@ 
  *     @type array    $args     Extra meta box arguments.
  * }
  */
-function post_format_meta_box( $post, $box ) {
-	if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
-	$post_formats = get_theme_support( 'post-formats' );
+function post_format_meta_box($post, $box) {
+	if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) :
+	$post_formats = get_theme_support('post-formats');
 
-	if ( is_array( $post_formats[0] ) ) :
-		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
+	if (is_array($post_formats[0])) :
+		$post_format = get_post_format($post->ID);
+		if ( ! $post_format)
 			$post_format = '0';
 		// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-		if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
+		if ($post_format && ! in_array($post_format, $post_formats[0]))
 			$post_formats[0][] = $post_format;
 	?>
 	<div id="post-formats-select">
 		<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
-			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
-			<?php foreach ( $post_formats[0] as $format ) : ?>
-			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>" class="post-format-icon post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+			<legend class="screen-reader-text"><?php _e('Post Formats'); ?></legend>
+			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked($post_format, '0'); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string('standard'); ?></label>
+			<?php foreach ($post_formats[0] as $format) : ?>
+			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr($format); ?>" value="<?php echo esc_attr($format); ?>" <?php checked($post_format, $format); ?> /> <label for="post-format-<?php echo esc_attr($format); ?>" class="post-format-icon post-format-<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 			<?php endforeach; ?>
 		</fieldset>
 	</div>
@@ -406,25 +406,25 @@ 
  *     }
  * }
  */
-function post_tags_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'post_tag' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_tags_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'post_tag');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
-	$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-	$comma = _x( ',', 'tag delimiter' );
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
+	$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+	$comma = _x(',', 'tag delimiter');
 ?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
 	<div class="jaxtag">
 	<div class="nojs-tags hide-if-js">
 	<p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
-	<textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
- 	<?php if ( $user_can_assign_terms ) : ?>
+	<textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms); ?>><?php echo str_replace(',', $comma.' ', get_terms_to_edit($post->ID, $tax_name)); // textarea_escaped by esc_attr() ?></textarea></div>
+ 	<?php if ($user_can_assign_terms) : ?>
 	<div class="ajaxtag hide-if-no-js">
 		<label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
 		<p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
@@ -435,7 +435,7 @@ 
 	</div>
 	<div class="tagchecklist"></div>
 </div>
-<?php if ( $user_can_assign_terms ) : ?>
+<?php if ($user_can_assign_terms) : ?>
 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
 <?php endif; ?>
 <?php
@@ -462,57 +462,57 @@ 
  *     }
  * }
  */
-function post_categories_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_categories_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'category');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
 	?>
 	<div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
 		<ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
 			<li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
-			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
 		</ul>
 
 		<div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
 			<ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-				<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+				<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
 			</ul>
 		</div>
 
 		<div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
 			<?php
-            $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+            $name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
             echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
             ?>
 			<ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => $tax_name, 'popular_cats' => $popular_ids)); ?>
 			</ul>
 		</div>
-	<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+	<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
 			<div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
 				<h4>
 					<a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
 						<?php
 							/* translators: %s: add new taxonomy label */
-							printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+							printf(__('+ %s'), $taxonomy->labels->add_new_item);
 						?>
 					</a>
 				</h4>
 				<p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
+					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
 						<?php echo $taxonomy->labels->parent_item_colon; ?>
 					</label>
-					<?php wp_dropdown_categories( array( 'taxonomy' => $tax_name, 'hide_empty' => 0, 'name' => 'new' . $tax_name . '_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;' ) ); ?>
-					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>" />
-					<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+					<?php wp_dropdown_categories(array('taxonomy' => $tax_name, 'hide_empty' => 0, 'name' => 'new'.$tax_name.'_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;')); ?>
+					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>" />
+					<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
 					<span id="<?php echo $tax_name; ?>-ajax-response"></span>
 				</p>
 			</div>
@@ -543,12 +543,12 @@ 
  * @param object $post
  */
 function post_trackback_meta_box($post) {
-	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="'. esc_attr( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="'.esc_attr(str_replace("\n", ' ', $post->to_ping)).'" />';
 	if ('' != $post->pinged) {
-		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
+		$pings = '<p>'.__('Already pinged:').'</p><ul>';
 		$already_pinged = explode("\n", trim($post->pinged));
 		foreach ($already_pinged as $pinged_url) {
-			$pings .= "\n\t<li>" . esc_html($pinged_url) . "</li>";
+			$pings .= "\n\t<li>".esc_html($pinged_url)."</li>";
 		}
 		$pings .= '</ul>';
 	}
@@ -557,7 +557,7 @@ 
 <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings))
 	echo $pings;
 }
 
@@ -574,12 +574,12 @@ 
 <div id="ajax-response"></div>
 <?php
 $metadata = has_meta($post->ID);
-foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
+foreach ($metadata as $key => $value) {
+	if (is_protected_meta($metadata[$key]['meta_key'], 'post') || ! current_user_can('edit_post_meta', $post->ID, $metadata[$key]['meta_key']))
+		unset($metadata[$key]);
 }
-list_meta( $metadata );
-meta_form( $post ); ?>
+list_meta($metadata);
+meta_form($post); ?>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="https://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
 <?php
@@ -596,8 +596,8 @@ 
 ?>
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
-	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e( 'Allow comments.' ) ?></label><br />
-	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php printf( __( 'Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.' ), __( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' ) ); ?></label>
+	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow comments.') ?></label><br />
+	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php printf(__('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'), __('https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments')); ?></label>
 	<?php
 	/**
 	 * Fires at the end of the Discussion meta box on the post editing screen.
@@ -606,7 +606,7 @@ 
 	 *
 	 * @param WP_Post $post WP_Post object of the current post.
 	 */
-	do_action( 'post_comment_status_meta_box-options', $post );
+	do_action('post_comment_status_meta_box-options', $post);
 	?>
 </p>
 <?php
@@ -632,21 +632,21 @@ 
  *
  * @param object $post
  */
-function post_comment_meta_box( $post ) {
-	wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+function post_comment_meta_box($post) {
+	wp_nonce_field('get-comments', 'add_comment_nonce', false);
 	?>
 	<p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
 	<?php
 
-	$total = get_comments( array( 'post_id' => $post->ID, 'number' => 1, 'count' => true ) );
+	$total = get_comments(array('post_id' => $post->ID, 'number' => 1, 'count' => true));
 	$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
-	$wp_list_table->display( true );
+	$wp_list_table->display(true);
 
-	if ( 1 > $total ) {
-		echo '<p id="no-comments">' . __('No comments yet.') . '</p>';
+	if (1 > $total) {
+		echo '<p id="no-comments">'.__('No comments yet.').'</p>';
 	} else {
-		$hidden = get_hidden_meta_boxes( get_current_screen() );
-		if ( ! in_array('commentsdiv', $hidden) ) {
+		$hidden = get_hidden_meta_boxes(get_current_screen());
+		if ( ! in_array('commentsdiv', $hidden)) {
 			?>
 			<script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
 			<?php
@@ -670,7 +670,7 @@ 
 function post_slug_meta_box($post) {
 /** This filter is documented in wp-admin/edit-tag-form.php */
 ?>
-<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( apply_filters( 'editable_slug', $post->post_name ) ); ?>" />
+<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr(apply_filters('editable_slug', $post->post_name)); ?>" />
 <?php
 }
 
@@ -688,12 +688,12 @@ 
 ?>
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
-	wp_dropdown_users( array(
+	wp_dropdown_users(array(
 		'who' => 'authors',
 		'name' => 'post_author_override',
 		'selected' => empty($post->ID) ? $user_ID : $post->post_author,
 		'include_selected' => true
-	) );
+	));
 }
 
 /**
@@ -703,8 +703,8 @@ 
  *
  * @param object $post
  */
-function post_revisions_meta_box( $post ) {
-	wp_list_post_revisions( $post );
+function post_revisions_meta_box($post) {
+	wp_list_post_revisions($post);
 }
 
 // -- Page related Meta Boxes
@@ -718,7 +718,7 @@ 
  */
 function page_attributes_meta_box($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( $post_type_object->hierarchical ) {
+	if ($post_type_object->hierarchical) {
 		$dropdown_args = array(
 			'post_type'        => $post->post_type,
 			'exclude_tree'     => $post->ID,
@@ -739,9 +739,9 @@ 
 		 * @param array   $dropdown_args Array of arguments used to generate the pages drop-down.
 		 * @param WP_Post $post          The current WP_Post object.
 		 */
-		$dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
-		$pages = wp_dropdown_pages( $dropdown_args );
-		if ( ! empty($pages) ) {
+		$dropdown_args = apply_filters('page_attributes_dropdown_pages_args', $dropdown_args, $post);
+		$pages = wp_dropdown_pages($dropdown_args);
+		if ( ! empty($pages)) {
 ?>
 <p><strong><?php _e('Parent') ?></strong></p>
 <label class="screen-reader-text" for="parent_id"><?php _e('Parent') ?></label>
@@ -749,8 +749,8 @@ 
 <?php
 		} // end empty pages check
 	} // end hierarchical check.
-	if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) && get_option( 'page_for_posts' ) != $post->ID ) {
-		$template = !empty($post->page_template) ? $post->page_template : false;
+	if ('page' == $post->post_type && 0 != count(get_page_templates($post)) && get_option('page_for_posts') != $post->ID) {
+		$template = ! empty($post->page_template) ? $post->page_template : false;
 		?>
 <p><strong><?php _e('Template') ?></strong></p>
 <label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
@@ -764,17 +764,17 @@ 
  * @param string $context Where the option label is displayed. Possible values
  *                        include 'meta-box' or 'quick-edit'.
  */
-$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
+$default_title = apply_filters('default_page_template_title', __('Default Template'), 'meta-box');
 ?>
-<option value="default"><?php echo esc_html( $default_title ); ?></option>
+<option value="default"><?php echo esc_html($default_title); ?></option>
 <?php page_template_dropdown($template); ?>
 </select>
 <?php
 	} ?>
 <p><strong><?php _e('Order') ?></strong></p>
 <p><label class="screen-reader-text" for="menu_order"><?php _e('Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
-<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) { ?>
-<p><?php _e( 'Need help? Use the Help tab in the upper right of your screen.' ); ?></p>
+<?php if ('page' == $post->post_type && get_current_screen()->get_help_tabs()) { ?>
+<p><?php _e('Need help? Use the Help tab in the upper right of your screen.'); ?></p>
 <?php
 	}
 }
@@ -796,12 +796,12 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
+<?php submit_button(__('Save'), 'button', 'save', false); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<?php if ( !empty($link->link_id) ) { ?>
+<?php if ( ! empty($link->link_id)) { ?>
 	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
 <?php } ?>
 </div>
@@ -819,20 +819,20 @@ 
 <div id="major-publishing-actions">
 <?php
 /** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+if ( ! empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links')) { ?>
+	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
 <div id="publishing-action">
-<?php if ( !empty($link->link_id) ) { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Update Link' ) ?>" />
+<?php if ( ! empty($link->link_id)) { ?>
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Update Link') ?>" />
 <?php } else { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Add Link' ) ?>" />
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Add Link') ?>" />
 <?php } ?>
 </div>
 <div class="clear"></div>
@@ -843,7 +843,7 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'submitlink_box' );
+do_action('submitlink_box');
 ?>
 <div class="clear"></div>
 </div>
@@ -861,14 +861,14 @@ 
 ?>
 <div id="taxonomy-linkcategory" class="categorydiv">
 	<ul id="category-tabs" class="category-tabs">
-		<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+		<li class="tabs"><a href="#categories-all"><?php _e('All Categories'); ?></a></li>
+		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e('Most Used'); ?></a></li>
 	</ul>
 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
+			if (isset($link->link_id))
 				wp_link_category_checklist($link->link_id);
 			else
 				wp_link_category_checklist();
@@ -883,12 +883,12 @@ 
 	</div>
 
 	<div id="category-adder" class="wp-hidden-children">
-		<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+		<h4><a id="category-add-toggle" href="#category-add"><?php _e('+ Add New Category'); ?></a></h4>
 		<p id="link-category-add" class="wp-hidden-child">
-			<label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
-			<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+			<label class="screen-reader-text" for="newcat"><?php _e('+ Add New Category'); ?></label>
+			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e('New category name'); ?>" aria-required="true" />
+			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e('Add'); ?>" />
+			<?php wp_nonce_field('add-link-category', '_ajax_nonce', false); ?>
 			<span id="category-ajax-response"></span>
 		</p>
 	</div>
@@ -906,13 +906,13 @@ 
 function link_target_meta_box($link) { ?>
 <fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
 <p><label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo (isset($link->link_target) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
 <p><label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo (isset($link->link_target) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
 <p><label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo (isset($link->link_target) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
 </fieldset>
 <p><?php _e('Choose the target frame for your link.'); ?></p>
@@ -930,16 +930,16 @@ 
  * @param string $value
  * @param mixed $deprecated Never used.
  */
-function xfn_check( $class, $value = '', $deprecated = '' ) {
+function xfn_check($class, $value = '', $deprecated = '') {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.0'); // Never implemented
 
-	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
+	$link_rel = isset($link->link_rel) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
 
-	if ('' != $value && in_array($value, $rels) ) {
+	if ('' != $value && in_array($value, $rels)) {
 		echo ' checked="checked"';
 	}
 
@@ -947,7 +947,7 @@ 
 		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
 		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
 		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('identity' == $class && in_array('me', $rels)) echo ' checked="checked"';
 	}
 }
 
@@ -963,7 +963,7 @@ 
 <table class="links-table">
 	<tr>
 		<th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
-		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
+		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo (isset($link->link_rel) ? esc_attr($link->link_rel) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
@@ -1081,25 +1081,25 @@ 
 <table class="links-table" cellpadding="0">
 	<tr>
 		<th scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
+		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo (isset($link->link_image) ? esc_attr($link->link_image) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
+		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo (isset($link->link_rss) ? esc_attr($link->link_rss) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
+		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo (isset($link->link_notes) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
 		<td><select name="link_rating" id="link_rating" size="1">
 		<?php
-			for ( $r = 0; $r <= 10; $r++ ) {
-				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
+			for ($r = 0; $r <= 10; $r++) {
+				echo '<option value="'.$r.'"';
+				if (isset($link->link_rating) && $link->link_rating == $r)
 					echo ' selected="selected"';
-				echo('>' . $r . '</option>');
+				echo('>'.$r.'</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
 		</td>
@@ -1113,9 +1113,9 @@ 
  *
  * @since 2.9.0
  */
-function post_thumbnail_meta_box( $post ) {
-	$thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
-	echo _wp_post_thumbnail_html( $thumbnail_id, $post->ID );
+function post_thumbnail_meta_box($post) {
+	$thumbnail_id = get_post_meta($post->ID, '_thumbnail_id', true);
+	echo _wp_post_thumbnail_html($thumbnail_id, $post->ID);
 }
 
 /**
@@ -1125,18 +1125,18 @@ 
  *
  * @param WP_Post $post
  */
-function attachment_id3_data_meta_box( $post ) {
+function attachment_id3_data_meta_box($post) {
 	$meta = array();
-	if ( ! empty( $post->ID ) ) {
-		$meta = wp_get_attachment_metadata( $post->ID );
+	if ( ! empty($post->ID)) {
+		$meta = wp_get_attachment_metadata($post->ID);
 	}
 
-	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) : ?>
+	foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) : ?>
 	<p>
 		<label for="title"><?php echo $label ?></label><br />
-		<input type="text" name="id3_<?php echo esc_attr( $key ) ?>" id="id3_<?php echo esc_attr( $key ) ?>" class="large-text" value="<?php
-			if ( ! empty( $meta[ $key ] ) ) {
-				echo esc_attr( $meta[ $key ] );
+		<input type="text" name="id3_<?php echo esc_attr($key) ?>" id="id3_<?php echo esc_attr($key) ?>" class="large-text" value="<?php
+			if ( ! empty($meta[$key])) {
+				echo esc_attr($meta[$key]);
 			}
 		?>" />
 	</p>

Braces +59 added lines, -32 removed lines

@@ -107,8 +107,11 @@ 
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
 <?php if ( 'auto-draft' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<?php else {
+	: ?>
+<option<?php selected( $post->post_status, 'draft' );
+}
+?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -238,10 +241,11 @@ 
 <div id="delete-action">
 <?php
 if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
-		$delete_text = __('Delete Permanently');
-	else
-		$delete_text = __('Move to Trash');
+	if ( !EMPTY_TRASH_DAYS ) {
+			$delete_text = __('Delete Permanently');
+	} else {
+			$delete_text = __('Move to Trash');
+	}
 	?>
 <a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
 } ?>
@@ -255,13 +259,19 @@ 
 		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
 		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
-<?php	else : ?>
+<?php	else {
+	: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false );
+}
+?>
 <?php	endif;
-	else : ?>
+	else {
+		: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false );
+	}
+	?>
 <?php
 	endif;
 } else { ?>
@@ -323,9 +333,10 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+	if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
 			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+	}
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
@@ -367,11 +378,13 @@ 
 
 	if ( is_array( $post_formats[0] ) ) :
 		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
-			$post_format = '0';
+		if ( !$post_format ) {
+					$post_format = '0';
+		}
 		// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-		if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
-			$post_formats[0][] = $post_format;
+		if ( $post_format && !in_array( $post_format, $post_formats[0] ) ) {
+					$post_formats[0][] = $post_format;
+		}
 	?>
 	<div id="post-formats-select">
 		<fieldset>
@@ -557,9 +570,10 @@ 
 <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings) ) {
 	echo $pings;
 }
+}
 
 /**
  * Display custom fields form fields.
@@ -575,9 +589,10 @@ 
 <?php
 $metadata = has_meta($post->ID);
 foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
-}
+	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) ) {
+			unset( $metadata[ $key ] );
+	}
+	}
 list_meta( $metadata );
 meta_form( $post ); ?>
 </div>
@@ -868,10 +883,11 @@ 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
-				wp_link_category_checklist($link->link_id);
-			else
-				wp_link_category_checklist();
+			if ( isset($link->link_id) ) {
+							wp_link_category_checklist($link->link_id);
+			} else {
+							wp_link_category_checklist();
+			}
 			?>
 		</ul>
 	</div>
@@ -933,8 +949,10 @@ 
 function xfn_check( $class, $value = '', $deprecated = '' ) {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.0' );
+	}
+	// Never implemented
 
 	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
@@ -944,10 +962,18 @@ 
 	}
 
 	if ('' == $value) {
-		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) {
+			echo ' checked="checked"';
+		}
+		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) {
+			echo ' checked="checked"';
+		}
+		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) {
+			echo ' checked="checked"';
+		}
+		if ('identity' == $class && in_array('me', $rels) ) {
+			echo ' checked="checked"';
+		}
 	}
 }
 
@@ -1097,8 +1123,9 @@ 
 		<?php
 			for ( $r = 0; $r <= 10; $r++ ) {
 				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
-					echo ' selected="selected"';
+				if ( isset($link->link_rating) && $link->link_rating == $r ) {
+									echo ' selected="selected"';
+				}
 				echo('>' . $r . '</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>