iqltechnologies / brighty

brighty/wp-admin/includes/schema.php

Indentation +888 added lines, -888 removed lines

@@ -34,26 +34,26 @@ 
  * @return string The SQL needed to create the requested tables.
  */
 function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
-	global $wpdb;
+    global $wpdb;
 
-	$charset_collate = $wpdb->get_charset_collate();
+    $charset_collate = $wpdb->get_charset_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 );
+    // Engage multisite if in the middle of turning it on from network.php.
+    $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.
 	 * As of 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which
 	 * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters.
 	 */
-	$max_index_length = 191;
+    $max_index_length = 191;
 
-	// Blog-specific tables.
-	$blog_tables = "CREATE TABLE $wpdb->termmeta (
+    // Blog-specific tables.
+    $blog_tables = "CREATE TABLE $wpdb->termmeta (
 	meta_id bigint(20) unsigned NOT NULL auto_increment,
 	term_id bigint(20) unsigned NOT NULL default '0',
 	meta_key varchar(255) default NULL,
@@ -187,8 +187,8 @@ 
 	KEY post_author (post_author)
 ) $charset_collate;\n";
 
-	// Single site users table. The multisite flavor of the users table is handled below.
-	$users_single_table = "CREATE TABLE $wpdb->users (
+    // Single site users table. The multisite flavor of the users table is handled below.
+    $users_single_table = "CREATE TABLE $wpdb->users (
 	ID bigint(20) unsigned NOT NULL auto_increment,
 	user_login varchar(60) NOT NULL default '',
 	user_pass varchar(255) NOT NULL default '',
@@ -205,8 +205,8 @@ 
 	KEY user_email (user_email)
 ) $charset_collate;\n";
 
-	// Multisite users table.
-	$users_multi_table = "CREATE TABLE $wpdb->users (
+    // Multisite users table.
+    $users_multi_table = "CREATE TABLE $wpdb->users (
 	ID bigint(20) unsigned NOT NULL auto_increment,
 	user_login varchar(60) NOT NULL default '',
 	user_pass varchar(255) NOT NULL default '',
@@ -225,8 +225,8 @@ 
 	KEY user_email (user_email)
 ) $charset_collate;\n";
 
-	// Usermeta.
-	$usermeta_table = "CREATE TABLE $wpdb->usermeta (
+    // Usermeta.
+    $usermeta_table = "CREATE TABLE $wpdb->usermeta (
 	umeta_id bigint(20) unsigned NOT NULL auto_increment,
 	user_id bigint(20) unsigned NOT NULL default '0',
 	meta_key varchar(255) default NULL,
@@ -236,15 +236,15 @@ 
 	KEY meta_key (meta_key($max_index_length))
 ) $charset_collate;\n";
 
-	// Global tables.
-	if ( $is_multisite ) {
-		$global_tables = $users_multi_table . $usermeta_table;
-	} else {
-		$global_tables = $users_single_table . $usermeta_table;
-	}
+    // Global tables.
+    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 (
+    // Multisite global tables.
+    $ms_global_tables = "CREATE TABLE $wpdb->blogs (
 	blog_id bigint(20) NOT NULL auto_increment,
 	site_id bigint(20) NOT NULL default '0',
 	domain varchar(200) NOT NULL default '',
@@ -314,33 +314,33 @@ 
 	KEY domain_path (domain(140),path(51))
 ) $charset_collate;";
 
-	switch ( $scope ) {
-		case 'blog':
-			$queries = $blog_tables;
-			break;
-		case 'global':
-			$queries = $global_tables;
-			if ( $is_multisite ) {
-				$queries .= $ms_global_tables;
-			}
-			break;
-		case 'ms_global':
-			$queries = $ms_global_tables;
-			break;
-		case 'all':
-		default:
-			$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 );
-	}
-
-	return $queries;
+    switch ( $scope ) {
+        case 'blog':
+            $queries = $blog_tables;
+            break;
+        case 'global':
+            $queries = $global_tables;
+            if ( $is_multisite ) {
+                $queries .= $ms_global_tables;
+            }
+            break;
+        case 'ms_global':
+            $queries = $ms_global_tables;
+            break;
+        case 'all':
+        default:
+            $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 );
+    }
+
+    return $queries;
 }
 
 // Populate for back compat.
@@ -359,342 +359,342 @@ 
  * @param array $options Optional. Custom option $key => $value pairs to use. Default empty array.
  */
 function populate_options( array $options = array() ) {
-	global $wpdb, $wp_db_version, $wp_current_db_version;
-
-	$guessurl = wp_guess_url();
-	/**
-	 * Fires before creating WordPress options and populating their default values.
-	 *
-	 * @since 2.6.0
-	 */
-	do_action( 'populate_options' );
-
-	// If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
-	$stylesheet = WP_DEFAULT_THEME;
-	$template   = WP_DEFAULT_THEME;
-	$theme      = wp_get_theme( WP_DEFAULT_THEME );
-	if ( ! $theme->exists() ) {
-		$theme = WP_Theme::get_core_default_theme();
-	}
-
-	// If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
-	if ( $theme ) {
-		$stylesheet = $theme->get_stylesheet();
-		$template   = $theme->get_template();
-	}
-
-	$timezone_string = '';
-	$gmt_offset      = 0;
-	/*
+    global $wpdb, $wp_db_version, $wp_current_db_version;
+
+    $guessurl = wp_guess_url();
+    /**
+     * Fires before creating WordPress options and populating their default values.
+     *
+     * @since 2.6.0
+     */
+    do_action( 'populate_options' );
+
+    // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
+    $stylesheet = WP_DEFAULT_THEME;
+    $template   = WP_DEFAULT_THEME;
+    $theme      = wp_get_theme( WP_DEFAULT_THEME );
+    if ( ! $theme->exists() ) {
+        $theme = WP_Theme::get_core_default_theme();
+    }
+
+    // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
+    if ( $theme ) {
+        $stylesheet = $theme->get_stylesheet();
+        $template   = $theme->get_template();
+    }
+
+    $timezone_string = '';
+    $gmt_offset      = 0;
+    /*
 	 * translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
 	 * or a valid timezone string (America/New_York). See https://www.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 ) ) {
-		$gmt_offset = $offset_or_tz;
-	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list(), true ) ) {
-			$timezone_string = $offset_or_tz;
-	}
-
-	$defaults = array(
-		'siteurl'                         => $guessurl,
-		'home'                            => $guessurl,
-		'blogname'                        => __( 'My Site' ),
-		/* translators: Site tagline. */
-		'blogdescription'                 => __( 'Just another WordPress site' ),
-		'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' ),
-		'use_balanceTags'                 => 0,
-		'use_smilies'                     => 1,
-		'require_name_email'              => 1,
-		'comments_notify'                 => 1,
-		'posts_per_rss'                   => 10,
-		'rss_use_excerpt'                 => 0,
-		'mailserver_url'                  => 'mail.example.com',
-		'mailserver_login'                => 'login@example.com',
-		'mailserver_pass'                 => 'password',
-		'mailserver_port'                 => 110,
-		'default_category'                => 1,
-		'default_comment_status'          => 'open',
-		'default_ping_status'             => 'open',
-		'default_pingback_flag'           => 1,
-		'posts_per_page'                  => 10,
-		/* translators: Default date format, see https://www.php.net/manual/datetime.format.php */
-		'date_format'                     => __( 'F j, Y' ),
-		/* translators: Default time format, see https://www.php.net/manual/datetime.format.php */
-		'time_format'                     => __( 'g:i a' ),
-		/* translators: Links last updated date format, see https://www.php.net/manual/datetime.format.php */
-		'links_updated_date_format'       => __( 'F j, Y g:i a' ),
-		'comment_moderation'              => 0,
-		'moderation_notify'               => 1,
-		'permalink_structure'             => '',
-		'rewrite_rules'                   => '',
-		'hack_file'                       => 0,
-		'blog_charset'                    => 'UTF-8',
-		'moderation_keys'                 => '',
-		'active_plugins'                  => array(),
-		'category_base'                   => '',
-		'ping_sites'                      => 'http://rpc.pingomatic.com/',
-		'comment_max_links'               => 2,
-		'gmt_offset'                      => $gmt_offset,
-
-		// 1.5.0
-		'default_email_category'          => 1,
-		'recently_edited'                 => '',
-		'template'                        => $template,
-		'stylesheet'                      => $stylesheet,
-		'comment_registration'            => 0,
-		'html_type'                       => 'text/html',
-
-		// 1.5.1
-		'use_trackback'                   => 0,
-
-		// 2.0.0
-		'default_role'                    => 'subscriber',
-		'db_version'                      => $wp_db_version,
-
-		// 2.0.1
-		'uploads_use_yearmonth_folders'   => 1,
-		'upload_path'                     => '',
-
-		// 2.1.0
-		'blog_public'                     => '1',
-		'default_link_category'           => 2,
-		'show_on_front'                   => 'posts',
-
-		// 2.2.0
-		'tag_base'                        => '',
-
-		// 2.5.0
-		'show_avatars'                    => '1',
-		'avatar_rating'                   => 'G',
-		'upload_url_path'                 => '',
-		'thumbnail_size_w'                => 150,
-		'thumbnail_size_h'                => 150,
-		'thumbnail_crop'                  => 1,
-		'medium_size_w'                   => 300,
-		'medium_size_h'                   => 300,
-
-		// 2.6.0
-		'avatar_default'                  => 'mystery',
-
-		// 2.7.0
-		'large_size_w'                    => 1024,
-		'large_size_h'                    => 1024,
-		'image_default_link_type'         => 'none',
-		'image_default_size'              => '',
-		'image_default_align'             => '',
-		'close_comments_for_old_posts'    => 0,
-		'close_comments_days_old'         => 14,
-		'thread_comments'                 => 1,
-		'thread_comments_depth'           => 5,
-		'page_comments'                   => 0,
-		'comments_per_page'               => 50,
-		'default_comments_page'           => 'newest',
-		'comment_order'                   => 'asc',
-		'sticky_posts'                    => array(),
-		'widget_categories'               => array(),
-		'widget_text'                     => array(),
-		'widget_rss'                      => array(),
-		'uninstall_plugins'               => array(),
-
-		// 2.8.0
-		'timezone_string'                 => $timezone_string,
-
-		// 3.0.0
-		'page_for_posts'                  => 0,
-		'page_on_front'                   => 0,
-
-		// 3.1.0
-		'default_post_format'             => 0,
-
-		// 3.5.0
-		'link_manager_enabled'            => 0,
-
-		// 4.3.0
-		'finished_splitting_shared_terms' => 1,
-		'site_icon'                       => 0,
-
-		// 4.4.0
-		'medium_large_size_w'             => 768,
-		'medium_large_size_h'             => 0,
-
-		// 4.9.6
-		'wp_page_for_privacy_policy'      => 0,
-
-		// 4.9.8
-		'show_comments_cookies_opt_in'    => 1,
-
-		// 5.3.0
-		'admin_email_lifespan'            => ( time() + 6 * MONTH_IN_SECONDS ),
-
-		// 5.5.0
-		'disallowed_keys'                 => '',
-		'comment_previously_approved'     => 1,
-		'auto_plugin_theme_update_emails' => array(),
-
-		// 5.6.0
-		'auto_update_core_dev'            => 'enabled',
-		'auto_update_core_minor'          => 'enabled',
-		// Default to enabled for new installs.
-		// See https://core.trac.wordpress.org/ticket/51742.
-		'auto_update_core_major'          => 'enabled',
-
-		// 5.8.0
-		'wp_force_deactivated_plugins'    => array(),
-	);
-
-	// 3.3.0
-	if ( ! is_multisite() ) {
-		$defaults['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
-			? $wp_current_db_version : $wp_db_version;
-	}
-
-	// 3.0.0 multisite.
-	if ( is_multisite() ) {
-		/* translators: %s: Network title. */
-		$defaults['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_name );
-		$defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
-	}
-
-	$options = wp_parse_args( $options, $defaults );
-
-	// Set autoload to no for these options.
-	$fat_options = array(
-		'moderation_keys',
-		'recently_edited',
-		'disallowed_keys',
-		'uninstall_plugins',
-		'auto_plugin_theme_update_emails',
-	);
-
-	$keys             = "'" . implode( "', '", array_keys( $options ) ) . "'";
-	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-
-	$insert = '';
-
-	foreach ( $options as $option => $value ) {
-		if ( in_array( $option, $existing_options, true ) ) {
-			continue;
-		}
-
-		if ( in_array( $option, $fat_options, true ) ) {
-			$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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-	}
-
-	// In case it is set, but blank, update "home".
-	if ( ! __get_option( 'home' ) ) {
-		update_option( 'home', $guessurl );
-	}
-
-	// Delete unused options.
-	$unusedoptions = array(
-		'blodotgsping_url',
-		'bodyterminator',
-		'emailtestonly',
-		'phoneemail_separator',
-		'smilies_directory',
-		'subjectprefix',
-		'use_bbcode',
-		'use_blodotgsping',
-		'use_phoneemail',
-		'use_quicktags',
-		'use_weblogsping',
-		'weblogs_cache_file',
-		'use_preview',
-		'use_htmltrans',
-		'smilies_directory',
-		'fileupload_allowedusers',
-		'use_phoneemail',
-		'default_post_status',
-		'default_post_category',
-		'archive_mode',
-		'time_difference',
-		'links_minadminlevel',
-		'links_use_adminlevels',
-		'links_rating_type',
-		'links_rating_char',
-		'links_rating_ignore_zero',
-		'links_rating_single_image',
-		'links_rating_image0',
-		'links_rating_image1',
-		'links_rating_image2',
-		'links_rating_image3',
-		'links_rating_image4',
-		'links_rating_image5',
-		'links_rating_image6',
-		'links_rating_image7',
-		'links_rating_image8',
-		'links_rating_image9',
-		'links_recently_updated_time',
-		'links_recently_updated_prepend',
-		'links_recently_updated_append',
-		'weblogs_cacheminutes',
-		'comment_allowed_tags',
-		'search_engine_friendly_urls',
-		'default_geourl_lat',
-		'default_geourl_lon',
-		'use_default_geourl',
-		'weblogs_xml_url',
-		'new_users_can_blog',
-		'_wpnonce',
-		'_wp_http_referer',
-		'Update',
-		'action',
-		'rich_editing',
-		'autosave_interval',
-		'deactivated_plugins',
-		'can_compress_scripts',
-		'page_uris',
-		'update_core',
-		'update_plugins',
-		'update_themes',
-		'doing_cron',
-		'random_seed',
-		'rss_excerpt_length',
-		'secret',
-		'use_linksupdate',
-		'default_comment_status_page',
-		'wporg_popular_tags',
-		'what_to_show',
-		'rss_language',
-		'language',
-		'enable_xmlrpc',
-		'enable_app',
-		'embed_autourls',
-		'default_post_edit_rows',
-		'gzipcompression',
-		'advanced_edit',
-	);
-	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)?$'" );
-
-	// Clear expired transients.
-	delete_expired_transients( true );
+    $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(), true ) ) {
+            $timezone_string = $offset_or_tz;
+    }
+
+    $defaults = array(
+        'siteurl'                         => $guessurl,
+        'home'                            => $guessurl,
+        'blogname'                        => __( 'My Site' ),
+        /* translators: Site tagline. */
+        'blogdescription'                 => __( 'Just another WordPress site' ),
+        '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' ),
+        'use_balanceTags'                 => 0,
+        'use_smilies'                     => 1,
+        'require_name_email'              => 1,
+        'comments_notify'                 => 1,
+        'posts_per_rss'                   => 10,
+        'rss_use_excerpt'                 => 0,
+        'mailserver_url'                  => 'mail.example.com',
+        'mailserver_login'                => 'login@example.com',
+        'mailserver_pass'                 => 'password',
+        'mailserver_port'                 => 110,
+        'default_category'                => 1,
+        'default_comment_status'          => 'open',
+        'default_ping_status'             => 'open',
+        'default_pingback_flag'           => 1,
+        'posts_per_page'                  => 10,
+        /* translators: Default date format, see https://www.php.net/manual/datetime.format.php */
+        'date_format'                     => __( 'F j, Y' ),
+        /* translators: Default time format, see https://www.php.net/manual/datetime.format.php */
+        'time_format'                     => __( 'g:i a' ),
+        /* translators: Links last updated date format, see https://www.php.net/manual/datetime.format.php */
+        'links_updated_date_format'       => __( 'F j, Y g:i a' ),
+        'comment_moderation'              => 0,
+        'moderation_notify'               => 1,
+        'permalink_structure'             => '',
+        'rewrite_rules'                   => '',
+        'hack_file'                       => 0,
+        'blog_charset'                    => 'UTF-8',
+        'moderation_keys'                 => '',
+        'active_plugins'                  => array(),
+        'category_base'                   => '',
+        'ping_sites'                      => 'http://rpc.pingomatic.com/',
+        'comment_max_links'               => 2,
+        'gmt_offset'                      => $gmt_offset,
+
+        // 1.5.0
+        'default_email_category'          => 1,
+        'recently_edited'                 => '',
+        'template'                        => $template,
+        'stylesheet'                      => $stylesheet,
+        'comment_registration'            => 0,
+        'html_type'                       => 'text/html',
+
+        // 1.5.1
+        'use_trackback'                   => 0,
+
+        // 2.0.0
+        'default_role'                    => 'subscriber',
+        'db_version'                      => $wp_db_version,
+
+        // 2.0.1
+        'uploads_use_yearmonth_folders'   => 1,
+        'upload_path'                     => '',
+
+        // 2.1.0
+        'blog_public'                     => '1',
+        'default_link_category'           => 2,
+        'show_on_front'                   => 'posts',
+
+        // 2.2.0
+        'tag_base'                        => '',
+
+        // 2.5.0
+        'show_avatars'                    => '1',
+        'avatar_rating'                   => 'G',
+        'upload_url_path'                 => '',
+        'thumbnail_size_w'                => 150,
+        'thumbnail_size_h'                => 150,
+        'thumbnail_crop'                  => 1,
+        'medium_size_w'                   => 300,
+        'medium_size_h'                   => 300,
+
+        // 2.6.0
+        'avatar_default'                  => 'mystery',
+
+        // 2.7.0
+        'large_size_w'                    => 1024,
+        'large_size_h'                    => 1024,
+        'image_default_link_type'         => 'none',
+        'image_default_size'              => '',
+        'image_default_align'             => '',
+        'close_comments_for_old_posts'    => 0,
+        'close_comments_days_old'         => 14,
+        'thread_comments'                 => 1,
+        'thread_comments_depth'           => 5,
+        'page_comments'                   => 0,
+        'comments_per_page'               => 50,
+        'default_comments_page'           => 'newest',
+        'comment_order'                   => 'asc',
+        'sticky_posts'                    => array(),
+        'widget_categories'               => array(),
+        'widget_text'                     => array(),
+        'widget_rss'                      => array(),
+        'uninstall_plugins'               => array(),
+
+        // 2.8.0
+        'timezone_string'                 => $timezone_string,
+
+        // 3.0.0
+        'page_for_posts'                  => 0,
+        'page_on_front'                   => 0,
+
+        // 3.1.0
+        'default_post_format'             => 0,
+
+        // 3.5.0
+        'link_manager_enabled'            => 0,
+
+        // 4.3.0
+        'finished_splitting_shared_terms' => 1,
+        'site_icon'                       => 0,
+
+        // 4.4.0
+        'medium_large_size_w'             => 768,
+        'medium_large_size_h'             => 0,
+
+        // 4.9.6
+        'wp_page_for_privacy_policy'      => 0,
+
+        // 4.9.8
+        'show_comments_cookies_opt_in'    => 1,
+
+        // 5.3.0
+        'admin_email_lifespan'            => ( time() + 6 * MONTH_IN_SECONDS ),
+
+        // 5.5.0
+        'disallowed_keys'                 => '',
+        'comment_previously_approved'     => 1,
+        'auto_plugin_theme_update_emails' => array(),
+
+        // 5.6.0
+        'auto_update_core_dev'            => 'enabled',
+        'auto_update_core_minor'          => 'enabled',
+        // Default to enabled for new installs.
+        // See https://core.trac.wordpress.org/ticket/51742.
+        'auto_update_core_major'          => 'enabled',
+
+        // 5.8.0
+        'wp_force_deactivated_plugins'    => array(),
+    );
+
+    // 3.3.0
+    if ( ! is_multisite() ) {
+        $defaults['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+            ? $wp_current_db_version : $wp_db_version;
+    }
+
+    // 3.0.0 multisite.
+    if ( is_multisite() ) {
+        /* translators: %s: Network title. */
+        $defaults['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_name );
+        $defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
+    }
+
+    $options = wp_parse_args( $options, $defaults );
+
+    // Set autoload to no for these options.
+    $fat_options = array(
+        'moderation_keys',
+        'recently_edited',
+        'disallowed_keys',
+        'uninstall_plugins',
+        'auto_plugin_theme_update_emails',
+    );
+
+    $keys             = "'" . implode( "', '", array_keys( $options ) ) . "'";
+    $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
+    $insert = '';
+
+    foreach ( $options as $option => $value ) {
+        if ( in_array( $option, $existing_options, true ) ) {
+            continue;
+        }
+
+        if ( in_array( $option, $fat_options, true ) ) {
+            $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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+    }
+
+    // In case it is set, but blank, update "home".
+    if ( ! __get_option( 'home' ) ) {
+        update_option( 'home', $guessurl );
+    }
+
+    // Delete unused options.
+    $unusedoptions = array(
+        'blodotgsping_url',
+        'bodyterminator',
+        'emailtestonly',
+        'phoneemail_separator',
+        'smilies_directory',
+        'subjectprefix',
+        'use_bbcode',
+        'use_blodotgsping',
+        'use_phoneemail',
+        'use_quicktags',
+        'use_weblogsping',
+        'weblogs_cache_file',
+        'use_preview',
+        'use_htmltrans',
+        'smilies_directory',
+        'fileupload_allowedusers',
+        'use_phoneemail',
+        'default_post_status',
+        'default_post_category',
+        'archive_mode',
+        'time_difference',
+        'links_minadminlevel',
+        'links_use_adminlevels',
+        'links_rating_type',
+        'links_rating_char',
+        'links_rating_ignore_zero',
+        'links_rating_single_image',
+        'links_rating_image0',
+        'links_rating_image1',
+        'links_rating_image2',
+        'links_rating_image3',
+        'links_rating_image4',
+        'links_rating_image5',
+        'links_rating_image6',
+        'links_rating_image7',
+        'links_rating_image8',
+        'links_rating_image9',
+        'links_recently_updated_time',
+        'links_recently_updated_prepend',
+        'links_recently_updated_append',
+        'weblogs_cacheminutes',
+        'comment_allowed_tags',
+        'search_engine_friendly_urls',
+        'default_geourl_lat',
+        'default_geourl_lon',
+        'use_default_geourl',
+        'weblogs_xml_url',
+        'new_users_can_blog',
+        '_wpnonce',
+        '_wp_http_referer',
+        'Update',
+        'action',
+        'rich_editing',
+        'autosave_interval',
+        'deactivated_plugins',
+        'can_compress_scripts',
+        'page_uris',
+        'update_core',
+        'update_plugins',
+        'update_themes',
+        'doing_cron',
+        'random_seed',
+        'rss_excerpt_length',
+        'secret',
+        'use_linksupdate',
+        'default_comment_status_page',
+        'wporg_popular_tags',
+        'what_to_show',
+        'rss_language',
+        'language',
+        'enable_xmlrpc',
+        'enable_app',
+        'embed_autourls',
+        'default_post_edit_rows',
+        'gzipcompression',
+        'advanced_edit',
+    );
+    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)?$'" );
+
+    // Clear expired transients.
+    delete_expired_transients( true );
 }
 
 /**
@@ -703,14 +703,14 @@ 
  * @since 2.0.0
  */
 function populate_roles() {
-	populate_roles_160();
-	populate_roles_210();
-	populate_roles_230();
-	populate_roles_250();
-	populate_roles_260();
-	populate_roles_270();
-	populate_roles_280();
-	populate_roles_300();
+    populate_roles_160();
+    populate_roles_210();
+    populate_roles_230();
+    populate_roles_250();
+    populate_roles_260();
+    populate_roles_270();
+    populate_roles_280();
+    populate_roles_300();
 }
 
 /**
@@ -719,90 +719,90 @@ 
  * @since 2.0.0
  */
 function populate_roles_160() {
-	// Add roles.
-	add_role( 'administrator', 'Administrator' );
-	add_role( 'editor', 'Editor' );
-	add_role( 'author', 'Author' );
-	add_role( 'contributor', 'Contributor' );
-	add_role( 'subscriber', 'Subscriber' );
-
-	// Add caps for Administrator role.
-	$role = get_role( 'administrator' );
-	$role->add_cap( 'switch_themes' );
-	$role->add_cap( 'edit_themes' );
-	$role->add_cap( 'activate_plugins' );
-	$role->add_cap( 'edit_plugins' );
-	$role->add_cap( 'edit_users' );
-	$role->add_cap( 'edit_files' );
-	$role->add_cap( 'manage_options' );
-	$role->add_cap( 'moderate_comments' );
-	$role->add_cap( 'manage_categories' );
-	$role->add_cap( 'manage_links' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'import' );
-	$role->add_cap( 'unfiltered_html' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_others_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'edit_pages' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_10' );
-	$role->add_cap( 'level_9' );
-	$role->add_cap( 'level_8' );
-	$role->add_cap( 'level_7' );
-	$role->add_cap( 'level_6' );
-	$role->add_cap( 'level_5' );
-	$role->add_cap( 'level_4' );
-	$role->add_cap( 'level_3' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
-
-	// Add caps for Editor role.
-	$role = get_role( 'editor' );
-	$role->add_cap( 'moderate_comments' );
-	$role->add_cap( 'manage_categories' );
-	$role->add_cap( 'manage_links' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'unfiltered_html' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_others_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'edit_pages' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_7' );
-	$role->add_cap( 'level_6' );
-	$role->add_cap( 'level_5' );
-	$role->add_cap( 'level_4' );
-	$role->add_cap( 'level_3' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
-
-	// Add caps for Author role.
-	$role = get_role( 'author' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
-
-	// Add caps for Contributor role.
-	$role = get_role( 'contributor' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
-
-	// Add caps for Subscriber role.
-	$role = get_role( 'subscriber' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_0' );
+    // Add roles.
+    add_role( 'administrator', 'Administrator' );
+    add_role( 'editor', 'Editor' );
+    add_role( 'author', 'Author' );
+    add_role( 'contributor', 'Contributor' );
+    add_role( 'subscriber', 'Subscriber' );
+
+    // Add caps for Administrator role.
+    $role = get_role( 'administrator' );
+    $role->add_cap( 'switch_themes' );
+    $role->add_cap( 'edit_themes' );
+    $role->add_cap( 'activate_plugins' );
+    $role->add_cap( 'edit_plugins' );
+    $role->add_cap( 'edit_users' );
+    $role->add_cap( 'edit_files' );
+    $role->add_cap( 'manage_options' );
+    $role->add_cap( 'moderate_comments' );
+    $role->add_cap( 'manage_categories' );
+    $role->add_cap( 'manage_links' );
+    $role->add_cap( 'upload_files' );
+    $role->add_cap( 'import' );
+    $role->add_cap( 'unfiltered_html' );
+    $role->add_cap( 'edit_posts' );
+    $role->add_cap( 'edit_others_posts' );
+    $role->add_cap( 'edit_published_posts' );
+    $role->add_cap( 'publish_posts' );
+    $role->add_cap( 'edit_pages' );
+    $role->add_cap( 'read' );
+    $role->add_cap( 'level_10' );
+    $role->add_cap( 'level_9' );
+    $role->add_cap( 'level_8' );
+    $role->add_cap( 'level_7' );
+    $role->add_cap( 'level_6' );
+    $role->add_cap( 'level_5' );
+    $role->add_cap( 'level_4' );
+    $role->add_cap( 'level_3' );
+    $role->add_cap( 'level_2' );
+    $role->add_cap( 'level_1' );
+    $role->add_cap( 'level_0' );
+
+    // Add caps for Editor role.
+    $role = get_role( 'editor' );
+    $role->add_cap( 'moderate_comments' );
+    $role->add_cap( 'manage_categories' );
+    $role->add_cap( 'manage_links' );
+    $role->add_cap( 'upload_files' );
+    $role->add_cap( 'unfiltered_html' );
+    $role->add_cap( 'edit_posts' );
+    $role->add_cap( 'edit_others_posts' );
+    $role->add_cap( 'edit_published_posts' );
+    $role->add_cap( 'publish_posts' );
+    $role->add_cap( 'edit_pages' );
+    $role->add_cap( 'read' );
+    $role->add_cap( 'level_7' );
+    $role->add_cap( 'level_6' );
+    $role->add_cap( 'level_5' );
+    $role->add_cap( 'level_4' );
+    $role->add_cap( 'level_3' );
+    $role->add_cap( 'level_2' );
+    $role->add_cap( 'level_1' );
+    $role->add_cap( 'level_0' );
+
+    // Add caps for Author role.
+    $role = get_role( 'author' );
+    $role->add_cap( 'upload_files' );
+    $role->add_cap( 'edit_posts' );
+    $role->add_cap( 'edit_published_posts' );
+    $role->add_cap( 'publish_posts' );
+    $role->add_cap( 'read' );
+    $role->add_cap( 'level_2' );
+    $role->add_cap( 'level_1' );
+    $role->add_cap( 'level_0' );
+
+    // Add caps for Contributor role.
+    $role = get_role( 'contributor' );
+    $role->add_cap( 'edit_posts' );
+    $role->add_cap( 'read' );
+    $role->add_cap( 'level_1' );
+    $role->add_cap( 'level_0' );
+
+    // Add caps for Subscriber role.
+    $role = get_role( 'subscriber' );
+    $role->add_cap( 'read' );
+    $role->add_cap( 'level_0' );
 }
 
 /**
@@ -811,46 +811,46 @@ 
  * @since 2.1.0
  */
 function populate_roles_210() {
-	$roles = array( 'administrator', 'editor' );
-	foreach ( $roles as $role ) {
-		$role = get_role( $role );
-		if ( empty( $role ) ) {
-			continue;
-		}
-
-		$role->add_cap( 'edit_others_pages' );
-		$role->add_cap( 'edit_published_pages' );
-		$role->add_cap( 'publish_pages' );
-		$role->add_cap( 'delete_pages' );
-		$role->add_cap( 'delete_others_pages' );
-		$role->add_cap( 'delete_published_pages' );
-		$role->add_cap( 'delete_posts' );
-		$role->add_cap( 'delete_others_posts' );
-		$role->add_cap( 'delete_published_posts' );
-		$role->add_cap( 'delete_private_posts' );
-		$role->add_cap( 'edit_private_posts' );
-		$role->add_cap( 'read_private_posts' );
-		$role->add_cap( 'delete_private_pages' );
-		$role->add_cap( 'edit_private_pages' );
-		$role->add_cap( 'read_private_pages' );
-	}
-
-	$role = get_role( 'administrator' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_users' );
-		$role->add_cap( 'create_users' );
-	}
-
-	$role = get_role( 'author' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_posts' );
-		$role->add_cap( 'delete_published_posts' );
-	}
-
-	$role = get_role( 'contributor' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_posts' );
-	}
+    $roles = array( 'administrator', 'editor' );
+    foreach ( $roles as $role ) {
+        $role = get_role( $role );
+        if ( empty( $role ) ) {
+            continue;
+        }
+
+        $role->add_cap( 'edit_others_pages' );
+        $role->add_cap( 'edit_published_pages' );
+        $role->add_cap( 'publish_pages' );
+        $role->add_cap( 'delete_pages' );
+        $role->add_cap( 'delete_others_pages' );
+        $role->add_cap( 'delete_published_pages' );
+        $role->add_cap( 'delete_posts' );
+        $role->add_cap( 'delete_others_posts' );
+        $role->add_cap( 'delete_published_posts' );
+        $role->add_cap( 'delete_private_posts' );
+        $role->add_cap( 'edit_private_posts' );
+        $role->add_cap( 'read_private_posts' );
+        $role->add_cap( 'delete_private_pages' );
+        $role->add_cap( 'edit_private_pages' );
+        $role->add_cap( 'read_private_pages' );
+    }
+
+    $role = get_role( 'administrator' );
+    if ( ! empty( $role ) ) {
+        $role->add_cap( 'delete_users' );
+        $role->add_cap( 'create_users' );
+    }
+
+    $role = get_role( 'author' );
+    if ( ! empty( $role ) ) {
+        $role->add_cap( 'delete_posts' );
+        $role->add_cap( 'delete_published_posts' );
+    }
+
+    $role = get_role( 'contributor' );
+    if ( ! empty( $role ) ) {
+        $role->add_cap( 'delete_posts' );
+    }
 }
 
 /**
@@ -859,11 +859,11 @@ 
  * @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' );
+    }
 }
 
 /**
@@ -872,11 +872,11 @@ 
  * @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' );
+    }
 }
 
 /**
@@ -885,12 +885,12 @@ 
  * @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' );
+    }
 }
 
 /**
@@ -899,12 +899,12 @@ 
  * @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' );
+    }
 }
 
 /**
@@ -913,11 +913,11 @@ 
  * @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' );
+    }
 }
 
 /**
@@ -926,32 +926,32 @@ 
  * @since 3.0.0
  */
 function populate_roles_300() {
-	$role = get_role( 'administrator' );
-
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'update_core' );
-		$role->add_cap( 'list_users' );
-		$role->add_cap( 'remove_users' );
-		$role->add_cap( 'promote_users' );
-		$role->add_cap( 'edit_theme_options' );
-		$role->add_cap( 'delete_themes' );
-		$role->add_cap( 'export' );
-	}
+    $role = get_role( 'administrator' );
+
+    if ( ! empty( $role ) ) {
+        $role->add_cap( 'update_core' );
+        $role->add_cap( 'list_users' );
+        $role->add_cap( 'remove_users' );
+        $role->add_cap( 'promote_users' );
+        $role->add_cap( 'edit_theme_options' );
+        $role->add_cap( 'delete_themes' );
+        $role->add_cap( 'export' );
+    }
 }
 
 if ( ! function_exists( 'install_network' ) ) :
-	/**
-	 * Install Network.
-	 *
-	 * @since 3.0.0
-	 */
-	function install_network() {
-		if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
-			define( 'WP_INSTALLING_NETWORK', true );
-		}
-
-		dbDelta( wp_get_db_schema( 'global' ) );
-	}
+    /**
+     * Install Network.
+     *
+     * @since 3.0.0
+     */
+    function install_network() {
+        if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
+            define( 'WP_INSTALLING_NETWORK', true );
+        }
+
+        dbDelta( wp_get_db_schema( 'global' ) );
+    }
 endif;
 
 /**
@@ -974,148 +974,148 @@ 
  *                       so the error code must be checked) or failure.
  */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
-	global $wpdb, $current_site, $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.' ) );
-	}
-
-	// Check for network collision.
-	$network_exists = false;
-	if ( is_multisite() ) {
-		if ( get_network( (int) $network_id ) ) {
-			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
-		}
-	} else {
-		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 ( ! is_email( $email ) ) {
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
-	}
-
-	if ( $errors->has_errors() ) {
-		return $errors;
-	}
-
-	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,
-			)
-		);
-	}
-
-	populate_network_meta(
-		$network_id,
-		array(
-			'admin_email'       => $email,
-			'site_name'         => $site_name,
-			'subdomain_install' => $subdomain_install,
-		)
-	);
-
-	$site_user = get_userdata( (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id ) ) );
-
-	/*
+    global $wpdb, $current_site, $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.' ) );
+    }
+
+    // Check for network collision.
+    $network_exists = false;
+    if ( is_multisite() ) {
+        if ( get_network( (int) $network_id ) ) {
+            $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+        }
+    } else {
+        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 ( ! is_email( $email ) ) {
+        $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+    }
+
+    if ( $errors->has_errors() ) {
+        return $errors;
+    }
+
+    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,
+            )
+        );
+    }
+
+    populate_network_meta(
+        $network_id,
+        array(
+            'admin_email'       => $email,
+            'site_name'         => $site_name,
+            'subdomain_install' => $subdomain_install,
+        )
+    );
+
+    $site_user = get_userdata( (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id ) ) );
+
+    /*
 	 * When upgrading from single to multisite, assume the current site will
 	 * become the main site of the network. When using populate_network()
 	 * to create another network in an existing multisite environment, skip
 	 * these steps since the main site of the new network has not yet been
 	 * created.
 	 */
-	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->blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $current_site->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%/' );
-		}
-
-		flush_rewrite_rules();
-
-		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 ( ! $vhost_ok ) {
-			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
-
-			$msg .= '<p>' . sprintf(
-				/* translators: %s: Host name. */
-				__( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
-				'<code>' . $hostname . '</code>'
-			);
-			if ( ! empty( $errstr ) ) {
-				/* translators: %s: Error message. */
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
-			}
-			$msg .= '</p>';
-
-			$msg .= '<p>' . sprintf(
-				/* translators: %s: Asterisk symbol (*). */
-				__( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
-				'<code>*</code>'
-			) . '</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 );
-		}
-	}
-
-	return true;
+    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->blog_id = $wpdb->insert_id;
+        update_user_meta( $site_user->ID, 'source_domain', $domain );
+        update_user_meta( $site_user->ID, 'primary_blog', $current_site->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%/' );
+        }
+
+        flush_rewrite_rules();
+
+        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 ( ! $vhost_ok ) {
+            $msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
+
+            $msg .= '<p>' . sprintf(
+                /* translators: %s: Host name. */
+                __( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
+                '<code>' . $hostname . '</code>'
+            );
+            if ( ! empty( $errstr ) ) {
+                /* translators: %s: Error message. */
+                $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+            }
+            $msg .= '</p>';
+
+            $msg .= '<p>' . sprintf(
+                /* translators: %s: Asterisk symbol (*). */
+                __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
+                '<code>*</code>'
+            ) . '</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 );
+        }
+    }
+
+    return true;
 }
 
 /**
@@ -1130,71 +1130,71 @@ 
  * @param array $meta       Optional. Custom meta $key => $value pairs to use. Default empty array.
  */
 function populate_network_meta( $network_id, array $meta = array() ) {
-	global $wpdb, $wp_db_version;
-
-	$network_id = (int) $network_id;
-
-	$email             = ! empty( $meta['admin_email'] ) ? $meta['admin_email'] : '';
-	$subdomain_install = isset( $meta['subdomain_install'] ) ? (int) $meta['subdomain_install'] : 0;
-
-	// If a user with the provided email does not exist, default to the current user as the new network admin.
-	$site_user = ! empty( $email ) ? get_user_by( 'email', $email ) : false;
-	if ( false === $site_user ) {
-		$site_user = wp_get_current_user();
-	}
-
-	if ( empty( $email ) ) {
-		$email = $site_user->user_email;
-	}
-
-	$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 WP_DEFAULT_THEME doesn't exist, also include the latest core default theme.
-	if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
-		$core_default = WP_Theme::get_core_default_theme();
-		if ( $core_default ) {
-			$allowed_themes[ $core_default->get_stylesheet() ] = true;
-		}
-	}
-
-	if ( function_exists( 'clean_network_cache' ) ) {
-		clean_network_cache( $network_id );
-	} else {
-		wp_cache_delete( $network_id, 'networks' );
-	}
-
-	if ( ! is_multisite() ) {
-		$site_admins = array( $site_user->user_login );
-		$users       = get_users(
-			array(
-				'fields' => array( 'user_login' ),
-				'role'   => 'administrator',
-			)
-		);
-		if ( $users ) {
-			foreach ( $users as $user ) {
-				$site_admins[] = $user->user_login;
-			}
-
-			$site_admins = array_unique( $site_admins );
-		}
-	} else {
-		$site_admins = get_site_option( 'site_admins' );
-	}
-
-	/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-	$welcome_email = __(
-		'Howdy USERNAME,
+    global $wpdb, $wp_db_version;
+
+    $network_id = (int) $network_id;
+
+    $email             = ! empty( $meta['admin_email'] ) ? $meta['admin_email'] : '';
+    $subdomain_install = isset( $meta['subdomain_install'] ) ? (int) $meta['subdomain_install'] : 0;
+
+    // If a user with the provided email does not exist, default to the current user as the new network admin.
+    $site_user = ! empty( $email ) ? get_user_by( 'email', $email ) : false;
+    if ( false === $site_user ) {
+        $site_user = wp_get_current_user();
+    }
+
+    if ( empty( $email ) ) {
+        $email = $site_user->user_email;
+    }
+
+    $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 WP_DEFAULT_THEME doesn't exist, also include the latest core default theme.
+    if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
+        $core_default = WP_Theme::get_core_default_theme();
+        if ( $core_default ) {
+            $allowed_themes[ $core_default->get_stylesheet() ] = true;
+        }
+    }
+
+    if ( function_exists( 'clean_network_cache' ) ) {
+        clean_network_cache( $network_id );
+    } else {
+        wp_cache_delete( $network_id, 'networks' );
+    }
+
+    if ( ! is_multisite() ) {
+        $site_admins = array( $site_user->user_login );
+        $users       = get_users(
+            array(
+                'fields' => array( 'user_login' ),
+                'role'   => 'administrator',
+            )
+        );
+        if ( $users ) {
+            foreach ( $users as $user ) {
+                $site_admins[] = $user->user_login;
+            }
+
+            $site_admins = array_unique( $site_admins );
+        }
+    } else {
+        $site_admins = get_site_option( 'site_admins' );
+    }
+
+    /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
+    $welcome_email = __(
+        'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1208,95 +1208,95 @@ 
 We hope you enjoy your new site. Thanks!
 
 --The Team @ SITE_NAME'
-	);
-
-	$misc_exts        = array(
-		// Images.
-		'jpg',
-		'jpeg',
-		'png',
-		'gif',
-		'webp',
-		// Video.
-		'mov',
-		'avi',
-		'mpg',
-		'3gp',
-		'3g2',
-		// "audio".
-		'midi',
-		'mid',
-		// Miscellaneous.
-		'pdf',
-		'doc',
-		'ppt',
-		'odt',
-		'pptx',
-		'docx',
-		'pps',
-		'ppsx',
-		'xls',
-		'xlsx',
-		'key',
-	);
-	$audio_exts       = wp_get_audio_extensions();
-	$video_exts       = wp_get_video_extensions();
-	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
-
-	$sitemeta = array(
-		'site_name'                   => __( 'My Network' ),
-		'admin_email'                 => $email,
-		'admin_user_id'               => $site_user->ID,
-		'registration'                => 'none',
-		'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' ),
-		'wpmu_upgrade_site'           => $wp_db_version,
-		'welcome_email'               => $welcome_email,
-		/* translators: %s: Site link. */
-		'first_post'                  => __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ),
-		// @todo - Network admins should have a method of editing the network siteurl (used for cookie hash).
-		'siteurl'                     => get_option( 'siteurl' ) . '/',
-		'add_new_users'               => '0',
-		'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-		'subdomain_install'           => $subdomain_install,
-		'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'user_count'                  => get_site_option( 'user_count' ),
-		'initial_db_version'          => get_option( 'initial_db_version' ),
-		'active_sitewide_plugins'     => array(),
-		'WPLANG'                      => get_locale(),
-	);
-	if ( ! $subdomain_install ) {
-		$sitemeta['illegal_names'][] = 'blog';
-	}
-
-	$sitemeta = wp_parse_args( $meta, $sitemeta );
-
-	/**
-	 * Filters meta for a network on creation.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @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 );
-
-	$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 );
-	}
-	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+    );
+
+    $misc_exts        = array(
+        // Images.
+        'jpg',
+        'jpeg',
+        'png',
+        'gif',
+        'webp',
+        // Video.
+        'mov',
+        'avi',
+        'mpg',
+        '3gp',
+        '3g2',
+        // "audio".
+        'midi',
+        'mid',
+        // Miscellaneous.
+        'pdf',
+        'doc',
+        'ppt',
+        'odt',
+        'pptx',
+        'docx',
+        'pps',
+        'ppsx',
+        'xls',
+        'xlsx',
+        'key',
+    );
+    $audio_exts       = wp_get_audio_extensions();
+    $video_exts       = wp_get_video_extensions();
+    $upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
+
+    $sitemeta = array(
+        'site_name'                   => __( 'My Network' ),
+        'admin_email'                 => $email,
+        'admin_user_id'               => $site_user->ID,
+        'registration'                => 'none',
+        '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' ),
+        'wpmu_upgrade_site'           => $wp_db_version,
+        'welcome_email'               => $welcome_email,
+        /* translators: %s: Site link. */
+        'first_post'                  => __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ),
+        // @todo - Network admins should have a method of editing the network siteurl (used for cookie hash).
+        'siteurl'                     => get_option( 'siteurl' ) . '/',
+        'add_new_users'               => '0',
+        'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
+        'subdomain_install'           => $subdomain_install,
+        'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
+        'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
+        'user_count'                  => get_site_option( 'user_count' ),
+        'initial_db_version'          => get_option( 'initial_db_version' ),
+        'active_sitewide_plugins'     => array(),
+        'WPLANG'                      => get_locale(),
+    );
+    if ( ! $subdomain_install ) {
+        $sitemeta['illegal_names'][] = 'blog';
+    }
+
+    $sitemeta = wp_parse_args( $meta, $sitemeta );
+
+    /**
+     * Filters meta for a network on creation.
+     *
+     * @since 3.7.0
+     *
+     * @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 );
+
+    $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 );
+    }
+    $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 }
 
 /**
@@ -1310,41 +1310,41 @@ 
  * @param array $meta    Optional. Custom meta $key => $value pairs to use. Default empty array.
  */
 function populate_site_meta( $site_id, array $meta = array() ) {
-	global $wpdb;
-
-	$site_id = (int) $site_id;
-
-	if ( ! is_site_meta_supported() ) {
-		return;
-	}
-
-	if ( empty( $meta ) ) {
-		return;
-	}
-
-	/**
-	 * Filters meta for a site on creation.
-	 *
-	 * @since 5.2.0
-	 *
-	 * @param array $meta    Associative array of site meta keys and values to be inserted.
-	 * @param int   $site_id ID of site to populate.
-	 */
-	$site_meta = apply_filters( 'populate_site_meta', $meta, $site_id );
-
-	$insert = '';
-	foreach ( $site_meta 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)', $site_id, $meta_key, $meta_value );
-	}
-
-	$wpdb->query( "INSERT INTO $wpdb->blogmeta ( blog_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-
-	wp_cache_delete( $site_id, 'blog_meta' );
-	wp_cache_set_sites_last_changed();
+    global $wpdb;
+
+    $site_id = (int) $site_id;
+
+    if ( ! is_site_meta_supported() ) {
+        return;
+    }
+
+    if ( empty( $meta ) ) {
+        return;
+    }
+
+    /**
+     * Filters meta for a site on creation.
+     *
+     * @since 5.2.0
+     *
+     * @param array $meta    Associative array of site meta keys and values to be inserted.
+     * @param int   $site_id ID of site to populate.
+     */
+    $site_meta = apply_filters( 'populate_site_meta', $meta, $site_id );
+
+    $insert = '';
+    foreach ( $site_meta 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)', $site_id, $meta_key, $meta_value );
+    }
+
+    $wpdb->query( "INSERT INTO $wpdb->blogmeta ( blog_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
+    wp_cache_delete( $site_id, 'blog_meta' );
+    wp_cache_set_sites_last_changed();
 }

Spacing +274 added lines, -274 removed lines

@@ -33,17 +33,17 @@ 
  * @param int    $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site 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 = $wpdb->get_charset_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.
@@ -237,7 +237,7 @@ 
 ) $charset_collate;\n";
 
 	// Global tables.
-	if ( $is_multisite ) {
+	if ($is_multisite) {
 		$global_tables = $users_multi_table . $usermeta_table;
 	} else {
 		$global_tables = $users_single_table . $usermeta_table;
@@ -314,13 +314,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;
@@ -330,21 +330,21 @@ 
 		case 'all':
 		default:
 			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite ) {
+			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.
@@ -358,7 +358,7 @@ 
  *
  * @param array $options Optional. Custom option $key => $value pairs to use. Default empty array.
  */
-function populate_options( array $options = array() ) {
+function populate_options(array $options = array()) {
 	global $wpdb, $wp_db_version, $wp_current_db_version;
 
 	$guessurl = wp_guess_url();
@@ -367,18 +367,18 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'populate_options' );
+	do_action('populate_options');
 
 	// If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
 	$stylesheet = WP_DEFAULT_THEME;
 	$template   = WP_DEFAULT_THEME;
-	$theme      = wp_get_theme( WP_DEFAULT_THEME );
-	if ( ! $theme->exists() ) {
+	$theme      = wp_get_theme(WP_DEFAULT_THEME);
+	if (!$theme->exists()) {
 		$theme = WP_Theme::get_core_default_theme();
 	}
 
 	// If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
-	if ( $theme ) {
+	if ($theme) {
 		$stylesheet = $theme->get_stylesheet();
 		$template   = $theme->get_template();
 	}
@@ -390,23 +390,23 @@ 
 	 * or a valid timezone string (America/New_York). See https://www.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(), true ) ) {
+	} elseif ($offset_or_tz && in_array($offset_or_tz, timezone_identifiers_list(), true)) {
 			$timezone_string = $offset_or_tz;
 	}
 
 	$defaults = array(
 		'siteurl'                         => $guessurl,
 		'home'                            => $guessurl,
-		'blogname'                        => __( 'My Site' ),
+		'blogname'                        => __('My Site'),
 		/* translators: Site tagline. */
-		'blogdescription'                 => __( 'Just another WordPress site' ),
+		'blogdescription'                 => __('Just another WordPress site'),
 		'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,
@@ -423,11 +423,11 @@ 
 		'default_pingback_flag'           => 1,
 		'posts_per_page'                  => 10,
 		/* translators: Default date format, see https://www.php.net/manual/datetime.format.php */
-		'date_format'                     => __( 'F j, Y' ),
+		'date_format'                     => __('F j, Y'),
 		/* translators: Default time format, see https://www.php.net/manual/datetime.format.php */
-		'time_format'                     => __( 'g:i a' ),
+		'time_format'                     => __('g:i a'),
 		/* translators: Links last updated date format, see https://www.php.net/manual/datetime.format.php */
-		'links_updated_date_format'       => __( 'F j, Y g:i a' ),
+		'links_updated_date_format'       => __('F j, Y g:i a'),
 		'comment_moderation'              => 0,
 		'moderation_notify'               => 1,
 		'permalink_structure'             => '',
@@ -529,7 +529,7 @@ 
 		'show_comments_cookies_opt_in'    => 1,
 
 		// 5.3.0
-		'admin_email_lifespan'            => ( time() + 6 * MONTH_IN_SECONDS ),
+		'admin_email_lifespan'            => (time() + 6 * MONTH_IN_SECONDS),
 
 		// 5.5.0
 		'disallowed_keys'                 => '',
@@ -548,19 +548,19 @@ 
 	);
 
 	// 3.3.0
-	if ( ! is_multisite() ) {
-		$defaults['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+	if (!is_multisite()) {
+		$defaults['initial_db_version'] = !empty($wp_current_db_version) && $wp_current_db_version < $wp_db_version
 			? $wp_current_db_version : $wp_db_version;
 	}
 
 	// 3.0.0 multisite.
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		/* translators: %s: Network title. */
-		$defaults['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_name );
+		$defaults['blogdescription']     = sprintf(__('Just another %s site'), get_network()->site_name);
 		$defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 
-	$options = wp_parse_args( $options, $defaults );
+	$options = wp_parse_args($options, $defaults);
 
 	// Set autoload to no for these options.
 	$fat_options = array(
@@ -571,40 +571,40 @@ 
 		'auto_plugin_theme_update_emails',
 	);
 
-	$keys             = "'" . implode( "', '", array_keys( $options ) ) . "'";
-	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+	$keys             = "'" . implode("', '", array_keys($options)) . "'";
+	$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )"); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
 	$insert = '';
 
-	foreach ( $options as $option => $value ) {
-		if ( in_array( $option, $existing_options, true ) ) {
+	foreach ($options as $option => $value) {
+		if (in_array($option, $existing_options, true)) {
 			continue;
 		}
 
-		if ( in_array( $option, $fat_options, true ) ) {
+		if (in_array($option, $fat_options, true)) {
 			$autoload = 'no';
 		} else {
 			$autoload = 'yes';
 		}
 
-		if ( is_array( $value ) ) {
-			$value = serialize( $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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+	if (!empty($insert)) {
+		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 	}
 
 	// 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.
@@ -686,15 +686,15 @@ 
 		'gzipcompression',
 		'advanced_edit',
 	);
-	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)?$'" );
+	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
 
 	// Clear expired transients.
-	delete_expired_transients( true );
+	delete_expired_transients(true);
 }
 
 /**
@@ -720,89 +720,89 @@ 
  */
 function populate_roles_160() {
 	// Add roles.
-	add_role( 'administrator', 'Administrator' );
-	add_role( 'editor', 'Editor' );
-	add_role( 'author', 'Author' );
-	add_role( 'contributor', 'Contributor' );
-	add_role( 'subscriber', 'Subscriber' );
+	add_role('administrator', 'Administrator');
+	add_role('editor', 'Editor');
+	add_role('author', 'Author');
+	add_role('contributor', 'Contributor');
+	add_role('subscriber', 'Subscriber');
 
 	// Add caps for Administrator role.
-	$role = get_role( 'administrator' );
-	$role->add_cap( 'switch_themes' );
-	$role->add_cap( 'edit_themes' );
-	$role->add_cap( 'activate_plugins' );
-	$role->add_cap( 'edit_plugins' );
-	$role->add_cap( 'edit_users' );
-	$role->add_cap( 'edit_files' );
-	$role->add_cap( 'manage_options' );
-	$role->add_cap( 'moderate_comments' );
-	$role->add_cap( 'manage_categories' );
-	$role->add_cap( 'manage_links' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'import' );
-	$role->add_cap( 'unfiltered_html' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_others_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'edit_pages' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_10' );
-	$role->add_cap( 'level_9' );
-	$role->add_cap( 'level_8' );
-	$role->add_cap( 'level_7' );
-	$role->add_cap( 'level_6' );
-	$role->add_cap( 'level_5' );
-	$role->add_cap( 'level_4' );
-	$role->add_cap( 'level_3' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
+	$role = get_role('administrator');
+	$role->add_cap('switch_themes');
+	$role->add_cap('edit_themes');
+	$role->add_cap('activate_plugins');
+	$role->add_cap('edit_plugins');
+	$role->add_cap('edit_users');
+	$role->add_cap('edit_files');
+	$role->add_cap('manage_options');
+	$role->add_cap('moderate_comments');
+	$role->add_cap('manage_categories');
+	$role->add_cap('manage_links');
+	$role->add_cap('upload_files');
+	$role->add_cap('import');
+	$role->add_cap('unfiltered_html');
+	$role->add_cap('edit_posts');
+	$role->add_cap('edit_others_posts');
+	$role->add_cap('edit_published_posts');
+	$role->add_cap('publish_posts');
+	$role->add_cap('edit_pages');
+	$role->add_cap('read');
+	$role->add_cap('level_10');
+	$role->add_cap('level_9');
+	$role->add_cap('level_8');
+	$role->add_cap('level_7');
+	$role->add_cap('level_6');
+	$role->add_cap('level_5');
+	$role->add_cap('level_4');
+	$role->add_cap('level_3');
+	$role->add_cap('level_2');
+	$role->add_cap('level_1');
+	$role->add_cap('level_0');
 
 	// Add caps for Editor role.
-	$role = get_role( 'editor' );
-	$role->add_cap( 'moderate_comments' );
-	$role->add_cap( 'manage_categories' );
-	$role->add_cap( 'manage_links' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'unfiltered_html' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_others_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'edit_pages' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_7' );
-	$role->add_cap( 'level_6' );
-	$role->add_cap( 'level_5' );
-	$role->add_cap( 'level_4' );
-	$role->add_cap( 'level_3' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
+	$role = get_role('editor');
+	$role->add_cap('moderate_comments');
+	$role->add_cap('manage_categories');
+	$role->add_cap('manage_links');
+	$role->add_cap('upload_files');
+	$role->add_cap('unfiltered_html');
+	$role->add_cap('edit_posts');
+	$role->add_cap('edit_others_posts');
+	$role->add_cap('edit_published_posts');
+	$role->add_cap('publish_posts');
+	$role->add_cap('edit_pages');
+	$role->add_cap('read');
+	$role->add_cap('level_7');
+	$role->add_cap('level_6');
+	$role->add_cap('level_5');
+	$role->add_cap('level_4');
+	$role->add_cap('level_3');
+	$role->add_cap('level_2');
+	$role->add_cap('level_1');
+	$role->add_cap('level_0');
 
 	// Add caps for Author role.
-	$role = get_role( 'author' );
-	$role->add_cap( 'upload_files' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'edit_published_posts' );
-	$role->add_cap( 'publish_posts' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_2' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
+	$role = get_role('author');
+	$role->add_cap('upload_files');
+	$role->add_cap('edit_posts');
+	$role->add_cap('edit_published_posts');
+	$role->add_cap('publish_posts');
+	$role->add_cap('read');
+	$role->add_cap('level_2');
+	$role->add_cap('level_1');
+	$role->add_cap('level_0');
 
 	// Add caps for Contributor role.
-	$role = get_role( 'contributor' );
-	$role->add_cap( 'edit_posts' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_1' );
-	$role->add_cap( 'level_0' );
+	$role = get_role('contributor');
+	$role->add_cap('edit_posts');
+	$role->add_cap('read');
+	$role->add_cap('level_1');
+	$role->add_cap('level_0');
 
 	// Add caps for Subscriber role.
-	$role = get_role( 'subscriber' );
-	$role->add_cap( 'read' );
-	$role->add_cap( 'level_0' );
+	$role = get_role('subscriber');
+	$role->add_cap('read');
+	$role->add_cap('level_0');
 }
 
 /**
@@ -811,45 +811,45 @@ 
  * @since 2.1.0
  */
 function populate_roles_210() {
-	$roles = array( 'administrator', 'editor' );
-	foreach ( $roles as $role ) {
-		$role = get_role( $role );
-		if ( empty( $role ) ) {
+	$roles = array('administrator', 'editor');
+	foreach ($roles as $role) {
+		$role = get_role($role);
+		if (empty($role)) {
 			continue;
 		}
 
-		$role->add_cap( 'edit_others_pages' );
-		$role->add_cap( 'edit_published_pages' );
-		$role->add_cap( 'publish_pages' );
-		$role->add_cap( 'delete_pages' );
-		$role->add_cap( 'delete_others_pages' );
-		$role->add_cap( 'delete_published_pages' );
-		$role->add_cap( 'delete_posts' );
-		$role->add_cap( 'delete_others_posts' );
-		$role->add_cap( 'delete_published_posts' );
-		$role->add_cap( 'delete_private_posts' );
-		$role->add_cap( 'edit_private_posts' );
-		$role->add_cap( 'read_private_posts' );
-		$role->add_cap( 'delete_private_pages' );
-		$role->add_cap( 'edit_private_pages' );
-		$role->add_cap( 'read_private_pages' );
+		$role->add_cap('edit_others_pages');
+		$role->add_cap('edit_published_pages');
+		$role->add_cap('publish_pages');
+		$role->add_cap('delete_pages');
+		$role->add_cap('delete_others_pages');
+		$role->add_cap('delete_published_pages');
+		$role->add_cap('delete_posts');
+		$role->add_cap('delete_others_posts');
+		$role->add_cap('delete_published_posts');
+		$role->add_cap('delete_private_posts');
+		$role->add_cap('edit_private_posts');
+		$role->add_cap('read_private_posts');
+		$role->add_cap('delete_private_pages');
+		$role->add_cap('edit_private_pages');
+		$role->add_cap('read_private_pages');
 	}
 
-	$role = get_role( 'administrator' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_users' );
-		$role->add_cap( 'create_users' );
+	$role = get_role('administrator');
+	if (!empty($role)) {
+		$role->add_cap('delete_users');
+		$role->add_cap('create_users');
 	}
 
-	$role = get_role( 'author' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_posts' );
-		$role->add_cap( 'delete_published_posts' );
+	$role = get_role('author');
+	if (!empty($role)) {
+		$role->add_cap('delete_posts');
+		$role->add_cap('delete_published_posts');
 	}
 
-	$role = get_role( 'contributor' );
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'delete_posts' );
+	$role = get_role('contributor');
+	if (!empty($role)) {
+		$role->add_cap('delete_posts');
 	}
 }
 
@@ -859,10 +859,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');
 	}
 }
 
@@ -872,10 +872,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');
 	}
 }
 
@@ -885,11 +885,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');
 	}
 }
 
@@ -899,11 +899,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');
 	}
 }
 
@@ -913,10 +913,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');
 	}
 }
 
@@ -926,31 +926,31 @@ 
  * @since 3.0.0
  */
 function populate_roles_300() {
-	$role = get_role( 'administrator' );
-
-	if ( ! empty( $role ) ) {
-		$role->add_cap( 'update_core' );
-		$role->add_cap( 'list_users' );
-		$role->add_cap( 'remove_users' );
-		$role->add_cap( 'promote_users' );
-		$role->add_cap( 'edit_theme_options' );
-		$role->add_cap( 'delete_themes' );
-		$role->add_cap( 'export' );
+	$role = get_role('administrator');
+
+	if (!empty($role)) {
+		$role->add_cap('update_core');
+		$role->add_cap('list_users');
+		$role->add_cap('remove_users');
+		$role->add_cap('promote_users');
+		$role->add_cap('edit_theme_options');
+		$role->add_cap('delete_themes');
+		$role->add_cap('export');
 	}
 }
 
-if ( ! function_exists( 'install_network' ) ) :
+if (!function_exists('install_network')) :
 	/**
 	 * Install Network.
 	 *
 	 * @since 3.0.0
 	 */
 	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;
 
@@ -973,38 +973,38 @@ 
  * @return bool|WP_Error True on success, or WP_Error on warning (with the installation 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_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' === $domain ) {
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
+	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 ('' === $site_name) {
+		$errors->add('empty_sitename', __('You must provide a name for your network of sites.'));
 	}
 
 	// Check for network collision.
 	$network_exists = false;
-	if ( is_multisite() ) {
-		if ( get_network( (int) $network_id ) ) {
-			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if (is_multisite()) {
+		if (get_network((int) $network_id)) {
+			$errors->add('siteid_exists', __('The network already exists.'));
 		}
 	} else {
-		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.'));
 		}
 	}
 
-	if ( ! is_email( $email ) ) {
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	if (!is_email($email)) {
+		$errors->add('invalid_email', __('You must provide a valid email address.'));
 	}
 
-	if ( $errors->has_errors() ) {
+	if ($errors->has_errors()) {
 		return $errors;
 	}
 
-	if ( 1 == $network_id ) {
+	if (1 == $network_id) {
 		$wpdb->insert(
 			$wpdb->site,
 			array(
@@ -1033,7 +1033,7 @@ 
 		)
 	);
 
-	$site_user = get_userdata( (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id ) ) );
+	$site_user = get_userdata((int) $wpdb->get_var($wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id)));
 
 	/*
 	 * When upgrading from single to multisite, assume the current site will
@@ -1042,11 +1042,11 @@ 
 	 * 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 );
+		$current_site->site_name = ucfirst($domain);
 		$wpdb->insert(
 			$wpdb->blogs,
 			array(
@@ -1054,28 +1054,28 @@ 
 				'blog_id'    => 1,
 				'domain'     => $domain,
 				'path'       => $path,
-				'registered' => current_time( 'mysql' ),
+				'registered' => current_time('mysql'),
 			)
 		);
 		$current_site->blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $current_site->blog_id );
+		update_user_meta($site_user->ID, 'source_domain', $domain);
+		update_user_meta($site_user->ID, 'primary_blog', $current_site->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!
+		$hostname = substr(md5(time()), 0, 6) . '.' . $domain; // Very random hostname!
 		$page     = wp_remote_get(
 			'http://' . $hostname,
 			array(
@@ -1083,35 +1083,35 @@ 
 				'httpversion' => '1.1',
 			)
 		);
-		if ( is_wp_error( $page ) ) {
+		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>';
+		if (!$vhost_ok) {
+			$msg = '<p><strong>' . __('Warning! Wildcard DNS may not be configured correctly!') . '</strong></p>';
 
 			$msg .= '<p>' . sprintf(
 				/* translators: %s: Host name. */
-				__( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
+				__('The installer attempted to contact a random hostname (%s) on your domain.'),
 				'<code>' . $hostname . '</code>'
 			);
-			if ( ! empty( $errstr ) ) {
+			if (!empty($errstr)) {
 				/* translators: %s: Error message. */
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+				$msg .= ' ' . sprintf(__('This resulted in an error message: %s'), '<code>' . $errstr . '</code>');
 			}
 			$msg .= '</p>';
 
 			$msg .= '<p>' . sprintf(
 				/* translators: %s: Asterisk symbol (*). */
-				__( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
+				__('To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.'),
 				'<code>*</code>'
 			) . '</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>';
+			$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 );
+			return new WP_Error('no_wildcard_dns', $msg);
 		}
 	}
 
@@ -1129,67 +1129,67 @@ 
  * @param int   $network_id Network ID to populate meta for.
  * @param array $meta       Optional. Custom meta $key => $value pairs to use. Default empty array.
  */
-function populate_network_meta( $network_id, array $meta = array() ) {
+function populate_network_meta($network_id, array $meta = array()) {
 	global $wpdb, $wp_db_version;
 
 	$network_id = (int) $network_id;
 
-	$email             = ! empty( $meta['admin_email'] ) ? $meta['admin_email'] : '';
-	$subdomain_install = isset( $meta['subdomain_install'] ) ? (int) $meta['subdomain_install'] : 0;
+	$email             = !empty($meta['admin_email']) ? $meta['admin_email'] : '';
+	$subdomain_install = isset($meta['subdomain_install']) ? (int) $meta['subdomain_install'] : 0;
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
-	$site_user = ! empty( $email ) ? get_user_by( 'email', $email ) : false;
-	if ( false === $site_user ) {
+	$site_user = !empty($email) ? get_user_by('email', $email) : false;
+	if (false === $site_user) {
 		$site_user = wp_get_current_user();
 	}
 
-	if ( empty( $email ) ) {
+	if (empty($email)) {
 		$email = $site_user->user_email;
 	}
 
-	$template       = get_option( 'template' );
-	$stylesheet     = get_option( 'stylesheet' );
-	$allowed_themes = array( $stylesheet => true );
+	$template       = get_option('template');
+	$stylesheet     = get_option('stylesheet');
+	$allowed_themes = array($stylesheet => true);
 
-	if ( $template != $stylesheet ) {
-		$allowed_themes[ $template ] = true;
+	if ($template != $stylesheet) {
+		$allowed_themes[$template] = true;
 	}
 
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
-		$allowed_themes[ WP_DEFAULT_THEME ] = true;
+	if (WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template) {
+		$allowed_themes[WP_DEFAULT_THEME] = true;
 	}
 
 	// If WP_DEFAULT_THEME doesn't exist, also include the latest core default theme.
-	if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
+	if (!wp_get_theme(WP_DEFAULT_THEME)->exists()) {
 		$core_default = WP_Theme::get_core_default_theme();
-		if ( $core_default ) {
-			$allowed_themes[ $core_default->get_stylesheet() ] = true;
+		if ($core_default) {
+			$allowed_themes[$core_default->get_stylesheet()] = true;
 		}
 	}
 
-	if ( function_exists( 'clean_network_cache' ) ) {
-		clean_network_cache( $network_id );
+	if (function_exists('clean_network_cache')) {
+		clean_network_cache($network_id);
 	} else {
-		wp_cache_delete( $network_id, 'networks' );
+		wp_cache_delete($network_id, 'networks');
 	}
 
-	if ( ! is_multisite() ) {
-		$site_admins = array( $site_user->user_login );
+	if (!is_multisite()) {
+		$site_admins = array($site_user->user_login);
 		$users       = get_users(
 			array(
-				'fields' => array( 'user_login' ),
+				'fields' => array('user_login'),
 				'role'   => 'administrator',
 			)
 		);
-		if ( $users ) {
-			foreach ( $users as $user ) {
+		if ($users) {
+			foreach ($users as $user) {
 				$site_admins[] = $user->user_login;
 			}
 
-			$site_admins = array_unique( $site_admins );
+			$site_admins = array_unique($site_admins);
 		}
 	} 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. */
@@ -1210,7 +1210,7 @@ 
 --The Team @ SITE_NAME'
 	);
 
-	$misc_exts        = array(
+	$misc_exts = array(
 		// Images.
 		'jpg',
 		'jpeg',
@@ -1241,40 +1241,40 @@ 
 	);
 	$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'                   => __( 'My Network' ),
+		'site_name'                   => __('My Network'),
 		'admin_email'                 => $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,
 		/* translators: %s: Site link. */
-		'first_post'                  => __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ),
+		'first_post'                  => __('Welcome to %s. This is your first post. Edit or delete it, then start writing!'),
 		// @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',
+		'upload_space_check_disabled' => is_multisite() ? get_site_option('upload_space_check_disabled') : '1',
 		'subdomain_install'           => $subdomain_install,
 		'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'user_count'                  => get_site_option( 'user_count' ),
-		'initial_db_version'          => get_option( 'initial_db_version' ),
+		'ms_files_rewriting'          => is_multisite() ? get_site_option('ms_files_rewriting') : '0',
+		'user_count'                  => get_site_option('user_count'),
+		'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';
 	}
 
-	$sitemeta = wp_parse_args( $meta, $sitemeta );
+	$sitemeta = wp_parse_args($meta, $sitemeta);
 
 	/**
 	 * Filters meta for a network on creation.
@@ -1284,19 +1284,19 @@ 
 	 * @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 );
+	foreach ($sitemeta as $meta_key => $meta_value) {
+		if (is_array($meta_value)) {
+			$meta_value = serialize($meta_value);
 		}
-		if ( ! empty( $insert ) ) {
+		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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+	$wpdb->query("INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 }
 
 /**
@@ -1309,16 +1309,16 @@ 
  * @param int   $site_id Site ID to populate meta for.
  * @param array $meta    Optional. Custom meta $key => $value pairs to use. Default empty array.
  */
-function populate_site_meta( $site_id, array $meta = array() ) {
+function populate_site_meta($site_id, array $meta = array()) {
 	global $wpdb;
 
 	$site_id = (int) $site_id;
 
-	if ( ! is_site_meta_supported() ) {
+	if (!is_site_meta_supported()) {
 		return;
 	}
 
-	if ( empty( $meta ) ) {
+	if (empty($meta)) {
 		return;
 	}
 
@@ -1330,21 +1330,21 @@ 
 	 * @param array $meta    Associative array of site meta keys and values to be inserted.
 	 * @param int   $site_id ID of site to populate.
 	 */
-	$site_meta = apply_filters( 'populate_site_meta', $meta, $site_id );
+	$site_meta = apply_filters('populate_site_meta', $meta, $site_id);
 
 	$insert = '';
-	foreach ( $site_meta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) ) {
-			$meta_value = serialize( $meta_value );
+	foreach ($site_meta as $meta_key => $meta_value) {
+		if (is_array($meta_value)) {
+			$meta_value = serialize($meta_value);
 		}
-		if ( ! empty( $insert ) ) {
+		if (!empty($insert)) {
 			$insert .= ', ';
 		}
-		$insert .= $wpdb->prepare( '( %d, %s, %s)', $site_id, $meta_key, $meta_value );
+		$insert .= $wpdb->prepare('( %d, %s, %s)', $site_id, $meta_key, $meta_value);
 	}
 
-	$wpdb->query( "INSERT INTO $wpdb->blogmeta ( blog_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+	$wpdb->query("INSERT INTO $wpdb->blogmeta ( blog_id, meta_key, meta_value ) VALUES " . $insert); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
-	wp_cache_delete( $site_id, 'blog_meta' );
+	wp_cache_delete($site_id, 'blog_meta');
 	wp_cache_set_sites_last_changed();
 }

brighty/wp-admin/includes/comment.php

Indentation +126 added lines, -126 removed lines

@@ -24,21 +24,21 @@ 
  * @return string|null Comment post ID on success.
  */
 function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
-	global $wpdb;
+    global $wpdb;
 
-	$date_field = 'comment_date';
-	if ( 'gmt' === $timezone ) {
-		$date_field = 'comment_date_gmt';
-	}
+    $date_field = 'comment_date';
+    if ( 'gmt' === $timezone ) {
+        $date_field = 'comment_date_gmt';
+    }
 
-	return $wpdb->get_var(
-		$wpdb->prepare(
-			"SELECT comment_post_ID FROM $wpdb->comments
+    return $wpdb->get_var(
+        $wpdb->prepare(
+            "SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
-		)
-	);
+            stripslashes( $comment_author ),
+            stripslashes( $comment_date )
+        )
+    );
 }
 
 /**
@@ -51,52 +51,52 @@ 
  *                      A WP_Error object on failure.
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-	}
-
-	if ( isset( $_POST['newcomment_author'] ) ) {
-		$_POST['comment_author'] = $_POST['newcomment_author'];
-	}
-	if ( isset( $_POST['newcomment_author_email'] ) ) {
-		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	}
-	if ( isset( $_POST['newcomment_author_url'] ) ) {
-		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	}
-	if ( isset( $_POST['comment_status'] ) ) {
-		$_POST['comment_approved'] = $_POST['comment_status'];
-	}
-	if ( isset( $_POST['content'] ) ) {
-		$_POST['comment_content'] = $_POST['content'];
-	}
-	if ( isset( $_POST['comment_ID'] ) ) {
-		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
-	}
-
-	foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
-		if ( ! empty( $_POST[ 'hidden_' . $timeunit ] ) && $_POST[ 'hidden_' . $timeunit ] !== $_POST[ $timeunit ] ) {
-			$_POST['edit_date'] = '1';
-			break;
-		}
-	}
-
-	if ( ! empty( $_POST['edit_date'] ) ) {
-		$aa = $_POST['aa'];
-		$mm = $_POST['mm'];
-		$jj = $_POST['jj'];
-		$hh = $_POST['hh'];
-		$mn = $_POST['mn'];
-		$ss = $_POST['ss'];
-		$jj = ( $jj > 31 ) ? 31 : $jj;
-		$hh = ( $hh > 23 ) ? $hh - 24 : $hh;
-		$mn = ( $mn > 59 ) ? $mn - 60 : $mn;
-		$ss = ( $ss > 59 ) ? $ss - 60 : $ss;
-
-		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-	}
-
-	return wp_update_comment( $_POST, true );
+    if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+        wp_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+    }
+
+    if ( isset( $_POST['newcomment_author'] ) ) {
+        $_POST['comment_author'] = $_POST['newcomment_author'];
+    }
+    if ( isset( $_POST['newcomment_author_email'] ) ) {
+        $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+    }
+    if ( isset( $_POST['newcomment_author_url'] ) ) {
+        $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+    }
+    if ( isset( $_POST['comment_status'] ) ) {
+        $_POST['comment_approved'] = $_POST['comment_status'];
+    }
+    if ( isset( $_POST['content'] ) ) {
+        $_POST['comment_content'] = $_POST['content'];
+    }
+    if ( isset( $_POST['comment_ID'] ) ) {
+        $_POST['comment_ID'] = (int) $_POST['comment_ID'];
+    }
+
+    foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
+        if ( ! empty( $_POST[ 'hidden_' . $timeunit ] ) && $_POST[ 'hidden_' . $timeunit ] !== $_POST[ $timeunit ] ) {
+            $_POST['edit_date'] = '1';
+            break;
+        }
+    }
+
+    if ( ! empty( $_POST['edit_date'] ) ) {
+        $aa = $_POST['aa'];
+        $mm = $_POST['mm'];
+        $jj = $_POST['jj'];
+        $hh = $_POST['hh'];
+        $mn = $_POST['mn'];
+        $ss = $_POST['ss'];
+        $jj = ( $jj > 31 ) ? 31 : $jj;
+        $hh = ( $hh > 23 ) ? $hh - 24 : $hh;
+        $mn = ( $mn > 59 ) ? $mn - 60 : $mn;
+        $ss = ( $ss > 59 ) ? $ss - 60 : $ss;
+
+        $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
+    }
+
+    return wp_update_comment( $_POST, true );
 }
 
 /**
@@ -108,30 +108,30 @@ 
  * @return WP_Comment|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	$comment = get_comment( $id );
-	if ( ! $comment ) {
-		return false;
-	}
-
-	$comment->comment_ID      = (int) $comment->comment_ID;
-	$comment->comment_post_ID = (int) $comment->comment_post_ID;
-
-	$comment->comment_content = format_to_edit( $comment->comment_content );
-	/**
-	 * Filters the comment content before editing.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param string $comment_content Comment content.
-	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
-
-	$comment->comment_author       = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url   = format_to_edit( $comment->comment_author_url );
-	$comment->comment_author_url   = esc_url( $comment->comment_author_url );
-
-	return $comment;
+    $comment = get_comment( $id );
+    if ( ! $comment ) {
+        return false;
+    }
+
+    $comment->comment_ID      = (int) $comment->comment_ID;
+    $comment->comment_post_ID = (int) $comment->comment_post_ID;
+
+    $comment->comment_content = format_to_edit( $comment->comment_content );
+    /**
+     * Filters the comment content before editing.
+     *
+     * @since 2.0.0
+     *
+     * @param string $comment_content Comment content.
+     */
+    $comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+
+    $comment->comment_author       = format_to_edit( $comment->comment_author );
+    $comment->comment_author_email = format_to_edit( $comment->comment_author_email );
+    $comment->comment_author_url   = format_to_edit( $comment->comment_author_url );
+    $comment->comment_author_url   = esc_url( $comment->comment_author_url );
+
+    return $comment;
 }
 
 /**
@@ -145,42 +145,42 @@ 
  * @return int|int[] Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
 function get_pending_comments_num( $post_id ) {
-	global $wpdb;
-
-	$single = false;
-	if ( ! is_array( $post_id ) ) {
-		$post_id_array = (array) $post_id;
-		$single        = true;
-	} else {
-		$post_id_array = $post_id;
-	}
-	$post_id_array = array_map( 'intval', $post_id_array );
-	$post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
-
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
-
-	if ( $single ) {
-		if ( empty( $pending ) ) {
-			return 0;
-		} else {
-			return absint( $pending[0]['num_comments'] );
-		}
-	}
-
-	$pending_keyed = array();
-
-	// Default to zero pending for all posts in request.
-	foreach ( $post_id_array as $id ) {
-		$pending_keyed[ $id ] = 0;
-	}
-
-	if ( ! empty( $pending ) ) {
-		foreach ( $pending as $pend ) {
-			$pending_keyed[ $pend['comment_post_ID'] ] = absint( $pend['num_comments'] );
-		}
-	}
-
-	return $pending_keyed;
+    global $wpdb;
+
+    $single = false;
+    if ( ! is_array( $post_id ) ) {
+        $post_id_array = (array) $post_id;
+        $single        = true;
+    } else {
+        $post_id_array = $post_id;
+    }
+    $post_id_array = array_map( 'intval', $post_id_array );
+    $post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
+
+    $pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+
+    if ( $single ) {
+        if ( empty( $pending ) ) {
+            return 0;
+        } else {
+            return absint( $pending[0]['num_comments'] );
+        }
+    }
+
+    $pending_keyed = array();
+
+    // Default to zero pending for all posts in request.
+    foreach ( $post_id_array as $id ) {
+        $pending_keyed[ $id ] = 0;
+    }
+
+    if ( ! empty( $pending ) ) {
+        foreach ( $pending as $pend ) {
+            $pending_keyed[ $pend['comment_post_ID'] ] = absint( $pend['num_comments'] );
+        }
+    }
+
+    return $pending_keyed;
 }
 
 /**
@@ -192,17 +192,17 @@ 
  * @return string Avatar with the user name.
  */
 function floated_admin_avatar( $name ) {
-	$avatar = get_avatar( get_comment(), 32, 'mystery' );
-	return "$avatar $name";
+    $avatar = get_avatar( get_comment(), 32, 'mystery' );
+    return "$avatar $name";
 }
 
 /**
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' === get_user_option( 'comment_shortcuts' ) ) {
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-	}
+    if ( 'true' === get_user_option( 'comment_shortcuts' ) ) {
+        wp_enqueue_script( 'jquery-table-hotkeys' );
+    }
 }
 
 /**
@@ -211,7 +211,7 @@ 
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
 function comment_footer_die( $msg ) {
-	echo "<div class='wrap'><p>$msg</p></div>";
-	require_once ABSPATH . 'wp-admin/admin-footer.php';
-	die;
+    echo "<div class='wrap'><p>$msg</p></div>";
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
+    die;
 }

Spacing +47 added lines, -47 removed lines

@@ -23,11 +23,11 @@ 
  * @param string $timezone       Timezone. Accepts 'blog' or 'gmt'. Default 'blog'.
  * @return string|null Comment post ID on success.
  */
-function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
+function comment_exists($comment_author, $comment_date, $timezone = 'blog') {
 	global $wpdb;
 
 	$date_field = 'comment_date';
-	if ( 'gmt' === $timezone ) {
+	if ('gmt' === $timezone) {
 		$date_field = 'comment_date_gmt';
 	}
 
@@ -35,8 +35,8 @@ 
 		$wpdb->prepare(
 			"SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
+			stripslashes($comment_author),
+			stripslashes($comment_date)
 		)
 	);
 }
@@ -51,52 +51,52 @@ 
  *                      A WP_Error object on failure.
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	if (!current_user_can('edit_comment', (int) $_POST['comment_ID'])) {
+		wp_die(__('Sorry, you are not allowed to edit comments on this post.'));
 	}
 
-	if ( isset( $_POST['newcomment_author'] ) ) {
+	if (isset($_POST['newcomment_author'])) {
 		$_POST['comment_author'] = $_POST['newcomment_author'];
 	}
-	if ( isset( $_POST['newcomment_author_email'] ) ) {
+	if (isset($_POST['newcomment_author_email'])) {
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
 	}
-	if ( isset( $_POST['newcomment_author_url'] ) ) {
+	if (isset($_POST['newcomment_author_url'])) {
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
 	}
-	if ( isset( $_POST['comment_status'] ) ) {
+	if (isset($_POST['comment_status'])) {
 		$_POST['comment_approved'] = $_POST['comment_status'];
 	}
-	if ( isset( $_POST['content'] ) ) {
+	if (isset($_POST['content'])) {
 		$_POST['comment_content'] = $_POST['content'];
 	}
-	if ( isset( $_POST['comment_ID'] ) ) {
+	if (isset($_POST['comment_ID'])) {
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 	}
 
-	foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
-		if ( ! empty( $_POST[ 'hidden_' . $timeunit ] ) && $_POST[ 'hidden_' . $timeunit ] !== $_POST[ $timeunit ] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if (!empty($_POST['hidden_' . $timeunit]) && $_POST['hidden_' . $timeunit] !== $_POST[$timeunit]) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( ! empty( $_POST['edit_date'] ) ) {
+	if (!empty($_POST['edit_date'])) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ( $jj > 31 ) ? 31 : $jj;
-		$hh = ( $hh > 23 ) ? $hh - 24 : $hh;
-		$mn = ( $mn > 59 ) ? $mn - 60 : $mn;
-		$ss = ( $ss > 59 ) ? $ss - 60 : $ss;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	return wp_update_comment( $_POST, true );
+	return wp_update_comment($_POST, true);
 }
 
 /**
@@ -107,16 +107,16 @@ 
  * @param int $id ID of comment to retrieve.
  * @return WP_Comment|false Comment if found. False on failure.
  */
-function get_comment_to_edit( $id ) {
-	$comment = get_comment( $id );
-	if ( ! $comment ) {
+function get_comment_to_edit($id) {
+	$comment = get_comment($id);
+	if (!$comment) {
 		return false;
 	}
 
 	$comment->comment_ID      = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
-	$comment->comment_content = format_to_edit( $comment->comment_content );
+	$comment->comment_content = format_to_edit($comment->comment_content);
 	/**
 	 * Filters the comment content before editing.
 	 *
@@ -124,12 +124,12 @@ 
 	 *
 	 * @param string $comment_content Comment content.
 	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author       = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url   = format_to_edit( $comment->comment_author_url );
-	$comment->comment_author_url   = esc_url( $comment->comment_author_url );
+	$comment->comment_author       = format_to_edit($comment->comment_author);
+	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
+	$comment->comment_author_url   = format_to_edit($comment->comment_author_url);
+	$comment->comment_author_url   = esc_url($comment->comment_author_url);
 
 	return $comment;
 }
@@ -144,39 +144,39 @@ 
  * @param int|int[] $post_id Either a single Post ID or an array of Post IDs
  * @return int|int[] Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
-function get_pending_comments_num( $post_id ) {
+function get_pending_comments_num($post_id) {
 	global $wpdb;
 
 	$single = false;
-	if ( ! is_array( $post_id ) ) {
+	if (!is_array($post_id)) {
 		$post_id_array = (array) $post_id;
 		$single        = true;
 	} else {
 		$post_id_array = $post_id;
 	}
-	$post_id_array = array_map( 'intval', $post_id_array );
-	$post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
+	$post_id_array = array_map('intval', $post_id_array);
+	$post_id_in    = "'" . implode("', '", $post_id_array) . "'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results("SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A);
 
-	if ( $single ) {
-		if ( empty( $pending ) ) {
+	if ($single) {
+		if (empty($pending)) {
 			return 0;
 		} else {
-			return absint( $pending[0]['num_comments'] );
+			return absint($pending[0]['num_comments']);
 		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request.
-	foreach ( $post_id_array as $id ) {
-		$pending_keyed[ $id ] = 0;
+	foreach ($post_id_array as $id) {
+		$pending_keyed[$id] = 0;
 	}
 
-	if ( ! empty( $pending ) ) {
-		foreach ( $pending as $pend ) {
-			$pending_keyed[ $pend['comment_post_ID'] ] = absint( $pend['num_comments'] );
+	if (!empty($pending)) {
+		foreach ($pending as $pend) {
+			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
 		}
 	}
 
@@ -191,8 +191,8 @@ 
  * @param string $name User name.
  * @return string Avatar with the user name.
  */
-function floated_admin_avatar( $name ) {
-	$avatar = get_avatar( get_comment(), 32, 'mystery' );
+function floated_admin_avatar($name) {
+	$avatar = get_avatar(get_comment(), 32, 'mystery');
 	return "$avatar $name";
 }
 
@@ -200,8 +200,8 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' === get_user_option( 'comment_shortcuts' ) ) {
-		wp_enqueue_script( 'jquery-table-hotkeys' );
+	if ('true' === get_user_option('comment_shortcuts')) {
+		wp_enqueue_script('jquery-table-hotkeys');
 	}
 }
 
@@ -210,7 +210,7 @@ 
  *
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {
+function comment_footer_die($msg) {
 	echo "<div class='wrap'><p>$msg</p></div>";
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 	die;

brighty/wp-admin/includes/ms-deprecated.php

Indentation +21 added lines, -21 removed lines

@@ -16,8 +16,8 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
-	// Deprecated. See #11763.
+    _deprecated_function( __FUNCTION__, '3.0.0' );
+    // Deprecated. See #11763.
 }
 
 /**
@@ -27,15 +27,15 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'is_upload_space_available()' );
 
-	if ( ! is_upload_space_available() ) {
-		wp_die( sprintf(
-			/* translators: %s: Allowed space allocation. */
-			__( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
-			size_format( get_space_allowed() * MB_IN_BYTES )
-		) );
-	}
+    if ( ! is_upload_space_available() ) {
+        wp_die( sprintf(
+            /* translators: %s: Allowed space allocation. */
+            __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+            size_format( get_space_allowed() * MB_IN_BYTES )
+        ) );
+    }
 }
 
 /**
@@ -44,8 +44,8 @@ 
  * @deprecated 3.0.0
  */
 function mu_options( $options ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
-	return $options;
+    _deprecated_function( __FUNCTION__, '3.0.0' );
+    return $options;
 }
 
 /**
@@ -55,8 +55,8 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'activate_plugin()' );
-	return false;
+    _deprecated_function( __FUNCTION__, '3.0.0', 'activate_plugin()' );
+    return false;
 }
 
 /**
@@ -66,7 +66,7 @@ 
  * @see deactivate_plugin()
  */
 function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'deactivate_plugin()' );
 }
 
 /**
@@ -76,8 +76,8 @@ 
  * @see is_network_only_plugin()
  */
 function is_wpmu_sitewide_plugin( $file ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
+    return is_network_only_plugin( $file );
 }
 
 /**
@@ -87,8 +87,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+    _deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
+    return array_map( 'intval', WP_Theme::get_allowed_on_network() );
 }
 
 /**
@@ -98,8 +98,8 @@ 
  * @see WP_Theme::get_allowed_on_site()
  */
 function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
+    _deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()' );
+    return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
 }
 
 /**

Spacing +20 added lines, -20 removed lines

@@ -16,7 +16,7 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Deprecated. See #11763.
 }
 
@@ -27,14 +27,14 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()');
 
-	if ( ! is_upload_space_available() ) {
-		wp_die( sprintf(
+	if (!is_upload_space_available()) {
+		wp_die(sprintf(
 			/* translators: %s: Allowed space allocation. */
-			__( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
-			size_format( get_space_allowed() * MB_IN_BYTES )
-		) );
+			__('Sorry, you have used your space allocation of %s. Please delete some files to upload more files.'),
+			size_format(get_space_allowed() * MB_IN_BYTES)
+		));
 	}
 }
 
@@ -43,8 +43,8 @@ 
  *
  * @deprecated 3.0.0
  */
-function mu_options( $options ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+function mu_options($options) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	return $options;
 }
 
@@ -55,7 +55,7 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'activate_plugin()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()');
 	return false;
 }
 
@@ -65,8 +65,8 @@ 
  * @deprecated 3.0.0 Use deactivate_plugin()
  * @see deactivate_plugin()
  */
-function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+function deactivate_sitewide_plugin($plugin = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()');
 }
 
 /**
@@ -75,9 +75,9 @@ 
  * @deprecated 3.0.0 Use is_network_only_plugin()
  * @see is_network_only_plugin()
  */
-function is_wpmu_sitewide_plugin( $file ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+function is_wpmu_sitewide_plugin($file) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()');
+	return is_network_only_plugin($file);
 }
 
 /**
@@ -87,8 +87,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()');
+	return array_map('intval', WP_Theme::get_allowed_on_network());
 }
 
 /**
@@ -97,9 +97,9 @@ 
  * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_site()
  * @see WP_Theme::get_allowed_on_site()
  */
-function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
+function wpmu_get_blog_allowedthemes($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()');
+	return array_map('intval', WP_Theme::get_allowed_on_site($blog_id));
 }
 
 /**

brighty/wp-admin/includes/continents-cities.php

Spacing +526 added lines, -526 removed lines

@@ -9,539 +9,539 @@
  * @since 2.8.0
  */
 
-__( 'Africa', 'continents-cities' );
-__( 'Abidjan', 'continents-cities' );
-__( 'Accra', 'continents-cities' );
-__( 'Addis Ababa', 'continents-cities' );
-__( 'Algiers', 'continents-cities' );
-__( 'Asmara', 'continents-cities' );
-__( 'Asmera', 'continents-cities' );
-__( 'Bamako', 'continents-cities' );
-__( 'Bangui', 'continents-cities' );
-__( 'Banjul', 'continents-cities' );
-__( 'Bissau', 'continents-cities' );
-__( 'Blantyre', 'continents-cities' );
-__( 'Brazzaville', 'continents-cities' );
-__( 'Bujumbura', 'continents-cities' );
-__( 'Cairo', 'continents-cities' );
-__( 'Casablanca', 'continents-cities' );
-__( 'Ceuta', 'continents-cities' );
-__( 'Conakry', 'continents-cities' );
-__( 'Dakar', 'continents-cities' );
-__( 'Dar es Salaam', 'continents-cities' );
-__( 'Djibouti', 'continents-cities' );
-__( 'Douala', 'continents-cities' );
-__( 'El Aaiun', 'continents-cities' );
-__( 'Freetown', 'continents-cities' );
-__( 'Gaborone', 'continents-cities' );
-__( 'Harare', 'continents-cities' );
-__( 'Johannesburg', 'continents-cities' );
-__( 'Juba', 'continents-cities' );
-__( 'Kampala', 'continents-cities' );
-__( 'Khartoum', 'continents-cities' );
-__( 'Kigali', 'continents-cities' );
-__( 'Kinshasa', 'continents-cities' );
-__( 'Lagos', 'continents-cities' );
-__( 'Libreville', 'continents-cities' );
-__( 'Lome', 'continents-cities' );
-__( 'Luanda', 'continents-cities' );
-__( 'Lubumbashi', 'continents-cities' );
-__( 'Lusaka', 'continents-cities' );
-__( 'Malabo', 'continents-cities' );
-__( 'Maputo', 'continents-cities' );
-__( 'Maseru', 'continents-cities' );
-__( 'Mbabane', 'continents-cities' );
-__( 'Mogadishu', 'continents-cities' );
-__( 'Monrovia', 'continents-cities' );
-__( 'Nairobi', 'continents-cities' );
-__( 'Ndjamena', 'continents-cities' );
-__( 'Niamey', 'continents-cities' );
-__( 'Nouakchott', 'continents-cities' );
-__( 'Ouagadougou', 'continents-cities' );
-__( 'Porto-Novo', 'continents-cities' );
-__( 'Sao Tome', 'continents-cities' );
-__( 'Timbuktu', 'continents-cities' );
-__( 'Tripoli', 'continents-cities' );
-__( 'Tunis', 'continents-cities' );
-__( 'Windhoek', 'continents-cities' );
+__('Africa', 'continents-cities');
+__('Abidjan', 'continents-cities');
+__('Accra', 'continents-cities');
+__('Addis Ababa', 'continents-cities');
+__('Algiers', 'continents-cities');
+__('Asmara', 'continents-cities');
+__('Asmera', 'continents-cities');
+__('Bamako', 'continents-cities');
+__('Bangui', 'continents-cities');
+__('Banjul', 'continents-cities');
+__('Bissau', 'continents-cities');
+__('Blantyre', 'continents-cities');
+__('Brazzaville', 'continents-cities');
+__('Bujumbura', 'continents-cities');
+__('Cairo', 'continents-cities');
+__('Casablanca', 'continents-cities');
+__('Ceuta', 'continents-cities');
+__('Conakry', 'continents-cities');
+__('Dakar', 'continents-cities');
+__('Dar es Salaam', 'continents-cities');
+__('Djibouti', 'continents-cities');
+__('Douala', 'continents-cities');
+__('El Aaiun', 'continents-cities');
+__('Freetown', 'continents-cities');
+__('Gaborone', 'continents-cities');
+__('Harare', 'continents-cities');
+__('Johannesburg', 'continents-cities');
+__('Juba', 'continents-cities');
+__('Kampala', 'continents-cities');
+__('Khartoum', 'continents-cities');
+__('Kigali', 'continents-cities');
+__('Kinshasa', 'continents-cities');
+__('Lagos', 'continents-cities');
+__('Libreville', 'continents-cities');
+__('Lome', 'continents-cities');
+__('Luanda', 'continents-cities');
+__('Lubumbashi', 'continents-cities');
+__('Lusaka', 'continents-cities');
+__('Malabo', 'continents-cities');
+__('Maputo', 'continents-cities');
+__('Maseru', 'continents-cities');
+__('Mbabane', 'continents-cities');
+__('Mogadishu', 'continents-cities');
+__('Monrovia', 'continents-cities');
+__('Nairobi', 'continents-cities');
+__('Ndjamena', 'continents-cities');
+__('Niamey', 'continents-cities');
+__('Nouakchott', 'continents-cities');
+__('Ouagadougou', 'continents-cities');
+__('Porto-Novo', 'continents-cities');
+__('Sao Tome', 'continents-cities');
+__('Timbuktu', 'continents-cities');
+__('Tripoli', 'continents-cities');
+__('Tunis', 'continents-cities');
+__('Windhoek', 'continents-cities');
 
-__( 'America', 'continents-cities' );
-__( 'Adak', 'continents-cities' );
-__( 'Anchorage', 'continents-cities' );
-__( 'Anguilla', 'continents-cities' );
-__( 'Antigua', 'continents-cities' );
-__( 'Araguaina', 'continents-cities' );
-__( 'Argentina', 'continents-cities' );
-__( 'Buenos Aires', 'continents-cities' );
-__( 'Catamarca', 'continents-cities' );
-__( 'ComodRivadavia', 'continents-cities' );
-__( 'Cordoba', 'continents-cities' );
-__( 'Jujuy', 'continents-cities' );
-__( 'La Rioja', 'continents-cities' );
-__( 'Mendoza', 'continents-cities' );
-__( 'Rio Gallegos', 'continents-cities' );
-__( 'Salta', 'continents-cities' );
-__( 'San Juan', 'continents-cities' );
-__( 'San Luis', 'continents-cities' );
-__( 'Tucuman', 'continents-cities' );
-__( 'Ushuaia', 'continents-cities' );
-__( 'Aruba', 'continents-cities' );
-__( 'Asuncion', 'continents-cities' );
-__( 'Atikokan', 'continents-cities' );
-__( 'Atka', 'continents-cities' );
-__( 'Bahia', 'continents-cities' );
-__( 'Bahia Banderas', 'continents-cities' );
-__( 'Barbados', 'continents-cities' );
-__( 'Belem', 'continents-cities' );
-__( 'Belize', 'continents-cities' );
-__( 'Blanc-Sablon', 'continents-cities' );
-__( 'Boa Vista', 'continents-cities' );
-__( 'Bogota', 'continents-cities' );
-__( 'Boise', 'continents-cities' );
-__( 'Cambridge Bay', 'continents-cities' );
-__( 'Campo Grande', 'continents-cities' );
-__( 'Cancun', 'continents-cities' );
-__( 'Caracas', 'continents-cities' );
-__( 'Cayenne', 'continents-cities' );
-__( 'Cayman', 'continents-cities' );
-__( 'Chicago', 'continents-cities' );
-__( 'Chihuahua', 'continents-cities' );
-__( 'Coral Harbour', 'continents-cities' );
-__( 'Costa Rica', 'continents-cities' );
-__( 'Creston', 'continents-cities' );
-__( 'Cuiaba', 'continents-cities' );
-__( 'Curacao', 'continents-cities' );
-__( 'Danmarkshavn', 'continents-cities' );
-__( 'Dawson', 'continents-cities' );
-__( 'Dawson Creek', 'continents-cities' );
-__( 'Denver', 'continents-cities' );
-__( 'Detroit', 'continents-cities' );
-__( 'Dominica', 'continents-cities' );
-__( 'Edmonton', 'continents-cities' );
-__( 'Eirunepe', 'continents-cities' );
-__( 'El Salvador', 'continents-cities' );
-__( 'Ensenada', 'continents-cities' );
-__( 'Fort Nelson', 'continents-cities' );
-__( 'Fort Wayne', 'continents-cities' );
-__( 'Fortaleza', 'continents-cities' );
-__( 'Glace Bay', 'continents-cities' );
-__( 'Godthab', 'continents-cities' );
-__( 'Goose Bay', 'continents-cities' );
-__( 'Grand Turk', 'continents-cities' );
-__( 'Grenada', 'continents-cities' );
-__( 'Guadeloupe', 'continents-cities' );
-__( 'Guatemala', 'continents-cities' );
-__( 'Guayaquil', 'continents-cities' );
-__( 'Guyana', 'continents-cities' );
-__( 'Halifax', 'continents-cities' );
-__( 'Havana', 'continents-cities' );
-__( 'Hermosillo', 'continents-cities' );
-__( 'Indiana', 'continents-cities' );
-__( 'Indianapolis', 'continents-cities' );
-__( 'Knox', 'continents-cities' );
-__( 'Marengo', 'continents-cities' );
-__( 'Petersburg', 'continents-cities' );
-__( 'Tell City', 'continents-cities' );
-__( 'Vevay', 'continents-cities' );
-__( 'Vincennes', 'continents-cities' );
-__( 'Winamac', 'continents-cities' );
-__( 'Inuvik', 'continents-cities' );
-__( 'Iqaluit', 'continents-cities' );
-__( 'Jamaica', 'continents-cities' );
-__( 'Juneau', 'continents-cities' );
-__( 'Kentucky', 'continents-cities' );
-__( 'Louisville', 'continents-cities' );
-__( 'Monticello', 'continents-cities' );
-__( 'Knox IN', 'continents-cities' );
-__( 'Kralendijk', 'continents-cities' );
-__( 'La Paz', 'continents-cities' );
-__( 'Lima', 'continents-cities' );
-__( 'Los Angeles', 'continents-cities' );
-__( 'Lower Princes', 'continents-cities' );
-__( 'Maceio', 'continents-cities' );
-__( 'Managua', 'continents-cities' );
-__( 'Manaus', 'continents-cities' );
-__( 'Marigot', 'continents-cities' );
-__( 'Martinique', 'continents-cities' );
-__( 'Matamoros', 'continents-cities' );
-__( 'Mazatlan', 'continents-cities' );
-__( 'Menominee', 'continents-cities' );
-__( 'Merida', 'continents-cities' );
-__( 'Metlakatla', 'continents-cities' );
-__( 'Mexico City', 'continents-cities' );
-__( 'Miquelon', 'continents-cities' );
-__( 'Moncton', 'continents-cities' );
-__( 'Monterrey', 'continents-cities' );
-__( 'Montevideo', 'continents-cities' );
-__( 'Montreal', 'continents-cities' );
-__( 'Montserrat', 'continents-cities' );
-__( 'Nassau', 'continents-cities' );
-__( 'New York', 'continents-cities' );
-__( 'Nipigon', 'continents-cities' );
-__( 'Nome', 'continents-cities' );
-__( 'Noronha', 'continents-cities' );
-__( 'North Dakota', 'continents-cities' );
-__( 'Beulah', 'continents-cities' );
-__( 'Center', 'continents-cities' );
-__( 'New Salem', 'continents-cities' );
-__( 'Nuuk', 'continents-cities' );
-__( 'Ojinaga', 'continents-cities' );
-__( 'Panama', 'continents-cities' );
-__( 'Pangnirtung', 'continents-cities' );
-__( 'Paramaribo', 'continents-cities' );
-__( 'Phoenix', 'continents-cities' );
-__( 'Port-au-Prince', 'continents-cities' );
-__( 'Port of Spain', 'continents-cities' );
-__( 'Porto Acre', 'continents-cities' );
-__( 'Porto Velho', 'continents-cities' );
-__( 'Puerto Rico', 'continents-cities' );
-__( 'Punta Arenas', 'continents-cities' );
-__( 'Rainy River', 'continents-cities' );
-__( 'Rankin Inlet', 'continents-cities' );
-__( 'Recife', 'continents-cities' );
-__( 'Regina', 'continents-cities' );
-__( 'Resolute', 'continents-cities' );
-__( 'Rio Branco', 'continents-cities' );
-__( 'Rosario', 'continents-cities' );
-__( 'Santa Isabel', 'continents-cities' );
-__( 'Santarem', 'continents-cities' );
-__( 'Santiago', 'continents-cities' );
-__( 'Santo Domingo', 'continents-cities' );
-__( 'Sao Paulo', 'continents-cities' );
-__( 'Scoresbysund', 'continents-cities' );
-__( 'Shiprock', 'continents-cities' );
-__( 'Sitka', 'continents-cities' );
-__( 'St Barthelemy', 'continents-cities' );
-__( 'St Johns', 'continents-cities' );
-__( 'St Kitts', 'continents-cities' );
-__( 'St Lucia', 'continents-cities' );
-__( 'St Thomas', 'continents-cities' );
-__( 'St Vincent', 'continents-cities' );
-__( 'Swift Current', 'continents-cities' );
-__( 'Tegucigalpa', 'continents-cities' );
-__( 'Thule', 'continents-cities' );
-__( 'Thunder Bay', 'continents-cities' );
-__( 'Tijuana', 'continents-cities' );
-__( 'Toronto', 'continents-cities' );
-__( 'Tortola', 'continents-cities' );
-__( 'Vancouver', 'continents-cities' );
-__( 'Virgin', 'continents-cities' );
-__( 'Whitehorse', 'continents-cities' );
-__( 'Winnipeg', 'continents-cities' );
-__( 'Yakutat', 'continents-cities' );
-__( 'Yellowknife', 'continents-cities' );
+__('America', 'continents-cities');
+__('Adak', 'continents-cities');
+__('Anchorage', 'continents-cities');
+__('Anguilla', 'continents-cities');
+__('Antigua', 'continents-cities');
+__('Araguaina', 'continents-cities');
+__('Argentina', 'continents-cities');
+__('Buenos Aires', 'continents-cities');
+__('Catamarca', 'continents-cities');
+__('ComodRivadavia', 'continents-cities');
+__('Cordoba', 'continents-cities');
+__('Jujuy', 'continents-cities');
+__('La Rioja', 'continents-cities');
+__('Mendoza', 'continents-cities');
+__('Rio Gallegos', 'continents-cities');
+__('Salta', 'continents-cities');
+__('San Juan', 'continents-cities');
+__('San Luis', 'continents-cities');
+__('Tucuman', 'continents-cities');
+__('Ushuaia', 'continents-cities');
+__('Aruba', 'continents-cities');
+__('Asuncion', 'continents-cities');
+__('Atikokan', 'continents-cities');
+__('Atka', 'continents-cities');
+__('Bahia', 'continents-cities');
+__('Bahia Banderas', 'continents-cities');
+__('Barbados', 'continents-cities');
+__('Belem', 'continents-cities');
+__('Belize', 'continents-cities');
+__('Blanc-Sablon', 'continents-cities');
+__('Boa Vista', 'continents-cities');
+__('Bogota', 'continents-cities');
+__('Boise', 'continents-cities');
+__('Cambridge Bay', 'continents-cities');
+__('Campo Grande', 'continents-cities');
+__('Cancun', 'continents-cities');
+__('Caracas', 'continents-cities');
+__('Cayenne', 'continents-cities');
+__('Cayman', 'continents-cities');
+__('Chicago', 'continents-cities');
+__('Chihuahua', 'continents-cities');
+__('Coral Harbour', 'continents-cities');
+__('Costa Rica', 'continents-cities');
+__('Creston', 'continents-cities');
+__('Cuiaba', 'continents-cities');
+__('Curacao', 'continents-cities');
+__('Danmarkshavn', 'continents-cities');
+__('Dawson', 'continents-cities');
+__('Dawson Creek', 'continents-cities');
+__('Denver', 'continents-cities');
+__('Detroit', 'continents-cities');
+__('Dominica', 'continents-cities');
+__('Edmonton', 'continents-cities');
+__('Eirunepe', 'continents-cities');
+__('El Salvador', 'continents-cities');
+__('Ensenada', 'continents-cities');
+__('Fort Nelson', 'continents-cities');
+__('Fort Wayne', 'continents-cities');
+__('Fortaleza', 'continents-cities');
+__('Glace Bay', 'continents-cities');
+__('Godthab', 'continents-cities');
+__('Goose Bay', 'continents-cities');
+__('Grand Turk', 'continents-cities');
+__('Grenada', 'continents-cities');
+__('Guadeloupe', 'continents-cities');
+__('Guatemala', 'continents-cities');
+__('Guayaquil', 'continents-cities');
+__('Guyana', 'continents-cities');
+__('Halifax', 'continents-cities');
+__('Havana', 'continents-cities');
+__('Hermosillo', 'continents-cities');
+__('Indiana', 'continents-cities');
+__('Indianapolis', 'continents-cities');
+__('Knox', 'continents-cities');
+__('Marengo', 'continents-cities');
+__('Petersburg', 'continents-cities');
+__('Tell City', 'continents-cities');
+__('Vevay', 'continents-cities');
+__('Vincennes', 'continents-cities');
+__('Winamac', 'continents-cities');
+__('Inuvik', 'continents-cities');
+__('Iqaluit', 'continents-cities');
+__('Jamaica', 'continents-cities');
+__('Juneau', 'continents-cities');
+__('Kentucky', 'continents-cities');
+__('Louisville', 'continents-cities');
+__('Monticello', 'continents-cities');
+__('Knox IN', 'continents-cities');
+__('Kralendijk', 'continents-cities');
+__('La Paz', 'continents-cities');
+__('Lima', 'continents-cities');
+__('Los Angeles', 'continents-cities');
+__('Lower Princes', 'continents-cities');
+__('Maceio', 'continents-cities');
+__('Managua', 'continents-cities');
+__('Manaus', 'continents-cities');
+__('Marigot', 'continents-cities');
+__('Martinique', 'continents-cities');
+__('Matamoros', 'continents-cities');
+__('Mazatlan', 'continents-cities');
+__('Menominee', 'continents-cities');
+__('Merida', 'continents-cities');
+__('Metlakatla', 'continents-cities');
+__('Mexico City', 'continents-cities');
+__('Miquelon', 'continents-cities');
+__('Moncton', 'continents-cities');
+__('Monterrey', 'continents-cities');
+__('Montevideo', 'continents-cities');
+__('Montreal', 'continents-cities');
+__('Montserrat', 'continents-cities');
+__('Nassau', 'continents-cities');
+__('New York', 'continents-cities');
+__('Nipigon', 'continents-cities');
+__('Nome', 'continents-cities');
+__('Noronha', 'continents-cities');
+__('North Dakota', 'continents-cities');
+__('Beulah', 'continents-cities');
+__('Center', 'continents-cities');
+__('New Salem', 'continents-cities');
+__('Nuuk', 'continents-cities');
+__('Ojinaga', 'continents-cities');
+__('Panama', 'continents-cities');
+__('Pangnirtung', 'continents-cities');
+__('Paramaribo', 'continents-cities');
+__('Phoenix', 'continents-cities');
+__('Port-au-Prince', 'continents-cities');
+__('Port of Spain', 'continents-cities');
+__('Porto Acre', 'continents-cities');
+__('Porto Velho', 'continents-cities');
+__('Puerto Rico', 'continents-cities');
+__('Punta Arenas', 'continents-cities');
+__('Rainy River', 'continents-cities');
+__('Rankin Inlet', 'continents-cities');
+__('Recife', 'continents-cities');
+__('Regina', 'continents-cities');
+__('Resolute', 'continents-cities');
+__('Rio Branco', 'continents-cities');
+__('Rosario', 'continents-cities');
+__('Santa Isabel', 'continents-cities');
+__('Santarem', 'continents-cities');
+__('Santiago', 'continents-cities');
+__('Santo Domingo', 'continents-cities');
+__('Sao Paulo', 'continents-cities');
+__('Scoresbysund', 'continents-cities');
+__('Shiprock', 'continents-cities');
+__('Sitka', 'continents-cities');
+__('St Barthelemy', 'continents-cities');
+__('St Johns', 'continents-cities');
+__('St Kitts', 'continents-cities');
+__('St Lucia', 'continents-cities');
+__('St Thomas', 'continents-cities');
+__('St Vincent', 'continents-cities');
+__('Swift Current', 'continents-cities');
+__('Tegucigalpa', 'continents-cities');
+__('Thule', 'continents-cities');
+__('Thunder Bay', 'continents-cities');
+__('Tijuana', 'continents-cities');
+__('Toronto', 'continents-cities');
+__('Tortola', 'continents-cities');
+__('Vancouver', 'continents-cities');
+__('Virgin', 'continents-cities');
+__('Whitehorse', 'continents-cities');
+__('Winnipeg', 'continents-cities');
+__('Yakutat', 'continents-cities');
+__('Yellowknife', 'continents-cities');
 
-__( 'Antarctica', 'continents-cities' );
-__( 'Casey', 'continents-cities' );
-__( 'Davis', 'continents-cities' );
-__( 'DumontDUrville', 'continents-cities' );
-__( 'Macquarie', 'continents-cities' );
-__( 'Mawson', 'continents-cities' );
-__( 'McMurdo', 'continents-cities' );
-__( 'Palmer', 'continents-cities' );
-__( 'Rothera', 'continents-cities' );
-__( 'South Pole', 'continents-cities' );
-__( 'Syowa', 'continents-cities' );
-__( 'Troll', 'continents-cities' );
-__( 'Vostok', 'continents-cities' );
+__('Antarctica', 'continents-cities');
+__('Casey', 'continents-cities');
+__('Davis', 'continents-cities');
+__('DumontDUrville', 'continents-cities');
+__('Macquarie', 'continents-cities');
+__('Mawson', 'continents-cities');
+__('McMurdo', 'continents-cities');
+__('Palmer', 'continents-cities');
+__('Rothera', 'continents-cities');
+__('South Pole', 'continents-cities');
+__('Syowa', 'continents-cities');
+__('Troll', 'continents-cities');
+__('Vostok', 'continents-cities');
 
-__( 'Arctic', 'continents-cities' );
-__( 'Longyearbyen', 'continents-cities' );
+__('Arctic', 'continents-cities');
+__('Longyearbyen', 'continents-cities');
 
-__( 'Asia', 'continents-cities' );
-__( 'Aden', 'continents-cities' );
-__( 'Almaty', 'continents-cities' );
-__( 'Amman', 'continents-cities' );
-__( 'Anadyr', 'continents-cities' );
-__( 'Aqtau', 'continents-cities' );
-__( 'Aqtobe', 'continents-cities' );
-__( 'Ashgabat', 'continents-cities' );
-__( 'Ashkhabad', 'continents-cities' );
-__( 'Atyrau', 'continents-cities' );
-__( 'Baghdad', 'continents-cities' );
-__( 'Bahrain', 'continents-cities' );
-__( 'Baku', 'continents-cities' );
-__( 'Bangkok', 'continents-cities' );
-__( 'Barnaul', 'continents-cities' );
-__( 'Beirut', 'continents-cities' );
-__( 'Bishkek', 'continents-cities' );
-__( 'Brunei', 'continents-cities' );
-__( 'Calcutta', 'continents-cities' );
-__( 'Chita', 'continents-cities' );
-__( 'Choibalsan', 'continents-cities' );
-__( 'Chongqing', 'continents-cities' );
-__( 'Chungking', 'continents-cities' );
-__( 'Colombo', 'continents-cities' );
-__( 'Dacca', 'continents-cities' );
-__( 'Damascus', 'continents-cities' );
-__( 'Dhaka', 'continents-cities' );
-__( 'Dili', 'continents-cities' );
-__( 'Dubai', 'continents-cities' );
-__( 'Dushanbe', 'continents-cities' );
-__( 'Famagusta', 'continents-cities' );
-__( 'Gaza', 'continents-cities' );
-__( 'Harbin', 'continents-cities' );
-__( 'Hebron', 'continents-cities' );
-__( 'Ho Chi Minh', 'continents-cities' );
-__( 'Hong Kong', 'continents-cities' );
-__( 'Hovd', 'continents-cities' );
-__( 'Irkutsk', 'continents-cities' );
-__( 'Jakarta', 'continents-cities' );
-__( 'Jayapura', 'continents-cities' );
-__( 'Jerusalem', 'continents-cities' );
-__( 'Kabul', 'continents-cities' );
-__( 'Kamchatka', 'continents-cities' );
-__( 'Karachi', 'continents-cities' );
-__( 'Kashgar', 'continents-cities' );
-__( 'Kathmandu', 'continents-cities' );
-__( 'Katmandu', 'continents-cities' );
-__( 'Khandyga', 'continents-cities' );
-__( 'Kolkata', 'continents-cities' );
-__( 'Krasnoyarsk', 'continents-cities' );
-__( 'Kuala Lumpur', 'continents-cities' );
-__( 'Kuching', 'continents-cities' );
-__( 'Kuwait', 'continents-cities' );
-__( 'Macao', 'continents-cities' );
-__( 'Macau', 'continents-cities' );
-__( 'Magadan', 'continents-cities' );
-__( 'Makassar', 'continents-cities' );
-__( 'Manila', 'continents-cities' );
-__( 'Muscat', 'continents-cities' );
-__( 'Nicosia', 'continents-cities' );
-__( 'Novokuznetsk', 'continents-cities' );
-__( 'Novosibirsk', 'continents-cities' );
-__( 'Omsk', 'continents-cities' );
-__( 'Oral', 'continents-cities' );
-__( 'Phnom Penh', 'continents-cities' );
-__( 'Pontianak', 'continents-cities' );
-__( 'Pyongyang', 'continents-cities' );
-__( 'Qatar', 'continents-cities' );
-__( 'Qostanay', 'continents-cities' );
-__( 'Qyzylorda', 'continents-cities' );
-__( 'Rangoon', 'continents-cities' );
-__( 'Riyadh', 'continents-cities' );
-__( 'Saigon', 'continents-cities' );
-__( 'Sakhalin', 'continents-cities' );
-__( 'Samarkand', 'continents-cities' );
-__( 'Seoul', 'continents-cities' );
-__( 'Shanghai', 'continents-cities' );
-__( 'Singapore', 'continents-cities' );
-__( 'Srednekolymsk', 'continents-cities' );
-__( 'Taipei', 'continents-cities' );
-__( 'Tashkent', 'continents-cities' );
-__( 'Tbilisi', 'continents-cities' );
-__( 'Tehran', 'continents-cities' );
-__( 'Tel Aviv', 'continents-cities' );
-__( 'Thimbu', 'continents-cities' );
-__( 'Thimphu', 'continents-cities' );
-__( 'Tokyo', 'continents-cities' );
-__( 'Tomsk', 'continents-cities' );
-__( 'Ujung Pandang', 'continents-cities' );
-__( 'Ulaanbaatar', 'continents-cities' );
-__( 'Ulan Bator', 'continents-cities' );
-__( 'Urumqi', 'continents-cities' );
-__( 'Ust-Nera', 'continents-cities' );
-__( 'Vientiane', 'continents-cities' );
-__( 'Vladivostok', 'continents-cities' );
-__( 'Yakutsk', 'continents-cities' );
-__( 'Yangon', 'continents-cities' );
-__( 'Yekaterinburg', 'continents-cities' );
-__( 'Yerevan', 'continents-cities' );
+__('Asia', 'continents-cities');
+__('Aden', 'continents-cities');
+__('Almaty', 'continents-cities');
+__('Amman', 'continents-cities');
+__('Anadyr', 'continents-cities');
+__('Aqtau', 'continents-cities');
+__('Aqtobe', 'continents-cities');
+__('Ashgabat', 'continents-cities');
+__('Ashkhabad', 'continents-cities');
+__('Atyrau', 'continents-cities');
+__('Baghdad', 'continents-cities');
+__('Bahrain', 'continents-cities');
+__('Baku', 'continents-cities');
+__('Bangkok', 'continents-cities');
+__('Barnaul', 'continents-cities');
+__('Beirut', 'continents-cities');
+__('Bishkek', 'continents-cities');
+__('Brunei', 'continents-cities');
+__('Calcutta', 'continents-cities');
+__('Chita', 'continents-cities');
+__('Choibalsan', 'continents-cities');
+__('Chongqing', 'continents-cities');
+__('Chungking', 'continents-cities');
+__('Colombo', 'continents-cities');
+__('Dacca', 'continents-cities');
+__('Damascus', 'continents-cities');
+__('Dhaka', 'continents-cities');
+__('Dili', 'continents-cities');
+__('Dubai', 'continents-cities');
+__('Dushanbe', 'continents-cities');
+__('Famagusta', 'continents-cities');
+__('Gaza', 'continents-cities');
+__('Harbin', 'continents-cities');
+__('Hebron', 'continents-cities');
+__('Ho Chi Minh', 'continents-cities');
+__('Hong Kong', 'continents-cities');
+__('Hovd', 'continents-cities');
+__('Irkutsk', 'continents-cities');
+__('Jakarta', 'continents-cities');
+__('Jayapura', 'continents-cities');
+__('Jerusalem', 'continents-cities');
+__('Kabul', 'continents-cities');
+__('Kamchatka', 'continents-cities');
+__('Karachi', 'continents-cities');
+__('Kashgar', 'continents-cities');
+__('Kathmandu', 'continents-cities');
+__('Katmandu', 'continents-cities');
+__('Khandyga', 'continents-cities');
+__('Kolkata', 'continents-cities');
+__('Krasnoyarsk', 'continents-cities');
+__('Kuala Lumpur', 'continents-cities');
+__('Kuching', 'continents-cities');
+__('Kuwait', 'continents-cities');
+__('Macao', 'continents-cities');
+__('Macau', 'continents-cities');
+__('Magadan', 'continents-cities');
+__('Makassar', 'continents-cities');
+__('Manila', 'continents-cities');
+__('Muscat', 'continents-cities');
+__('Nicosia', 'continents-cities');
+__('Novokuznetsk', 'continents-cities');
+__('Novosibirsk', 'continents-cities');
+__('Omsk', 'continents-cities');
+__('Oral', 'continents-cities');
+__('Phnom Penh', 'continents-cities');
+__('Pontianak', 'continents-cities');
+__('Pyongyang', 'continents-cities');
+__('Qatar', 'continents-cities');
+__('Qostanay', 'continents-cities');
+__('Qyzylorda', 'continents-cities');
+__('Rangoon', 'continents-cities');
+__('Riyadh', 'continents-cities');
+__('Saigon', 'continents-cities');
+__('Sakhalin', 'continents-cities');
+__('Samarkand', 'continents-cities');
+__('Seoul', 'continents-cities');
+__('Shanghai', 'continents-cities');
+__('Singapore', 'continents-cities');
+__('Srednekolymsk', 'continents-cities');
+__('Taipei', 'continents-cities');
+__('Tashkent', 'continents-cities');
+__('Tbilisi', 'continents-cities');
+__('Tehran', 'continents-cities');
+__('Tel Aviv', 'continents-cities');
+__('Thimbu', 'continents-cities');
+__('Thimphu', 'continents-cities');
+__('Tokyo', 'continents-cities');
+__('Tomsk', 'continents-cities');
+__('Ujung Pandang', 'continents-cities');
+__('Ulaanbaatar', 'continents-cities');
+__('Ulan Bator', 'continents-cities');
+__('Urumqi', 'continents-cities');
+__('Ust-Nera', 'continents-cities');
+__('Vientiane', 'continents-cities');
+__('Vladivostok', 'continents-cities');
+__('Yakutsk', 'continents-cities');
+__('Yangon', 'continents-cities');
+__('Yekaterinburg', 'continents-cities');
+__('Yerevan', 'continents-cities');
 
-__( 'Atlantic', 'continents-cities' );
-__( 'Azores', 'continents-cities' );
-__( 'Bermuda', 'continents-cities' );
-__( 'Canary', 'continents-cities' );
-__( 'Cape Verde', 'continents-cities' );
-__( 'Faeroe', 'continents-cities' );
-__( 'Faroe', 'continents-cities' );
-__( 'Jan Mayen', 'continents-cities' );
-__( 'Madeira', 'continents-cities' );
-__( 'Reykjavik', 'continents-cities' );
-__( 'South Georgia', 'continents-cities' );
-__( 'St Helena', 'continents-cities' );
-__( 'Stanley', 'continents-cities' );
+__('Atlantic', 'continents-cities');
+__('Azores', 'continents-cities');
+__('Bermuda', 'continents-cities');
+__('Canary', 'continents-cities');
+__('Cape Verde', 'continents-cities');
+__('Faeroe', 'continents-cities');
+__('Faroe', 'continents-cities');
+__('Jan Mayen', 'continents-cities');
+__('Madeira', 'continents-cities');
+__('Reykjavik', 'continents-cities');
+__('South Georgia', 'continents-cities');
+__('St Helena', 'continents-cities');
+__('Stanley', 'continents-cities');
 
-__( 'Australia', 'continents-cities' );
-__( 'ACT', 'continents-cities' );
-__( 'Adelaide', 'continents-cities' );
-__( 'Brisbane', 'continents-cities' );
-__( 'Broken Hill', 'continents-cities' );
-__( 'Canberra', 'continents-cities' );
-__( 'Currie', 'continents-cities' );
-__( 'Darwin', 'continents-cities' );
-__( 'Eucla', 'continents-cities' );
-__( 'Hobart', 'continents-cities' );
-__( 'LHI', 'continents-cities' );
-__( 'Lindeman', 'continents-cities' );
-__( 'Lord Howe', 'continents-cities' );
-__( 'Melbourne', 'continents-cities' );
-__( 'NSW', 'continents-cities' );
-__( 'North', 'continents-cities' );
-__( 'Perth', 'continents-cities' );
-__( 'Queensland', 'continents-cities' );
-__( 'South', 'continents-cities' );
-__( 'Sydney', 'continents-cities' );
-__( 'Tasmania', 'continents-cities' );
-__( 'Victoria', 'continents-cities' );
-__( 'West', 'continents-cities' );
-__( 'Yancowinna', 'continents-cities' );
+__('Australia', 'continents-cities');
+__('ACT', 'continents-cities');
+__('Adelaide', 'continents-cities');
+__('Brisbane', 'continents-cities');
+__('Broken Hill', 'continents-cities');
+__('Canberra', 'continents-cities');
+__('Currie', 'continents-cities');
+__('Darwin', 'continents-cities');
+__('Eucla', 'continents-cities');
+__('Hobart', 'continents-cities');
+__('LHI', 'continents-cities');
+__('Lindeman', 'continents-cities');
+__('Lord Howe', 'continents-cities');
+__('Melbourne', 'continents-cities');
+__('NSW', 'continents-cities');
+__('North', 'continents-cities');
+__('Perth', 'continents-cities');
+__('Queensland', 'continents-cities');
+__('South', 'continents-cities');
+__('Sydney', 'continents-cities');
+__('Tasmania', 'continents-cities');
+__('Victoria', 'continents-cities');
+__('West', 'continents-cities');
+__('Yancowinna', 'continents-cities');
 
-__( 'Etc', 'continents-cities' );
-__( 'GMT', 'continents-cities' );
-__( 'GMT+0', 'continents-cities' );
-__( 'GMT+1', 'continents-cities' );
-__( 'GMT+10', 'continents-cities' );
-__( 'GMT+11', 'continents-cities' );
-__( 'GMT+12', 'continents-cities' );
-__( 'GMT+2', 'continents-cities' );
-__( 'GMT+3', 'continents-cities' );
-__( 'GMT+4', 'continents-cities' );
-__( 'GMT+5', 'continents-cities' );
-__( 'GMT+6', 'continents-cities' );
-__( 'GMT+7', 'continents-cities' );
-__( 'GMT+8', 'continents-cities' );
-__( 'GMT+9', 'continents-cities' );
-__( 'GMT-0', 'continents-cities' );
-__( 'GMT-1', 'continents-cities' );
-__( 'GMT-10', 'continents-cities' );
-__( 'GMT-11', 'continents-cities' );
-__( 'GMT-12', 'continents-cities' );
-__( 'GMT-13', 'continents-cities' );
-__( 'GMT-14', 'continents-cities' );
-__( 'GMT-2', 'continents-cities' );
-__( 'GMT-3', 'continents-cities' );
-__( 'GMT-4', 'continents-cities' );
-__( 'GMT-5', 'continents-cities' );
-__( 'GMT-6', 'continents-cities' );
-__( 'GMT-7', 'continents-cities' );
-__( 'GMT-8', 'continents-cities' );
-__( 'GMT-9', 'continents-cities' );
-__( 'GMT0', 'continents-cities' );
-__( 'Greenwich', 'continents-cities' );
-__( 'UCT', 'continents-cities' );
-__( 'UTC', 'continents-cities' );
-__( 'Universal', 'continents-cities' );
-__( 'Zulu', 'continents-cities' );
+__('Etc', 'continents-cities');
+__('GMT', 'continents-cities');
+__('GMT+0', 'continents-cities');
+__('GMT+1', 'continents-cities');
+__('GMT+10', 'continents-cities');
+__('GMT+11', 'continents-cities');
+__('GMT+12', 'continents-cities');
+__('GMT+2', 'continents-cities');
+__('GMT+3', 'continents-cities');
+__('GMT+4', 'continents-cities');
+__('GMT+5', 'continents-cities');
+__('GMT+6', 'continents-cities');
+__('GMT+7', 'continents-cities');
+__('GMT+8', 'continents-cities');
+__('GMT+9', 'continents-cities');
+__('GMT-0', 'continents-cities');
+__('GMT-1', 'continents-cities');
+__('GMT-10', 'continents-cities');
+__('GMT-11', 'continents-cities');
+__('GMT-12', 'continents-cities');
+__('GMT-13', 'continents-cities');
+__('GMT-14', 'continents-cities');
+__('GMT-2', 'continents-cities');
+__('GMT-3', 'continents-cities');
+__('GMT-4', 'continents-cities');
+__('GMT-5', 'continents-cities');
+__('GMT-6', 'continents-cities');
+__('GMT-7', 'continents-cities');
+__('GMT-8', 'continents-cities');
+__('GMT-9', 'continents-cities');
+__('GMT0', 'continents-cities');
+__('Greenwich', 'continents-cities');
+__('UCT', 'continents-cities');
+__('UTC', 'continents-cities');
+__('Universal', 'continents-cities');
+__('Zulu', 'continents-cities');
 
-__( 'Europe', 'continents-cities' );
-__( 'Amsterdam', 'continents-cities' );
-__( 'Andorra', 'continents-cities' );
-__( 'Astrakhan', 'continents-cities' );
-__( 'Athens', 'continents-cities' );
-__( 'Belfast', 'continents-cities' );
-__( 'Belgrade', 'continents-cities' );
-__( 'Berlin', 'continents-cities' );
-__( 'Bratislava', 'continents-cities' );
-__( 'Brussels', 'continents-cities' );
-__( 'Bucharest', 'continents-cities' );
-__( 'Budapest', 'continents-cities' );
-__( 'Busingen', 'continents-cities' );
-__( 'Chisinau', 'continents-cities' );
-__( 'Copenhagen', 'continents-cities' );
-__( 'Dublin', 'continents-cities' );
-__( 'Gibraltar', 'continents-cities' );
-__( 'Guernsey', 'continents-cities' );
-__( 'Helsinki', 'continents-cities' );
-__( 'Isle of Man', 'continents-cities' );
-__( 'Istanbul', 'continents-cities' );
-__( 'Jersey', 'continents-cities' );
-__( 'Kaliningrad', 'continents-cities' );
-__( 'Kiev', 'continents-cities' );
-__( 'Kirov', 'continents-cities' );
-__( 'Lisbon', 'continents-cities' );
-__( 'Ljubljana', 'continents-cities' );
-__( 'London', 'continents-cities' );
-__( 'Luxembourg', 'continents-cities' );
-__( 'Madrid', 'continents-cities' );
-__( 'Malta', 'continents-cities' );
-__( 'Mariehamn', 'continents-cities' );
-__( 'Minsk', 'continents-cities' );
-__( 'Monaco', 'continents-cities' );
-__( 'Moscow', 'continents-cities' );
-__( 'Oslo', 'continents-cities' );
-__( 'Paris', 'continents-cities' );
-__( 'Podgorica', 'continents-cities' );
-__( 'Prague', 'continents-cities' );
-__( 'Riga', 'continents-cities' );
-__( 'Rome', 'continents-cities' );
-__( 'Samara', 'continents-cities' );
-__( 'San Marino', 'continents-cities' );
-__( 'Sarajevo', 'continents-cities' );
-__( 'Saratov', 'continents-cities' );
-__( 'Simferopol', 'continents-cities' );
-__( 'Skopje', 'continents-cities' );
-__( 'Sofia', 'continents-cities' );
-__( 'Stockholm', 'continents-cities' );
-__( 'Tallinn', 'continents-cities' );
-__( 'Tirane', 'continents-cities' );
-__( 'Tiraspol', 'continents-cities' );
-__( 'Ulyanovsk', 'continents-cities' );
-__( 'Uzhgorod', 'continents-cities' );
-__( 'Vaduz', 'continents-cities' );
-__( 'Vatican', 'continents-cities' );
-__( 'Vienna', 'continents-cities' );
-__( 'Vilnius', 'continents-cities' );
-__( 'Volgograd', 'continents-cities' );
-__( 'Warsaw', 'continents-cities' );
-__( 'Zagreb', 'continents-cities' );
-__( 'Zaporozhye', 'continents-cities' );
-__( 'Zurich', 'continents-cities' );
+__('Europe', 'continents-cities');
+__('Amsterdam', 'continents-cities');
+__('Andorra', 'continents-cities');
+__('Astrakhan', 'continents-cities');
+__('Athens', 'continents-cities');
+__('Belfast', 'continents-cities');
+__('Belgrade', 'continents-cities');
+__('Berlin', 'continents-cities');
+__('Bratislava', 'continents-cities');
+__('Brussels', 'continents-cities');
+__('Bucharest', 'continents-cities');
+__('Budapest', 'continents-cities');
+__('Busingen', 'continents-cities');
+__('Chisinau', 'continents-cities');
+__('Copenhagen', 'continents-cities');
+__('Dublin', 'continents-cities');
+__('Gibraltar', 'continents-cities');
+__('Guernsey', 'continents-cities');
+__('Helsinki', 'continents-cities');
+__('Isle of Man', 'continents-cities');
+__('Istanbul', 'continents-cities');
+__('Jersey', 'continents-cities');
+__('Kaliningrad', 'continents-cities');
+__('Kiev', 'continents-cities');
+__('Kirov', 'continents-cities');
+__('Lisbon', 'continents-cities');
+__('Ljubljana', 'continents-cities');
+__('London', 'continents-cities');
+__('Luxembourg', 'continents-cities');
+__('Madrid', 'continents-cities');
+__('Malta', 'continents-cities');
+__('Mariehamn', 'continents-cities');
+__('Minsk', 'continents-cities');
+__('Monaco', 'continents-cities');
+__('Moscow', 'continents-cities');
+__('Oslo', 'continents-cities');
+__('Paris', 'continents-cities');
+__('Podgorica', 'continents-cities');
+__('Prague', 'continents-cities');
+__('Riga', 'continents-cities');
+__('Rome', 'continents-cities');
+__('Samara', 'continents-cities');
+__('San Marino', 'continents-cities');
+__('Sarajevo', 'continents-cities');
+__('Saratov', 'continents-cities');
+__('Simferopol', 'continents-cities');
+__('Skopje', 'continents-cities');
+__('Sofia', 'continents-cities');
+__('Stockholm', 'continents-cities');
+__('Tallinn', 'continents-cities');
+__('Tirane', 'continents-cities');
+__('Tiraspol', 'continents-cities');
+__('Ulyanovsk', 'continents-cities');
+__('Uzhgorod', 'continents-cities');
+__('Vaduz', 'continents-cities');
+__('Vatican', 'continents-cities');
+__('Vienna', 'continents-cities');
+__('Vilnius', 'continents-cities');
+__('Volgograd', 'continents-cities');
+__('Warsaw', 'continents-cities');
+__('Zagreb', 'continents-cities');
+__('Zaporozhye', 'continents-cities');
+__('Zurich', 'continents-cities');
 
-__( 'Indian', 'continents-cities' );
-__( 'Antananarivo', 'continents-cities' );
-__( 'Chagos', 'continents-cities' );
-__( 'Christmas', 'continents-cities' );
-__( 'Cocos', 'continents-cities' );
-__( 'Comoro', 'continents-cities' );
-__( 'Kerguelen', 'continents-cities' );
-__( 'Mahe', 'continents-cities' );
-__( 'Maldives', 'continents-cities' );
-__( 'Mauritius', 'continents-cities' );
-__( 'Mayotte', 'continents-cities' );
-__( 'Reunion', 'continents-cities' );
+__('Indian', 'continents-cities');
+__('Antananarivo', 'continents-cities');
+__('Chagos', 'continents-cities');
+__('Christmas', 'continents-cities');
+__('Cocos', 'continents-cities');
+__('Comoro', 'continents-cities');
+__('Kerguelen', 'continents-cities');
+__('Mahe', 'continents-cities');
+__('Maldives', 'continents-cities');
+__('Mauritius', 'continents-cities');
+__('Mayotte', 'continents-cities');
+__('Reunion', 'continents-cities');
 
-__( 'Pacific', 'continents-cities' );
-__( 'Apia', 'continents-cities' );
-__( 'Auckland', 'continents-cities' );
-__( 'Bougainville', 'continents-cities' );
-__( 'Chatham', 'continents-cities' );
-__( 'Chuuk', 'continents-cities' );
-__( 'Easter', 'continents-cities' );
-__( 'Efate', 'continents-cities' );
-__( 'Enderbury', 'continents-cities' );
-__( 'Fakaofo', 'continents-cities' );
-__( 'Fiji', 'continents-cities' );
-__( 'Funafuti', 'continents-cities' );
-__( 'Galapagos', 'continents-cities' );
-__( 'Gambier', 'continents-cities' );
-__( 'Guadalcanal', 'continents-cities' );
-__( 'Guam', 'continents-cities' );
-__( 'Honolulu', 'continents-cities' );
-__( 'Johnston', 'continents-cities' );
-__( 'Kiritimati', 'continents-cities' );
-__( 'Kosrae', 'continents-cities' );
-__( 'Kwajalein', 'continents-cities' );
-__( 'Majuro', 'continents-cities' );
-__( 'Marquesas', 'continents-cities' );
-__( 'Midway', 'continents-cities' );
-__( 'Nauru', 'continents-cities' );
-__( 'Niue', 'continents-cities' );
-__( 'Norfolk', 'continents-cities' );
-__( 'Noumea', 'continents-cities' );
-__( 'Pago Pago', 'continents-cities' );
-__( 'Palau', 'continents-cities' );
-__( 'Pitcairn', 'continents-cities' );
-__( 'Pohnpei', 'continents-cities' );
-__( 'Ponape', 'continents-cities' );
-__( 'Port Moresby', 'continents-cities' );
-__( 'Rarotonga', 'continents-cities' );
-__( 'Saipan', 'continents-cities' );
-__( 'Samoa', 'continents-cities' );
-__( 'Tahiti', 'continents-cities' );
-__( 'Tarawa', 'continents-cities' );
-__( 'Tongatapu', 'continents-cities' );
-__( 'Truk', 'continents-cities' );
-__( 'Wake', 'continents-cities' );
-__( 'Wallis', 'continents-cities' );
-__( 'Yap', 'continents-cities' );
+__('Pacific', 'continents-cities');
+__('Apia', 'continents-cities');
+__('Auckland', 'continents-cities');
+__('Bougainville', 'continents-cities');
+__('Chatham', 'continents-cities');
+__('Chuuk', 'continents-cities');
+__('Easter', 'continents-cities');
+__('Efate', 'continents-cities');
+__('Enderbury', 'continents-cities');
+__('Fakaofo', 'continents-cities');
+__('Fiji', 'continents-cities');
+__('Funafuti', 'continents-cities');
+__('Galapagos', 'continents-cities');
+__('Gambier', 'continents-cities');
+__('Guadalcanal', 'continents-cities');
+__('Guam', 'continents-cities');
+__('Honolulu', 'continents-cities');
+__('Johnston', 'continents-cities');
+__('Kiritimati', 'continents-cities');
+__('Kosrae', 'continents-cities');
+__('Kwajalein', 'continents-cities');
+__('Majuro', 'continents-cities');
+__('Marquesas', 'continents-cities');
+__('Midway', 'continents-cities');
+__('Nauru', 'continents-cities');
+__('Niue', 'continents-cities');
+__('Norfolk', 'continents-cities');
+__('Noumea', 'continents-cities');
+__('Pago Pago', 'continents-cities');
+__('Palau', 'continents-cities');
+__('Pitcairn', 'continents-cities');
+__('Pohnpei', 'continents-cities');
+__('Ponape', 'continents-cities');
+__('Port Moresby', 'continents-cities');
+__('Rarotonga', 'continents-cities');
+__('Saipan', 'continents-cities');
+__('Samoa', 'continents-cities');
+__('Tahiti', 'continents-cities');
+__('Tarawa', 'continents-cities');
+__('Tongatapu', 'continents-cities');
+__('Truk', 'continents-cities');
+__('Wake', 'continents-cities');
+__('Wallis', 'continents-cities');
+__('Yap', 'continents-cities');

brighty/wp-admin/includes/class-wp-list-table-compat.php

Indentation +45 added lines, -45 removed lines

@@ -13,55 +13,55 @@
  * @since 3.1.0
  */
 class _WP_List_Table_Compat extends WP_List_Table {
-	public $_screen;
-	public $_columns;
+    public $_screen;
+    public $_columns;
 
-	/**
-	 * Constructor.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string|WP_Screen $screen  The screen hook name or screen object.
-	 * @param string[]         $columns An array of columns with column IDs as the keys
-	 *                                  and translated column names as the values.
-	 */
-	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) ) {
-			$screen = convert_to_screen( $screen );
-		}
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     *
+     * @param string|WP_Screen $screen  The screen hook name or screen object.
+     * @param string[]         $columns An array of columns with column IDs as the keys
+     *                                  and translated column names as the values.
+     */
+    public function __construct( $screen, $columns = array() ) {
+        if ( is_string( $screen ) ) {
+            $screen = convert_to_screen( $screen );
+        }
 
-		$this->_screen = $screen;
+        $this->_screen = $screen;
 
-		if ( ! empty( $columns ) ) {
-			$this->_columns = $columns;
-			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
-		}
-	}
+        if ( ! empty( $columns ) ) {
+            $this->_columns = $columns;
+            add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
+        }
+    }
 
-	/**
-	 * Gets a list of all, hidden, and sortable columns.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array
-	 */
-	protected function get_column_info() {
-		$columns  = get_column_headers( $this->_screen );
-		$hidden   = get_hidden_columns( $this->_screen );
-		$sortable = array();
-		$primary  = $this->get_default_primary_column_name();
+    /**
+     * Gets a list of all, hidden, and sortable columns.
+     *
+     * @since 3.1.0
+     *
+     * @return array
+     */
+    protected function get_column_info() {
+        $columns  = get_column_headers( $this->_screen );
+        $hidden   = get_hidden_columns( $this->_screen );
+        $sortable = array();
+        $primary  = $this->get_default_primary_column_name();
 
-		return array( $columns, $hidden, $sortable, $primary );
-	}
+        return array( $columns, $hidden, $sortable, $primary );
+    }
 
-	/**
-	 * Gets a list of columns.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		return $this->_columns;
-	}
+    /**
+     * Gets a list of columns.
+     *
+     * @since 3.1.0
+     *
+     * @return array
+     */
+    public function get_columns() {
+        return $this->_columns;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -25,16 +25,16 @@ 
 	 * @param string[]         $columns An array of columns with column IDs as the keys
 	 *                                  and translated column names as the values.
 	 */
-	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) ) {
-			$screen = convert_to_screen( $screen );
+	public function __construct($screen, $columns = array()) {
+		if (is_string($screen)) {
+			$screen = convert_to_screen($screen);
 		}
 
 		$this->_screen = $screen;
 
-		if ( ! empty( $columns ) ) {
+		if (!empty($columns)) {
 			$this->_columns = $columns;
-			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
+			add_filter('manage_' . $screen->id . '_columns', array($this, 'get_columns'), 0);
 		}
 	}
 
@@ -46,12 +46,12 @@ 
 	 * @return array
 	 */
 	protected function get_column_info() {
-		$columns  = get_column_headers( $this->_screen );
-		$hidden   = get_hidden_columns( $this->_screen );
+		$columns  = get_column_headers($this->_screen);
+		$hidden   = get_hidden_columns($this->_screen);
 		$sortable = array();
 		$primary  = $this->get_default_primary_column_name();
 
-		return array( $columns, $hidden, $sortable, $primary );
+		return array($columns, $hidden, $sortable, $primary);
 	}
 
 	/**

brighty/wp-admin/includes/class-wp-theme-install-list-table.php

Indentation +463 added lines, -463 removed lines

@@ -17,203 +17,203 @@ 
  */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
-	public $features = array();
-
-	/**
-	 * @return bool
-	 */
-	public function ajax_user_can() {
-		return current_user_can( 'install_themes' );
-	}
-
-	/**
-	 * @global array  $tabs
-	 * @global string $tab
-	 * @global int    $paged
-	 * @global string $type
-	 * @global array  $theme_field_defaults
-	 */
-	public function prepare_items() {
-		require ABSPATH . 'wp-admin/includes/theme-install.php';
-
-		global $tabs, $tab, $paged, $type, $theme_field_defaults;
-		wp_reset_vars( array( 'tab' ) );
-
-		$search_terms  = array();
-		$search_string = '';
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-			$search_terms  = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
-		}
-
-		if ( ! empty( $_REQUEST['features'] ) ) {
-			$this->features = $_REQUEST['features'];
-		}
-
-		$paged = $this->get_pagenum();
-
-		$per_page = 36;
-
-		// These are the tabs which are shown on the page,
-		$tabs              = array();
-		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab ) {
-			$tabs['search'] = __( 'Search Results' );
-		}
-		$tabs['upload']   = __( 'Upload' );
-		$tabs['featured'] = _x( 'Featured', 'themes' );
-		//$tabs['popular']  = _x( 'Popular', 'themes' );
-		$tabs['new']     = _x( 'Latest', 'themes' );
-		$tabs['updated'] = _x( 'Recently Updated', 'themes' );
-
-		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
-
-		/** This filter is documented in wp-admin/theme-install.php */
-		$tabs = apply_filters( 'install_themes_tabs', $tabs );
-
-		/**
-		 * Filters tabs not associated with a menu item on the Install Themes screen.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param string[] $nonmenu_tabs The tabs that don't have a menu item on
-		 *                               the Install Themes screen.
-		 */
-		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
-
-		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs, true ) ) ) {
-			$tab = key( $tabs );
-		}
-
-		$args = array(
-			'page'     => $paged,
-			'per_page' => $per_page,
-			'fields'   => $theme_field_defaults,
-		);
-
-		switch ( $tab ) {
-			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				switch ( $type ) {
-					case 'tag':
-						$args['tag'] = array_map( 'sanitize_key', $search_terms );
-						break;
-					case 'term':
-						$args['search'] = $search_string;
-						break;
-					case 'author':
-						$args['author'] = $search_string;
-						break;
-				}
-
-				if ( ! empty( $this->features ) ) {
-					$args['tag']      = $this->features;
-					$_REQUEST['s']    = implode( ',', $this->features );
-					$_REQUEST['type'] = 'tag';
-				}
-
-				add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
-				break;
-
-			case 'featured':
-				// case 'popular':
-			case 'new':
-			case 'updated':
-				$args['browse'] = $tab;
-				break;
-
-			default:
-				$args = false;
-				break;
-		}
-
-		/**
-		 * Filters API request arguments for each Install Themes screen tab.
-		 *
-		 * The dynamic portion of the hook name, `$tab`, refers to the theme install
-		 * tab.
-		 *
-		 * Possible hook names include:
-		 *
-		 *  - `install_themes_table_api_args_dashboard`
-		 *  - `install_themes_table_api_args_featured`
-		 *  - `install_themes_table_api_args_new`
-		 *  - `install_themes_table_api_args_search`
-		 *  - `install_themes_table_api_args_updated`
-		 *  - `install_themes_table_api_args_upload`
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param array|false $args Theme install API arguments.
-		 */
-		$args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
-
-		if ( ! $args ) {
-			return;
-		}
-
-		$api = themes_api( 'query_themes', $args );
-
-		if ( is_wp_error( $api ) ) {
-			wp_die( '<p>' . $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try Again' ) . '</a></p>' );
-		}
-
-		$this->items = $api->themes;
-
-		$this->set_pagination_args(
-			array(
-				'total_items'     => $api->info['results'],
-				'per_page'        => $args['per_page'],
-				'infinite_scroll' => true,
-			)
-		);
-	}
-
-	/**
-	 */
-	public function no_items() {
-		_e( 'No themes match your request.' );
-	}
-
-	/**
-	 * @global array $tabs
-	 * @global string $tab
-	 * @return array
-	 */
-	protected function get_views() {
-		global $tabs, $tab;
-
-		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$current_link_attributes                    = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
-			$href                                       = self_admin_url( 'theme-install.php?tab=' . $action );
-			$display_tabs[ 'theme-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
-		}
-
-		return $display_tabs;
-	}
-
-	/**
-	 * Displays the theme install table.
-	 *
-	 * Overrides the parent display() method to provide a different container.
-	 *
-	 * @since 3.1.0
-	 */
-	public function display() {
-		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-		?>
+    public $features = array();
+
+    /**
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can( 'install_themes' );
+    }
+
+    /**
+     * @global array  $tabs
+     * @global string $tab
+     * @global int    $paged
+     * @global string $type
+     * @global array  $theme_field_defaults
+     */
+    public function prepare_items() {
+        require ABSPATH . 'wp-admin/includes/theme-install.php';
+
+        global $tabs, $tab, $paged, $type, $theme_field_defaults;
+        wp_reset_vars( array( 'tab' ) );
+
+        $search_terms  = array();
+        $search_string = '';
+        if ( ! empty( $_REQUEST['s'] ) ) {
+            $search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
+            $search_terms  = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+        }
+
+        if ( ! empty( $_REQUEST['features'] ) ) {
+            $this->features = $_REQUEST['features'];
+        }
+
+        $paged = $this->get_pagenum();
+
+        $per_page = 36;
+
+        // These are the tabs which are shown on the page,
+        $tabs              = array();
+        $tabs['dashboard'] = __( 'Search' );
+        if ( 'search' === $tab ) {
+            $tabs['search'] = __( 'Search Results' );
+        }
+        $tabs['upload']   = __( 'Upload' );
+        $tabs['featured'] = _x( 'Featured', 'themes' );
+        //$tabs['popular']  = _x( 'Popular', 'themes' );
+        $tabs['new']     = _x( 'Latest', 'themes' );
+        $tabs['updated'] = _x( 'Recently Updated', 'themes' );
+
+        $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+
+        /** This filter is documented in wp-admin/theme-install.php */
+        $tabs = apply_filters( 'install_themes_tabs', $tabs );
+
+        /**
+         * Filters tabs not associated with a menu item on the Install Themes screen.
+         *
+         * @since 2.8.0
+         *
+         * @param string[] $nonmenu_tabs The tabs that don't have a menu item on
+         *                               the Install Themes screen.
+         */
+        $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
+
+        // If a non-valid menu tab has been selected, And it's not a non-menu action.
+        if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs, true ) ) ) {
+            $tab = key( $tabs );
+        }
+
+        $args = array(
+            'page'     => $paged,
+            'per_page' => $per_page,
+            'fields'   => $theme_field_defaults,
+        );
+
+        switch ( $tab ) {
+            case 'search':
+                $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
+                switch ( $type ) {
+                    case 'tag':
+                        $args['tag'] = array_map( 'sanitize_key', $search_terms );
+                        break;
+                    case 'term':
+                        $args['search'] = $search_string;
+                        break;
+                    case 'author':
+                        $args['author'] = $search_string;
+                        break;
+                }
+
+                if ( ! empty( $this->features ) ) {
+                    $args['tag']      = $this->features;
+                    $_REQUEST['s']    = implode( ',', $this->features );
+                    $_REQUEST['type'] = 'tag';
+                }
+
+                add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
+                break;
+
+            case 'featured':
+                // case 'popular':
+            case 'new':
+            case 'updated':
+                $args['browse'] = $tab;
+                break;
+
+            default:
+                $args = false;
+                break;
+        }
+
+        /**
+         * Filters API request arguments for each Install Themes screen tab.
+         *
+         * The dynamic portion of the hook name, `$tab`, refers to the theme install
+         * tab.
+         *
+         * Possible hook names include:
+         *
+         *  - `install_themes_table_api_args_dashboard`
+         *  - `install_themes_table_api_args_featured`
+         *  - `install_themes_table_api_args_new`
+         *  - `install_themes_table_api_args_search`
+         *  - `install_themes_table_api_args_updated`
+         *  - `install_themes_table_api_args_upload`
+         *
+         * @since 3.7.0
+         *
+         * @param array|false $args Theme install API arguments.
+         */
+        $args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
+
+        if ( ! $args ) {
+            return;
+        }
+
+        $api = themes_api( 'query_themes', $args );
+
+        if ( is_wp_error( $api ) ) {
+            wp_die( '<p>' . $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try Again' ) . '</a></p>' );
+        }
+
+        $this->items = $api->themes;
+
+        $this->set_pagination_args(
+            array(
+                'total_items'     => $api->info['results'],
+                'per_page'        => $args['per_page'],
+                'infinite_scroll' => true,
+            )
+        );
+    }
+
+    /**
+     */
+    public function no_items() {
+        _e( 'No themes match your request.' );
+    }
+
+    /**
+     * @global array $tabs
+     * @global string $tab
+     * @return array
+     */
+    protected function get_views() {
+        global $tabs, $tab;
+
+        $display_tabs = array();
+        foreach ( (array) $tabs as $action => $text ) {
+            $current_link_attributes                    = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
+            $href                                       = self_admin_url( 'theme-install.php?tab=' . $action );
+            $display_tabs[ 'theme-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
+        }
+
+        return $display_tabs;
+    }
+
+    /**
+     * Displays the theme install table.
+     *
+     * Overrides the parent display() method to provide a different container.
+     *
+     * @since 3.1.0
+     */
+    public function display() {
+        wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
+        ?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
 				<?php
-				/**
-				 * Fires in the Install Themes list table header.
-				 *
-				 * @since 2.8.0
-				 */
-				do_action( 'install_themes_table_header' );
-				?>
+                /**
+                 * Fires in the Install Themes list table header.
+                 *
+                 * @since 2.8.0
+                 */
+                do_action( 'install_themes_table_header' );
+                ?>
 			</div>
 			<?php $this->pagination( 'top' ); ?>
 			<br class="clear" />
@@ -224,140 +224,140 @@ 
 		</div>
 
 		<?php
-		$this->tablenav( 'bottom' );
-	}
-
-	/**
-	 */
-	public function display_rows() {
-		$themes = $this->items;
-		foreach ( $themes as $theme ) {
-			?>
+        $this->tablenav( 'bottom' );
+    }
+
+    /**
+     */
+    public function display_rows() {
+        $themes = $this->items;
+        foreach ( $themes as $theme ) {
+            ?>
 				<div class="available-theme installable-theme">
 				<?php
-					$this->single_row( $theme );
-				?>
+                    $this->single_row( $theme );
+                ?>
 				</div>
 			<?php
-		} // End foreach $theme_names.
-
-		$this->theme_installer();
-	}
-
-	/**
-	 * Prints a theme from the WordPress.org API.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global array $themes_allowedtags
-	 *
-	 * @param stdClass $theme {
-	 *     An object that contains theme data returned by the WordPress.org API.
-	 *
-	 *     @type string $name           Theme name, e.g. 'Twenty Twenty-One'.
-	 *     @type string $slug           Theme slug, e.g. 'twentytwentyone'.
-	 *     @type string $version        Theme version, e.g. '1.1'.
-	 *     @type string $author         Theme author username, e.g. 'melchoyce'.
-	 *     @type string $preview_url    Preview URL, e.g. 'https://2021.wordpress.net/'.
-	 *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentytwentyone/'.
-	 *     @type float  $rating         Rating score.
-	 *     @type int    $num_ratings    The number of ratings.
-	 *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentytwentyone/'.
-	 *     @type string $description    Theme description.
-	 *     @type string $download_link  Theme ZIP download URL.
-	 * }
-	 */
-	public function single_row( $theme ) {
-		global $themes_allowedtags;
-
-		if ( empty( $theme ) ) {
-			return;
-		}
-
-		$name   = wp_kses( $theme->name, $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
-
-		/* translators: %s: Theme name. */
-		$preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
-		$preview_url   = add_query_arg(
-			array(
-				'tab'   => 'theme-information',
-				'theme' => $theme->slug,
-			),
-			self_admin_url( 'theme-install.php' )
-		);
-
-		$actions = array();
-
-		$install_url = add_query_arg(
-			array(
-				'action' => 'install-theme',
-				'theme'  => $theme->slug,
-			),
-			self_admin_url( 'update.php' )
-		);
-
-		$update_url = add_query_arg(
-			array(
-				'action' => 'upgrade-theme',
-				'theme'  => $theme->slug,
-			),
-			self_admin_url( 'update.php' )
-		);
-
-		$status = $this->_get_theme_status( $theme );
-
-		switch ( $status ) {
-			case 'update_available':
-				$actions[] = sprintf(
-					'<a class="install-now" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
-					/* translators: %s: Theme version. */
-					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
-					__( 'Update' )
-				);
-				break;
-			case 'newer_installed':
-			case 'latest_installed':
-				$actions[] = sprintf(
-					'<span class="install-now" title="%s">%s</span>',
-					esc_attr__( 'This theme is already installed and is up to date' ),
-					_x( 'Installed', 'theme' )
-				);
-				break;
-			case 'install':
-			default:
-				$actions[] = sprintf(
-					'<a class="install-now" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
-					/* translators: %s: Theme name. */
-					esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
-					__( 'Install Now' )
-				);
-				break;
-		}
-
-		$actions[] = sprintf(
-			'<a class="install-theme-preview" href="%s" title="%s">%s</a>',
-			esc_url( $preview_url ),
-			/* translators: %s: Theme name. */
-			esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
-			__( 'Preview' )
-		);
-
-		/**
-		 * Filters the install action links for a theme in the Install Themes list table.
-		 *
-		 * @since 3.4.0
-		 *
-		 * @param string[] $actions An array of theme action links. Defaults are
-		 *                          links to Install Now, Preview, and Details.
-		 * @param stdClass $theme   An object that contains theme data returned by the
-		 *                          WordPress.org API.
-		 */
-		$actions = apply_filters( 'theme_install_actions', $actions, $theme );
-
-		?>
+        } // End foreach $theme_names.
+
+        $this->theme_installer();
+    }
+
+    /**
+     * Prints a theme from the WordPress.org API.
+     *
+     * @since 3.1.0
+     *
+     * @global array $themes_allowedtags
+     *
+     * @param stdClass $theme {
+     *     An object that contains theme data returned by the WordPress.org API.
+     *
+     *     @type string $name           Theme name, e.g. 'Twenty Twenty-One'.
+     *     @type string $slug           Theme slug, e.g. 'twentytwentyone'.
+     *     @type string $version        Theme version, e.g. '1.1'.
+     *     @type string $author         Theme author username, e.g. 'melchoyce'.
+     *     @type string $preview_url    Preview URL, e.g. 'https://2021.wordpress.net/'.
+     *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentytwentyone/'.
+     *     @type float  $rating         Rating score.
+     *     @type int    $num_ratings    The number of ratings.
+     *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentytwentyone/'.
+     *     @type string $description    Theme description.
+     *     @type string $download_link  Theme ZIP download URL.
+     * }
+     */
+    public function single_row( $theme ) {
+        global $themes_allowedtags;
+
+        if ( empty( $theme ) ) {
+            return;
+        }
+
+        $name   = wp_kses( $theme->name, $themes_allowedtags );
+        $author = wp_kses( $theme->author, $themes_allowedtags );
+
+        /* translators: %s: Theme name. */
+        $preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
+        $preview_url   = add_query_arg(
+            array(
+                'tab'   => 'theme-information',
+                'theme' => $theme->slug,
+            ),
+            self_admin_url( 'theme-install.php' )
+        );
+
+        $actions = array();
+
+        $install_url = add_query_arg(
+            array(
+                'action' => 'install-theme',
+                'theme'  => $theme->slug,
+            ),
+            self_admin_url( 'update.php' )
+        );
+
+        $update_url = add_query_arg(
+            array(
+                'action' => 'upgrade-theme',
+                'theme'  => $theme->slug,
+            ),
+            self_admin_url( 'update.php' )
+        );
+
+        $status = $this->_get_theme_status( $theme );
+
+        switch ( $status ) {
+            case 'update_available':
+                $actions[] = sprintf(
+                    '<a class="install-now" href="%s" title="%s">%s</a>',
+                    esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+                    /* translators: %s: Theme version. */
+                    esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
+                    __( 'Update' )
+                );
+                break;
+            case 'newer_installed':
+            case 'latest_installed':
+                $actions[] = sprintf(
+                    '<span class="install-now" title="%s">%s</span>',
+                    esc_attr__( 'This theme is already installed and is up to date' ),
+                    _x( 'Installed', 'theme' )
+                );
+                break;
+            case 'install':
+            default:
+                $actions[] = sprintf(
+                    '<a class="install-now" href="%s" title="%s">%s</a>',
+                    esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+                    /* translators: %s: Theme name. */
+                    esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
+                    __( 'Install Now' )
+                );
+                break;
+        }
+
+        $actions[] = sprintf(
+            '<a class="install-theme-preview" href="%s" title="%s">%s</a>',
+            esc_url( $preview_url ),
+            /* translators: %s: Theme name. */
+            esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
+            __( 'Preview' )
+        );
+
+        /**
+         * Filters the install action links for a theme in the Install Themes list table.
+         *
+         * @since 3.4.0
+         *
+         * @param string[] $actions An array of theme action links. Defaults are
+         *                          links to Install Now, Preview, and Details.
+         * @param stdClass $theme   An object that contains theme data returned by the
+         *                          WordPress.org API.
+         */
+        $actions = apply_filters( 'theme_install_actions', $actions, $theme );
+
+        ?>
 		<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
 			<img src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" width="150" alt="" />
 		</a>
@@ -365,9 +365,9 @@ 
 		<h3><?php echo $name; ?></h3>
 		<div class="theme-author">
 		<?php
-			/* translators: %s: Theme author. */
-			printf( __( 'By %s' ), $author );
-		?>
+            /* translators: %s: Theme author. */
+            printf( __( 'By %s' ), $author );
+        ?>
 		</div>
 
 		<div class="action-links">
@@ -380,14 +380,14 @@ 
 		</div>
 
 		<?php
-		$this->install_theme_info( $theme );
-	}
-
-	/**
-	 * Prints the wrapper for the theme installer.
-	 */
-	public function theme_installer() {
-		?>
+        $this->install_theme_info( $theme );
+    }
+
+    /**
+     * Prints the wrapper for the theme installer.
+     */
+    public function theme_installer() {
+        ?>
 		<div id="theme-installer" class="wp-full-overlay expanded">
 			<div class="wp-full-overlay-sidebar">
 				<div class="wp-full-overlay-header">
@@ -407,16 +407,16 @@ 
 			<div class="wp-full-overlay-main"></div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Prints the wrapper for the theme installer with a provided theme's data.
-	 * Used to make the theme installer work for no-js.
-	 *
-	 * @param stdClass $theme A WordPress.org Theme API object.
-	 */
-	public function theme_installer_single( $theme ) {
-		?>
+    }
+
+    /**
+     * Prints the wrapper for the theme installer with a provided theme's data.
+     * Used to make the theme installer work for no-js.
+     *
+     * @param stdClass $theme A WordPress.org Theme API object.
+     */
+    public function theme_installer_single( $theme ) {
+        ?>
 		<div id="theme-installer" class="wp-full-overlay single-theme">
 			<div class="wp-full-overlay-sidebar">
 				<?php $this->install_theme_info( $theme ); ?>
@@ -426,94 +426,94 @@ 
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Prints the info for a theme (to be used in the theme installer modal).
-	 *
-	 * @global array $themes_allowedtags
-	 *
-	 * @param stdClass $theme A WordPress.org Theme API object.
-	 */
-	public function install_theme_info( $theme ) {
-		global $themes_allowedtags;
-
-		if ( empty( $theme ) ) {
-			return;
-		}
-
-		$name   = wp_kses( $theme->name, $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
-
-		$install_url = add_query_arg(
-			array(
-				'action' => 'install-theme',
-				'theme'  => $theme->slug,
-			),
-			self_admin_url( 'update.php' )
-		);
-
-		$update_url = add_query_arg(
-			array(
-				'action' => 'upgrade-theme',
-				'theme'  => $theme->slug,
-			),
-			self_admin_url( 'update.php' )
-		);
-
-		$status = $this->_get_theme_status( $theme );
-
-		?>
+    }
+
+    /**
+     * Prints the info for a theme (to be used in the theme installer modal).
+     *
+     * @global array $themes_allowedtags
+     *
+     * @param stdClass $theme A WordPress.org Theme API object.
+     */
+    public function install_theme_info( $theme ) {
+        global $themes_allowedtags;
+
+        if ( empty( $theme ) ) {
+            return;
+        }
+
+        $name   = wp_kses( $theme->name, $themes_allowedtags );
+        $author = wp_kses( $theme->author, $themes_allowedtags );
+
+        $install_url = add_query_arg(
+            array(
+                'action' => 'install-theme',
+                'theme'  => $theme->slug,
+            ),
+            self_admin_url( 'update.php' )
+        );
+
+        $update_url = add_query_arg(
+            array(
+                'action' => 'upgrade-theme',
+                'theme'  => $theme->slug,
+            ),
+            self_admin_url( 'update.php' )
+        );
+
+        $status = $this->_get_theme_status( $theme );
+
+        ?>
 		<div class="install-theme-info">
 		<?php
-		switch ( $status ) {
-			case 'update_available':
-				printf(
-					'<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
-					/* translators: %s: Theme version. */
-					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
-					__( 'Update' )
-				);
-				break;
-			case 'newer_installed':
-			case 'latest_installed':
-				printf(
-					'<span class="theme-install" title="%s">%s</span>',
-					esc_attr__( 'This theme is already installed and is up to date' ),
-					_x( 'Installed', 'theme' )
-				);
-				break;
-			case 'install':
-			default:
-				printf(
-					'<a class="theme-install button button-primary" href="%s">%s</a>',
-					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
-					__( 'Install' )
-				);
-				break;
-		}
-		?>
+        switch ( $status ) {
+            case 'update_available':
+                printf(
+                    '<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
+                    esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+                    /* translators: %s: Theme version. */
+                    esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
+                    __( 'Update' )
+                );
+                break;
+            case 'newer_installed':
+            case 'latest_installed':
+                printf(
+                    '<span class="theme-install" title="%s">%s</span>',
+                    esc_attr__( 'This theme is already installed and is up to date' ),
+                    _x( 'Installed', 'theme' )
+                );
+                break;
+            case 'install':
+            default:
+                printf(
+                    '<a class="theme-install button button-primary" href="%s">%s</a>',
+                    esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+                    __( 'Install' )
+                );
+                break;
+        }
+        ?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
 			<span class="theme-by">
 			<?php
-				/* translators: %s: Theme author. */
-				printf( __( 'By %s' ), $author );
-			?>
+                /* translators: %s: Theme author. */
+                printf( __( 'By %s' ), $author );
+            ?>
 			</span>
 			<?php if ( isset( $theme->screenshot_url ) ) : ?>
 				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
 				<?php
-				wp_star_rating(
-					array(
-						'rating' => $theme->rating,
-						'type'   => 'percent',
-						'number' => $theme->num_ratings,
-					)
-				);
-				?>
+                wp_star_rating(
+                    array(
+                        'rating' => $theme->rating,
+                        'type'   => 'percent',
+                        'number' => $theme->num_ratings,
+                    )
+                );
+                ?>
 				<div class="theme-version">
 					<strong><?php _e( 'Version:' ); ?> </strong>
 					<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
@@ -525,45 +525,45 @@ 
 			<input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
 		</div>
 		<?php
-	}
-
-	/**
-	 * Send required variables to JavaScript land
-	 *
-	 * @since 3.4.0
-	 *
-	 * @global string $tab  Current tab within Themes->Install screen
-	 * @global string $type Type of search.
-	 *
-	 * @param array $extra_args Unused.
-	 */
-	public function _js_vars( $extra_args = array() ) {
-		global $tab, $type;
-		parent::_js_vars( compact( 'tab', 'type' ) );
-	}
-
-	/**
-	 * Check to see if the theme is already installed.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param stdClass $theme A WordPress.org Theme API object.
-	 * @return string Theme status.
-	 */
-	private function _get_theme_status( $theme ) {
-		$status = 'install';
-
-		$installed_theme = wp_get_theme( $theme->slug );
-		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '=' ) ) {
-				$status = 'latest_installed';
-			} elseif ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '>' ) ) {
-				$status = 'newer_installed';
-			} else {
-				$status = 'update_available';
-			}
-		}
-
-		return $status;
-	}
+    }
+
+    /**
+     * Send required variables to JavaScript land
+     *
+     * @since 3.4.0
+     *
+     * @global string $tab  Current tab within Themes->Install screen
+     * @global string $type Type of search.
+     *
+     * @param array $extra_args Unused.
+     */
+    public function _js_vars( $extra_args = array() ) {
+        global $tab, $type;
+        parent::_js_vars( compact( 'tab', 'type' ) );
+    }
+
+    /**
+     * Check to see if the theme is already installed.
+     *
+     * @since 3.4.0
+     *
+     * @param stdClass $theme A WordPress.org Theme API object.
+     * @return string Theme status.
+     */
+    private function _get_theme_status( $theme ) {
+        $status = 'install';
+
+        $installed_theme = wp_get_theme( $theme->slug );
+        if ( $installed_theme->exists() ) {
+            if ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '=' ) ) {
+                $status = 'latest_installed';
+            } elseif ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '>' ) ) {
+                $status = 'newer_installed';
+            } else {
+                $status = 'update_available';
+            }
+        }
+
+        return $status;
+    }
 }

Spacing +104 added lines, -104 removed lines

@@ -23,7 +23,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'install_themes' );
+		return current_user_can('install_themes');
 	}
 
 	/**
@@ -37,16 +37,16 @@ 
 		require ABSPATH . 'wp-admin/includes/theme-install.php';
 
 		global $tabs, $tab, $paged, $type, $theme_field_defaults;
-		wp_reset_vars( array( 'tab' ) );
+		wp_reset_vars(array('tab'));
 
 		$search_terms  = array();
 		$search_string = '';
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-			$search_terms  = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+		if (!empty($_REQUEST['s'])) {
+			$search_string = strtolower(wp_unslash($_REQUEST['s']));
+			$search_terms  = array_unique(array_filter(array_map('trim', explode(',', $search_string))));
 		}
 
-		if ( ! empty( $_REQUEST['features'] ) ) {
+		if (!empty($_REQUEST['features'])) {
 			$this->features = $_REQUEST['features'];
 		}
 
@@ -56,20 +56,20 @@ 
 
 		// These are the tabs which are shown on the page,
 		$tabs              = array();
-		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab ) {
-			$tabs['search'] = __( 'Search Results' );
+		$tabs['dashboard'] = __('Search');
+		if ('search' === $tab) {
+			$tabs['search'] = __('Search Results');
 		}
-		$tabs['upload']   = __( 'Upload' );
-		$tabs['featured'] = _x( 'Featured', 'themes' );
+		$tabs['upload']   = __('Upload');
+		$tabs['featured'] = _x('Featured', 'themes');
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
-		$tabs['new']     = _x( 'Latest', 'themes' );
-		$tabs['updated'] = _x( 'Recently Updated', 'themes' );
+		$tabs['new']     = _x('Latest', 'themes');
+		$tabs['updated'] = _x('Recently Updated', 'themes');
 
-		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+		$nonmenu_tabs = array('theme-information'); // Valid actions to perform which do not have a Menu item.
 
 		/** This filter is documented in wp-admin/theme-install.php */
-		$tabs = apply_filters( 'install_themes_tabs', $tabs );
+		$tabs = apply_filters('install_themes_tabs', $tabs);
 
 		/**
 		 * Filters tabs not associated with a menu item on the Install Themes screen.
@@ -79,11 +79,11 @@ 
 		 * @param string[] $nonmenu_tabs The tabs that don't have a menu item on
 		 *                               the Install Themes screen.
 		 */
-		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
+		$nonmenu_tabs = apply_filters('install_themes_nonmenu_tabs', $nonmenu_tabs);
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs, true ) ) ) {
-			$tab = key( $tabs );
+		if (empty($tab) || (!isset($tabs[$tab]) && !in_array($tab, (array) $nonmenu_tabs, true))) {
+			$tab = key($tabs);
 		}
 
 		$args = array(
@@ -92,12 +92,12 @@ 
 			'fields'   => $theme_field_defaults,
 		);
 
-		switch ( $tab ) {
+		switch ($tab) {
 			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				switch ( $type ) {
+				$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+				switch ($type) {
 					case 'tag':
-						$args['tag'] = array_map( 'sanitize_key', $search_terms );
+						$args['tag'] = array_map('sanitize_key', $search_terms);
 						break;
 					case 'term':
 						$args['search'] = $search_string;
@@ -107,13 +107,13 @@ 
 						break;
 				}
 
-				if ( ! empty( $this->features ) ) {
+				if (!empty($this->features)) {
 					$args['tag']      = $this->features;
-					$_REQUEST['s']    = implode( ',', $this->features );
+					$_REQUEST['s']    = implode(',', $this->features);
 					$_REQUEST['type'] = 'tag';
 				}
 
-				add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
+				add_action('install_themes_table_header', 'install_theme_search_form', 10, 0);
 				break;
 
 			case 'featured':
@@ -147,16 +147,16 @@ 
 		 *
 		 * @param array|false $args Theme install API arguments.
 		 */
-		$args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
+		$args = apply_filters("install_themes_table_api_args_{$tab}", $args);
 
-		if ( ! $args ) {
+		if (!$args) {
 			return;
 		}
 
-		$api = themes_api( 'query_themes', $args );
+		$api = themes_api('query_themes', $args);
 
-		if ( is_wp_error( $api ) ) {
-			wp_die( '<p>' . $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try Again' ) . '</a></p>' );
+		if (is_wp_error($api)) {
+			wp_die('<p>' . $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __('Try Again') . '</a></p>');
 		}
 
 		$this->items = $api->themes;
@@ -173,7 +173,7 @@ 
 	/**
 	 */
 	public function no_items() {
-		_e( 'No themes match your request.' );
+		_e('No themes match your request.');
 	}
 
 	/**
@@ -185,10 +185,10 @@ 
 		global $tabs, $tab;
 
 		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$current_link_attributes                    = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
-			$href                                       = self_admin_url( 'theme-install.php?tab=' . $action );
-			$display_tabs[ 'theme-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
+		foreach ((array) $tabs as $action => $text) {
+			$current_link_attributes                    = ($action === $tab) ? ' class="current" aria-current="page"' : '';
+			$href                                       = self_admin_url('theme-install.php?tab=' . $action);
+			$display_tabs['theme-install-' . $action] = "<a href='$href'$current_link_attributes>$text</a>";
 		}
 
 		return $display_tabs;
@@ -202,7 +202,7 @@ 
 	 * @since 3.1.0
 	 */
 	public function display() {
-		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field('fetch-list-' . get_class($this), '_ajax_fetch_list_nonce');
 		?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
@@ -212,10 +212,10 @@ 
 				 *
 				 * @since 2.8.0
 				 */
-				do_action( 'install_themes_table_header' );
+				do_action('install_themes_table_header');
 				?>
 			</div>
-			<?php $this->pagination( 'top' ); ?>
+			<?php $this->pagination('top'); ?>
 			<br class="clear" />
 		</div>
 
@@ -224,18 +224,18 @@ 
 		</div>
 
 		<?php
-		$this->tablenav( 'bottom' );
+		$this->tablenav('bottom');
 	}
 
 	/**
 	 */
 	public function display_rows() {
 		$themes = $this->items;
-		foreach ( $themes as $theme ) {
+		foreach ($themes as $theme) {
 			?>
 				<div class="available-theme installable-theme">
 				<?php
-					$this->single_row( $theme );
+					$this->single_row($theme);
 				?>
 				</div>
 			<?php
@@ -267,24 +267,24 @@ 
 	 *     @type string $download_link  Theme ZIP download URL.
 	 * }
 	 */
-	public function single_row( $theme ) {
+	public function single_row($theme) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) ) {
+		if (empty($theme)) {
 			return;
 		}
 
-		$name   = wp_kses( $theme->name, $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
+		$name   = wp_kses($theme->name, $themes_allowedtags);
+		$author = wp_kses($theme->author, $themes_allowedtags);
 
 		/* translators: %s: Theme name. */
-		$preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
+		$preview_title = sprintf(__('Preview &#8220;%s&#8221;'), $name);
 		$preview_url   = add_query_arg(
 			array(
 				'tab'   => 'theme-information',
 				'theme' => $theme->slug,
 			),
-			self_admin_url( 'theme-install.php' )
+			self_admin_url('theme-install.php')
 		);
 
 		$actions = array();
@@ -294,7 +294,7 @@ 
 				'action' => 'install-theme',
 				'theme'  => $theme->slug,
 			),
-			self_admin_url( 'update.php' )
+			self_admin_url('update.php')
 		);
 
 		$update_url = add_query_arg(
@@ -302,47 +302,47 @@ 
 				'action' => 'upgrade-theme',
 				'theme'  => $theme->slug,
 			),
-			self_admin_url( 'update.php' )
+			self_admin_url('update.php')
 		);
 
-		$status = $this->_get_theme_status( $theme );
+		$status = $this->_get_theme_status($theme);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'update_available':
 				$actions[] = sprintf(
 					'<a class="install-now" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+					esc_url(wp_nonce_url($update_url, 'upgrade-theme_' . $theme->slug)),
 					/* translators: %s: Theme version. */
-					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
-					__( 'Update' )
+					esc_attr(sprintf(__('Update to version %s'), $theme->version)),
+					__('Update')
 				);
 				break;
 			case 'newer_installed':
 			case 'latest_installed':
 				$actions[] = sprintf(
 					'<span class="install-now" title="%s">%s</span>',
-					esc_attr__( 'This theme is already installed and is up to date' ),
-					_x( 'Installed', 'theme' )
+					esc_attr__('This theme is already installed and is up to date'),
+					_x('Installed', 'theme')
 				);
 				break;
 			case 'install':
 			default:
 				$actions[] = sprintf(
 					'<a class="install-now" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+					esc_url(wp_nonce_url($install_url, 'install-theme_' . $theme->slug)),
 					/* translators: %s: Theme name. */
-					esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
-					__( 'Install Now' )
+					esc_attr(sprintf(_x('Install %s', 'theme'), $name)),
+					__('Install Now')
 				);
 				break;
 		}
 
 		$actions[] = sprintf(
 			'<a class="install-theme-preview" href="%s" title="%s">%s</a>',
-			esc_url( $preview_url ),
+			esc_url($preview_url),
 			/* translators: %s: Theme name. */
-			esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
-			__( 'Preview' )
+			esc_attr(sprintf(__('Preview %s'), $name)),
+			__('Preview')
 		);
 
 		/**
@@ -355,32 +355,32 @@ 
 		 * @param stdClass $theme   An object that contains theme data returned by the
 		 *                          WordPress.org API.
 		 */
-		$actions = apply_filters( 'theme_install_actions', $actions, $theme );
+		$actions = apply_filters('theme_install_actions', $actions, $theme);
 
 		?>
-		<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
-			<img src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" width="150" alt="" />
+		<a class="screenshot install-theme-preview" href="<?php echo esc_url($preview_url); ?>" title="<?php echo esc_attr($preview_title); ?>">
+			<img src="<?php echo esc_url($theme->screenshot_url . '?ver=' . $theme->version); ?>" width="150" alt="" />
 		</a>
 
 		<h3><?php echo $name; ?></h3>
 		<div class="theme-author">
 		<?php
 			/* translators: %s: Theme author. */
-			printf( __( 'By %s' ), $author );
+			printf(__('By %s'), $author);
 		?>
 		</div>
 
 		<div class="action-links">
 			<ul>
-				<?php foreach ( $actions as $action ) : ?>
+				<?php foreach ($actions as $action) : ?>
 					<li><?php echo $action; ?></li>
 				<?php endforeach; ?>
-				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e( 'Details' ); ?></a></li>
+				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details'); ?></a></li>
 			</ul>
 		</div>
 
 		<?php
-		$this->install_theme_info( $theme );
+		$this->install_theme_info($theme);
 	}
 
 	/**
@@ -391,16 +391,16 @@ 
 		<div id="theme-installer" class="wp-full-overlay expanded">
 			<div class="wp-full-overlay-sidebar">
 				<div class="wp-full-overlay-header">
-					<a href="#" class="close-full-overlay button"><?php _e( 'Close' ); ?></a>
+					<a href="#" class="close-full-overlay button"><?php _e('Close'); ?></a>
 					<span class="theme-install"></span>
 				</div>
 				<div class="wp-full-overlay-sidebar-content">
 					<div class="install-theme-info"></div>
 				</div>
 				<div class="wp-full-overlay-footer">
-					<button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+					<button type="button" class="collapse-sidebar button" 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>
@@ -415,14 +415,14 @@ 
 	 *
 	 * @param stdClass $theme A WordPress.org Theme API object.
 	 */
-	public function theme_installer_single( $theme ) {
+	public function theme_installer_single($theme) {
 		?>
 		<div id="theme-installer" class="wp-full-overlay single-theme">
 			<div class="wp-full-overlay-sidebar">
-				<?php $this->install_theme_info( $theme ); ?>
+				<?php $this->install_theme_info($theme); ?>
 			</div>
 			<div class="wp-full-overlay-main">
-				<iframe src="<?php echo esc_url( $theme->preview_url ); ?>"></iframe>
+				<iframe src="<?php echo esc_url($theme->preview_url); ?>"></iframe>
 			</div>
 		</div>
 		<?php
@@ -435,22 +435,22 @@ 
 	 *
 	 * @param stdClass $theme A WordPress.org Theme API object.
 	 */
-	public function install_theme_info( $theme ) {
+	public function install_theme_info($theme) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) ) {
+		if (empty($theme)) {
 			return;
 		}
 
-		$name   = wp_kses( $theme->name, $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
+		$name   = wp_kses($theme->name, $themes_allowedtags);
+		$author = wp_kses($theme->author, $themes_allowedtags);
 
 		$install_url = add_query_arg(
 			array(
 				'action' => 'install-theme',
 				'theme'  => $theme->slug,
 			),
-			self_admin_url( 'update.php' )
+			self_admin_url('update.php')
 		);
 
 		$update_url = add_query_arg(
@@ -458,38 +458,38 @@ 
 				'action' => 'upgrade-theme',
 				'theme'  => $theme->slug,
 			),
-			self_admin_url( 'update.php' )
+			self_admin_url('update.php')
 		);
 
-		$status = $this->_get_theme_status( $theme );
+		$status = $this->_get_theme_status($theme);
 
 		?>
 		<div class="install-theme-info">
 		<?php
-		switch ( $status ) {
+		switch ($status) {
 			case 'update_available':
 				printf(
 					'<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
-					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+					esc_url(wp_nonce_url($update_url, 'upgrade-theme_' . $theme->slug)),
 					/* translators: %s: Theme version. */
-					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
-					__( 'Update' )
+					esc_attr(sprintf(__('Update to version %s'), $theme->version)),
+					__('Update')
 				);
 				break;
 			case 'newer_installed':
 			case 'latest_installed':
 				printf(
 					'<span class="theme-install" title="%s">%s</span>',
-					esc_attr__( 'This theme is already installed and is up to date' ),
-					_x( 'Installed', 'theme' )
+					esc_attr__('This theme is already installed and is up to date'),
+					_x('Installed', 'theme')
 				);
 				break;
 			case 'install':
 			default:
 				printf(
 					'<a class="theme-install button button-primary" href="%s">%s</a>',
-					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
-					__( 'Install' )
+					esc_url(wp_nonce_url($install_url, 'install-theme_' . $theme->slug)),
+					__('Install')
 				);
 				break;
 		}
@@ -498,11 +498,11 @@ 
 			<span class="theme-by">
 			<?php
 				/* translators: %s: Theme author. */
-				printf( __( 'By %s' ), $author );
+				printf(__('By %s'), $author);
 			?>
 			</span>
-			<?php if ( isset( $theme->screenshot_url ) ) : ?>
-				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" alt="" />
+			<?php if (isset($theme->screenshot_url)) : ?>
+				<img class="theme-screenshot" src="<?php echo esc_url($theme->screenshot_url . '?ver=' . $theme->version); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
 				<?php
@@ -515,14 +515,14 @@ 
 				);
 				?>
 				<div class="theme-version">
-					<strong><?php _e( 'Version:' ); ?> </strong>
-					<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
+					<strong><?php _e('Version:'); ?> </strong>
+					<?php echo wp_kses($theme->version, $themes_allowedtags); ?>
 				</div>
 				<div class="theme-description">
-					<?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
+					<?php echo wp_kses($theme->description, $themes_allowedtags); ?>
 				</div>
 			</div>
-			<input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
+			<input class="theme-preview-url" type="hidden" value="<?php echo esc_url($theme->preview_url); ?>" />
 		</div>
 		<?php
 	}
@@ -537,9 +537,9 @@ 
 	 *
 	 * @param array $extra_args Unused.
 	 */
-	public function _js_vars( $extra_args = array() ) {
+	public function _js_vars($extra_args = array()) {
 		global $tab, $type;
-		parent::_js_vars( compact( 'tab', 'type' ) );
+		parent::_js_vars(compact('tab', 'type'));
 	}
 
 	/**
@@ -550,14 +550,14 @@ 
 	 * @param stdClass $theme A WordPress.org Theme API object.
 	 * @return string Theme status.
 	 */
-	private function _get_theme_status( $theme ) {
+	private function _get_theme_status($theme) {
 		$status = 'install';
 
-		$installed_theme = wp_get_theme( $theme->slug );
-		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '=' ) ) {
+		$installed_theme = wp_get_theme($theme->slug);
+		if ($installed_theme->exists()) {
+			if (version_compare($installed_theme->get('Version'), $theme->version, '=')) {
 				$status = 'latest_installed';
-			} elseif ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '>' ) ) {
+			} elseif (version_compare($installed_theme->get('Version'), $theme->version, '>')) {
 				$status = 'newer_installed';
 			} else {
 				$status = 'update_available';

brighty/wp-admin/includes/taxonomy.php

Indentation +147 added lines, -147 removed lines

@@ -22,11 +22,11 @@ 
  * @return string|null Returns the category ID as a numeric string if the pairing exists, null if not.
  */
 function category_exists( $cat_name, $category_parent = null ) {
-	$id = term_exists( $cat_name, 'category', $category_parent );
-	if ( is_array( $id ) ) {
-		$id = $id['term_id'];
-	}
-	return $id;
+    $id = term_exists( $cat_name, 'category', $category_parent );
+    if ( is_array( $id ) ) {
+        $id = $id['term_id'];
+    }
+    return $id;
 }
 
 /**
@@ -38,9 +38,9 @@ 
  * @return object
  */
 function get_category_to_edit( $id ) {
-	$category = get_term( $id, 'category', OBJECT, 'edit' );
-	_make_cat_compat( $category );
-	return $category;
+    $category = get_term( $id, 'category', OBJECT, 'edit' );
+    _make_cat_compat( $category );
+    return $category;
 }
 
 /**
@@ -53,17 +53,17 @@ 
  * @return int|WP_Error
  */
 function wp_create_category( $cat_name, $category_parent = 0 ) {
-	$id = category_exists( $cat_name, $category_parent );
-	if ( $id ) {
-		return $id;
-	}
-
-	return wp_insert_category(
-		array(
-			'cat_name'        => $cat_name,
-			'category_parent' => $category_parent,
-		)
-	);
+    $id = category_exists( $cat_name, $category_parent );
+    if ( $id ) {
+        return $id;
+    }
+
+    return wp_insert_category(
+        array(
+            'cat_name'        => $cat_name,
+            'category_parent' => $category_parent,
+        )
+    );
 }
 
 /**
@@ -76,24 +76,24 @@ 
  * @return int[] Array of IDs of categories assigned to the given post.
  */
 function wp_create_categories( $categories, $post_id = '' ) {
-	$cat_ids = array();
-	foreach ( $categories as $category ) {
-		$id = category_exists( $category );
-		if ( $id ) {
-			$cat_ids[] = $id;
-		} else {
-			$id = wp_create_category( $category );
-			if ( $id ) {
-				$cat_ids[] = $id;
-			}
-		}
-	}
-
-	if ( $post_id ) {
-		wp_set_post_categories( $post_id, $cat_ids );
-	}
-
-	return $cat_ids;
+    $cat_ids = array();
+    foreach ( $categories as $category ) {
+        $id = category_exists( $category );
+        if ( $id ) {
+            $cat_ids[] = $id;
+        } else {
+            $id = wp_create_category( $category );
+            if ( $id ) {
+                $cat_ids[] = $id;
+            }
+        }
+    }
+
+    if ( $post_id ) {
+        wp_set_post_categories( $post_id, $cat_ids );
+    }
+
+    return $cat_ids;
 }
 
 /**
@@ -119,59 +119,59 @@ 
  *                      depending on param `$wp_error`.
  */
 function wp_insert_category( $catarr, $wp_error = false ) {
-	$cat_defaults = array(
-		'cat_ID'               => 0,
-		'taxonomy'             => 'category',
-		'cat_name'             => '',
-		'category_description' => '',
-		'category_nicename'    => '',
-		'category_parent'      => '',
-	);
-	$catarr       = wp_parse_args( $catarr, $cat_defaults );
-
-	if ( '' === trim( $catarr['cat_name'] ) ) {
-		if ( ! $wp_error ) {
-			return 0;
-		} else {
-			return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
-		}
-	}
-
-	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
-
-	// Are we updating or creating?
-	$update = ! empty( $catarr['cat_ID'] );
-
-	$name        = $catarr['cat_name'];
-	$description = $catarr['category_description'];
-	$slug        = $catarr['category_nicename'];
-	$parent      = (int) $catarr['category_parent'];
-	if ( $parent < 0 ) {
-		$parent = 0;
-	}
-
-	if ( empty( $parent )
-		|| ! term_exists( $parent, $catarr['taxonomy'] )
-		|| ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
-		$parent = 0;
-	}
-
-	$args = compact( 'name', 'slug', 'parent', 'description' );
-
-	if ( $update ) {
-		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
-	} else {
-		$catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
-	}
-
-	if ( is_wp_error( $catarr['cat_ID'] ) ) {
-		if ( $wp_error ) {
-			return $catarr['cat_ID'];
-		} else {
-			return 0;
-		}
-	}
-	return $catarr['cat_ID']['term_id'];
+    $cat_defaults = array(
+        'cat_ID'               => 0,
+        'taxonomy'             => 'category',
+        'cat_name'             => '',
+        'category_description' => '',
+        'category_nicename'    => '',
+        'category_parent'      => '',
+    );
+    $catarr       = wp_parse_args( $catarr, $cat_defaults );
+
+    if ( '' === trim( $catarr['cat_name'] ) ) {
+        if ( ! $wp_error ) {
+            return 0;
+        } else {
+            return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+        }
+    }
+
+    $catarr['cat_ID'] = (int) $catarr['cat_ID'];
+
+    // Are we updating or creating?
+    $update = ! empty( $catarr['cat_ID'] );
+
+    $name        = $catarr['cat_name'];
+    $description = $catarr['category_description'];
+    $slug        = $catarr['category_nicename'];
+    $parent      = (int) $catarr['category_parent'];
+    if ( $parent < 0 ) {
+        $parent = 0;
+    }
+
+    if ( empty( $parent )
+        || ! term_exists( $parent, $catarr['taxonomy'] )
+        || ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
+        $parent = 0;
+    }
+
+    $args = compact( 'name', 'slug', 'parent', 'description' );
+
+    if ( $update ) {
+        $catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+    } else {
+        $catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+    }
+
+    if ( is_wp_error( $catarr['cat_ID'] ) ) {
+        if ( $wp_error ) {
+            return $catarr['cat_ID'];
+        } else {
+            return 0;
+        }
+    }
+    return $catarr['cat_ID']['term_id'];
 }
 
 /**
@@ -186,23 +186,23 @@ 
  * @return int|false The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
 function wp_update_category( $catarr ) {
-	$cat_ID = (int) $catarr['cat_ID'];
+    $cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
-		return false;
-	}
+    if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
+        return false;
+    }
 
-	// First, get all of the original fields.
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
-	_make_cat_compat( $category );
+    // First, get all of the original fields.
+    $category = get_term( $cat_ID, 'category', ARRAY_A );
+    _make_cat_compat( $category );
 
-	// Escape data pulled from DB.
-	$category = wp_slash( $category );
+    // Escape data pulled from DB.
+    $category = wp_slash( $category );
 
-	// Merge old and new fields with new fields overwriting old ones.
-	$catarr = array_merge( $category, $catarr );
+    // Merge old and new fields with new fields overwriting old ones.
+    $catarr = array_merge( $category, $catarr );
 
-	return wp_insert_category( $catarr );
+    return wp_insert_category( $catarr );
 }
 
 //
@@ -220,7 +220,7 @@ 
  *               Returns 0 if term ID 0 is passed to the function.
  */
 function tag_exists( $tag_name ) {
-	return term_exists( $tag_name, 'post_tag' );
+    return term_exists( $tag_name, 'post_tag' );
 }
 
 /**
@@ -232,7 +232,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_tag( $tag_name ) {
-	return wp_create_term( $tag_name, 'post_tag' );
+    return wp_create_term( $tag_name, 'post_tag' );
 }
 
 /**
@@ -245,7 +245,7 @@ 
  * @return string|false|WP_Error
  */
 function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy );
+    return get_terms_to_edit( $post_id, $taxonomy );
 }
 
 /**
@@ -258,43 +258,43 @@ 
  * @return string|false|WP_Error
  */
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	$post_id = (int) $post_id;
-	if ( ! $post_id ) {
-		return false;
-	}
-
-	$terms = get_object_term_cache( $post_id, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post_id, $taxonomy );
-		wp_cache_add( $post_id, wp_list_pluck( $terms, 'term_id' ), $taxonomy . '_relationships' );
-	}
-
-	if ( ! $terms ) {
-		return false;
-	}
-	if ( is_wp_error( $terms ) ) {
-		return $terms;
-	}
-	$term_names = array();
-	foreach ( $terms as $term ) {
-		$term_names[] = $term->name;
-	}
-
-	$terms_to_edit = esc_attr( implode( ',', $term_names ) );
-
-	/**
-	 * Filters the comma-separated list of terms available to edit.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @see get_terms_to_edit()
-	 *
-	 * @param string $terms_to_edit A comma-separated list of term names.
-	 * @param string $taxonomy      The taxonomy name for which to retrieve terms.
-	 */
-	$terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
-
-	return $terms_to_edit;
+    $post_id = (int) $post_id;
+    if ( ! $post_id ) {
+        return false;
+    }
+
+    $terms = get_object_term_cache( $post_id, $taxonomy );
+    if ( false === $terms ) {
+        $terms = wp_get_object_terms( $post_id, $taxonomy );
+        wp_cache_add( $post_id, wp_list_pluck( $terms, 'term_id' ), $taxonomy . '_relationships' );
+    }
+
+    if ( ! $terms ) {
+        return false;
+    }
+    if ( is_wp_error( $terms ) ) {
+        return $terms;
+    }
+    $term_names = array();
+    foreach ( $terms as $term ) {
+        $term_names[] = $term->name;
+    }
+
+    $terms_to_edit = esc_attr( implode( ',', $term_names ) );
+
+    /**
+     * Filters the comma-separated list of terms available to edit.
+     *
+     * @since 2.8.0
+     *
+     * @see get_terms_to_edit()
+     *
+     * @param string $terms_to_edit A comma-separated list of term names.
+     * @param string $taxonomy      The taxonomy name for which to retrieve terms.
+     */
+    $terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+
+    return $terms_to_edit;
 }
 
 /**
@@ -307,10 +307,10 @@ 
  * @return array|WP_Error
  */
 function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
-	$id = term_exists( $tag_name, $taxonomy );
-	if ( $id ) {
-		return $id;
-	}
+    $id = term_exists( $tag_name, $taxonomy );
+    if ( $id ) {
+        return $id;
+    }
 
-	return wp_insert_term( $tag_name, $taxonomy );
+    return wp_insert_term( $tag_name, $taxonomy );
 }

Spacing +61 added lines, -61 removed lines

@@ -21,9 +21,9 @@ 
  * @param int        $category_parent Optional. ID of parent category.
  * @return string|null Returns the category ID as a numeric string if the pairing exists, null if not.
  */
-function category_exists( $cat_name, $category_parent = null ) {
-	$id = term_exists( $cat_name, 'category', $category_parent );
-	if ( is_array( $id ) ) {
+function category_exists($cat_name, $category_parent = null) {
+	$id = term_exists($cat_name, 'category', $category_parent);
+	if (is_array($id)) {
 		$id = $id['term_id'];
 	}
 	return $id;
@@ -37,9 +37,9 @@ 
  * @param int $id
  * @return object
  */
-function get_category_to_edit( $id ) {
-	$category = get_term( $id, 'category', OBJECT, 'edit' );
-	_make_cat_compat( $category );
+function get_category_to_edit($id) {
+	$category = get_term($id, 'category', OBJECT, 'edit');
+	_make_cat_compat($category);
 	return $category;
 }
 
@@ -52,9 +52,9 @@ 
  * @param int        $category_parent Optional. ID of parent category.
  * @return int|WP_Error
  */
-function wp_create_category( $cat_name, $category_parent = 0 ) {
-	$id = category_exists( $cat_name, $category_parent );
-	if ( $id ) {
+function wp_create_category($cat_name, $category_parent = 0) {
+	$id = category_exists($cat_name, $category_parent);
+	if ($id) {
 		return $id;
 	}
 
@@ -75,22 +75,22 @@ 
  * @param int      $post_id    Optional. The post ID. Default empty.
  * @return int[] Array of IDs of categories assigned to the given post.
  */
-function wp_create_categories( $categories, $post_id = '' ) {
+function wp_create_categories($categories, $post_id = '') {
 	$cat_ids = array();
-	foreach ( $categories as $category ) {
-		$id = category_exists( $category );
-		if ( $id ) {
+	foreach ($categories as $category) {
+		$id = category_exists($category);
+		if ($id) {
 			$cat_ids[] = $id;
 		} else {
-			$id = wp_create_category( $category );
-			if ( $id ) {
+			$id = wp_create_category($category);
+			if ($id) {
 				$cat_ids[] = $id;
 			}
 		}
 	}
 
-	if ( $post_id ) {
-		wp_set_post_categories( $post_id, $cat_ids );
+	if ($post_id) {
+		wp_set_post_categories($post_id, $cat_ids);
 	}
 
 	return $cat_ids;
@@ -118,7 +118,7 @@ 
  * @return int|WP_Error The ID number of the new or updated Category on success. Zero or a WP_Error on failure,
  *                      depending on param `$wp_error`.
  */
-function wp_insert_category( $catarr, $wp_error = false ) {
+function wp_insert_category($catarr, $wp_error = false) {
 	$cat_defaults = array(
 		'cat_ID'               => 0,
 		'taxonomy'             => 'category',
@@ -127,45 +127,45 @@ 
 		'category_nicename'    => '',
 		'category_parent'      => '',
 	);
-	$catarr       = wp_parse_args( $catarr, $cat_defaults );
+	$catarr = wp_parse_args($catarr, $cat_defaults);
 
-	if ( '' === trim( $catarr['cat_name'] ) ) {
-		if ( ! $wp_error ) {
+	if ('' === trim($catarr['cat_name'])) {
+		if (!$wp_error) {
 			return 0;
 		} else {
-			return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+			return new WP_Error('cat_name', __('You did not enter a category name.'));
 		}
 	}
 
 	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
 
 	// Are we updating or creating?
-	$update = ! empty( $catarr['cat_ID'] );
+	$update = !empty($catarr['cat_ID']);
 
 	$name        = $catarr['cat_name'];
 	$description = $catarr['category_description'];
 	$slug        = $catarr['category_nicename'];
 	$parent      = (int) $catarr['category_parent'];
-	if ( $parent < 0 ) {
+	if ($parent < 0) {
 		$parent = 0;
 	}
 
-	if ( empty( $parent )
-		|| ! term_exists( $parent, $catarr['taxonomy'] )
-		|| ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
+	if (empty($parent)
+		|| !term_exists($parent, $catarr['taxonomy'])
+		|| ($catarr['cat_ID'] && term_is_ancestor_of($catarr['cat_ID'], $parent, $catarr['taxonomy']))) {
 		$parent = 0;
 	}
 
-	$args = compact( 'name', 'slug', 'parent', 'description' );
+	$args = compact('name', 'slug', 'parent', 'description');
 
-	if ( $update ) {
-		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+	if ($update) {
+		$catarr['cat_ID'] = wp_update_term($catarr['cat_ID'], $catarr['taxonomy'], $args);
 	} else {
-		$catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+		$catarr['cat_ID'] = wp_insert_term($catarr['cat_name'], $catarr['taxonomy'], $args);
 	}
 
-	if ( is_wp_error( $catarr['cat_ID'] ) ) {
-		if ( $wp_error ) {
+	if (is_wp_error($catarr['cat_ID'])) {
+		if ($wp_error) {
 			return $catarr['cat_ID'];
 		} else {
 			return 0;
@@ -185,24 +185,24 @@ 
  * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
  * @return int|false The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
-function wp_update_category( $catarr ) {
+function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
+	if (isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent'])) {
 		return false;
 	}
 
 	// First, get all of the original fields.
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
-	_make_cat_compat( $category );
+	$category = get_term($cat_ID, 'category', ARRAY_A);
+	_make_cat_compat($category);
 
 	// Escape data pulled from DB.
-	$category = wp_slash( $category );
+	$category = wp_slash($category);
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$catarr = array_merge( $category, $catarr );
+	$catarr = array_merge($category, $catarr);
 
-	return wp_insert_category( $catarr );
+	return wp_insert_category($catarr);
 }
 
 //
@@ -219,8 +219,8 @@ 
  *               Returns an array of the term ID and the term taxonomy ID if the pairing exists.
  *               Returns 0 if term ID 0 is passed to the function.
  */
-function tag_exists( $tag_name ) {
-	return term_exists( $tag_name, 'post_tag' );
+function tag_exists($tag_name) {
+	return term_exists($tag_name, 'post_tag');
 }
 
 /**
@@ -231,8 +231,8 @@ 
  * @param int|string $tag_name
  * @return array|WP_Error
  */
-function wp_create_tag( $tag_name ) {
-	return wp_create_term( $tag_name, 'post_tag' );
+function wp_create_tag($tag_name) {
+	return wp_create_term($tag_name, 'post_tag');
 }
 
 /**
@@ -244,8 +244,8 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|false|WP_Error
  */
-function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy );
+function get_tags_to_edit($post_id, $taxonomy = 'post_tag') {
+	return get_terms_to_edit($post_id, $taxonomy);
 }
 
 /**
@@ -257,30 +257,30 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|false|WP_Error
  */
-function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
+function get_terms_to_edit($post_id, $taxonomy = 'post_tag') {
 	$post_id = (int) $post_id;
-	if ( ! $post_id ) {
+	if (!$post_id) {
 		return false;
 	}
 
-	$terms = get_object_term_cache( $post_id, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post_id, $taxonomy );
-		wp_cache_add( $post_id, wp_list_pluck( $terms, 'term_id' ), $taxonomy . '_relationships' );
+	$terms = get_object_term_cache($post_id, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post_id, $taxonomy);
+		wp_cache_add($post_id, wp_list_pluck($terms, 'term_id'), $taxonomy . '_relationships');
 	}
 
-	if ( ! $terms ) {
+	if (!$terms) {
 		return false;
 	}
-	if ( is_wp_error( $terms ) ) {
+	if (is_wp_error($terms)) {
 		return $terms;
 	}
 	$term_names = array();
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 		$term_names[] = $term->name;
 	}
 
-	$terms_to_edit = esc_attr( implode( ',', $term_names ) );
+	$terms_to_edit = esc_attr(implode(',', $term_names));
 
 	/**
 	 * Filters the comma-separated list of terms available to edit.
@@ -292,7 +292,7 @@ 
 	 * @param string $terms_to_edit A comma-separated list of term names.
 	 * @param string $taxonomy      The taxonomy name for which to retrieve terms.
 	 */
-	$terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+	$terms_to_edit = apply_filters('terms_to_edit', $terms_to_edit, $taxonomy);
 
 	return $terms_to_edit;
 }
@@ -306,11 +306,11 @@ 
  * @param string $taxonomy Optional. The taxonomy within which to create the term. Default 'post_tag'.
  * @return array|WP_Error
  */
-function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
-	$id = term_exists( $tag_name, $taxonomy );
-	if ( $id ) {
+function wp_create_term($tag_name, $taxonomy = 'post_tag') {
+	$id = term_exists($tag_name, $taxonomy);
+	if ($id) {
 		return $id;
 	}
 
-	return wp_insert_term( $tag_name, $taxonomy );
+	return wp_insert_term($tag_name, $taxonomy);
 }

brighty/wp-admin/includes/class-ftp-pure.php

Indentation +139 added lines, -139 removed lines

@@ -27,160 +27,160 @@
  */
 class ftp_pure extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
-		parent::__construct(false, $verb, $le);
-	}
+    function __construct($verb=FALSE, $le=FALSE) {
+        parent::__construct(false, $verb, $le);
+    }
 
 // <!-- --------------------------------------------------------------------------------------- -->
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->
 
-	function _settimeout($sock) {
-		if(!@stream_set_timeout($sock, $this->_timeout)) {
-			$this->PushError('_settimeout','socket set send timeout');
-			$this->_quit();
-			return FALSE;
-		}
-		return TRUE;
-	}
+    function _settimeout($sock) {
+        if(!@stream_set_timeout($sock, $this->_timeout)) {
+            $this->PushError('_settimeout','socket set send timeout');
+            $this->_quit();
+            return FALSE;
+        }
+        return TRUE;
+    }
 
-	function _connect($host, $port) {
-		$this->SendMSG("Creating socket");
-		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
-		if (!$sock) {
-			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
-			return FALSE;
-		}
-		$this->_connected=true;
-		return $sock;
-	}
+    function _connect($host, $port) {
+        $this->SendMSG("Creating socket");
+        $sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
+        if (!$sock) {
+            $this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
+            return FALSE;
+        }
+        $this->_connected=true;
+        return $sock;
+    }
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
-			$this->PushError($fnction, 'Connect first');
-			return FALSE;
-		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
-		do {
-			$tmp=@fgets($this->_ftp_control_sock, 512);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed');
-			} else {
-				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
-			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
-		return $result;
-	}
+    function _readmsg($fnction="_readmsg"){
+        if(!$this->_connected) {
+            $this->PushError($fnction, 'Connect first');
+            return FALSE;
+        }
+        $result=true;
+        $this->_message="";
+        $this->_code=0;
+        $go=true;
+        do {
+            $tmp=@fgets($this->_ftp_control_sock, 512);
+            if($tmp===false) {
+                $go=$result=false;
+                $this->PushError($fnction,'Read failed');
+            } else {
+                $this->_message.=$tmp;
+                if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+            }
+        } while($go);
+        if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+        $this->_code=(int)$regs[1];
+        return $result;
+    }
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
-			return FALSE;
-		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed');
-			return FALSE;
-		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
-		return TRUE;
-	}
+    function _exec($cmd, $fnction="_exec") {
+        if(!$this->_ready) {
+            $this->PushError($fnction,'Connect first');
+            return FALSE;
+        }
+        if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+        $status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
+        if($status===false) {
+            $this->PushError($fnction,'socket write failed');
+            return FALSE;
+        }
+        $this->_lastaction=time();
+        if(!$this->_readmsg($fnction)) return FALSE;
+        return TRUE;
+    }
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
-				$this->_data_close();
-				return FALSE;
-			}
-			if(!$this->_checkCode()) {
-				$this->_data_close();
-				return FALSE;
-			}
-			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+    function _data_prepare($mode=FTP_ASCII) {
+        if(!$this->_settype($mode)) return FALSE;
+        if($this->_passive) {
+            if(!$this->_exec("PASV", "pasv")) {
+                $this->_data_close();
+                return FALSE;
+            }
+            if(!$this->_checkCode()) {
+                $this->_data_close();
+                return FALSE;
+            }
+            $ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
+            $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
             $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
-			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
-			if(!$this->_ftp_data_sock) {
-				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
-				$this->_data_close();
-				return FALSE;
-			}
-			else $this->_ftp_data_sock;
-		} else {
-			$this->SendMSG("Only passive connections available!");
-			return FALSE;
-		}
-		return TRUE;
-	}
+            $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
+            $this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
+            if(!$this->_ftp_data_sock) {
+                $this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
+                $this->_data_close();
+                return FALSE;
+            }
+            else $this->_ftp_data_sock;
+        } else {
+            $this->SendMSG("Only passive connections available!");
+            return FALSE;
+        }
+        return TRUE;
+    }
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
-			$this->SendMSG("Only passive connections available!");
-			return FALSE;
-		}
-		while (!feof($this->_ftp_data_sock)) {
-			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
-		}
-		return $out;
-	}
+    function _data_read($mode=FTP_ASCII, $fp=NULL) {
+        if(is_resource($fp)) $out=0;
+        else $out="";
+        if(!$this->_passive) {
+            $this->SendMSG("Only passive connections available!");
+            return FALSE;
+        }
+        while (!feof($this->_ftp_data_sock)) {
+            $block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
+            if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+            if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
+            else $out.=$block;
+        }
+        return $out;
+    }
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
-			$this->SendMSG("Only passive connections available!");
-			return FALSE;
-		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
-			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
-		return TRUE;
-	}
+    function _data_write($mode=FTP_ASCII, $fp=NULL) {
+        if(is_resource($fp)) $out=0;
+        else $out="";
+        if(!$this->_passive) {
+            $this->SendMSG("Only passive connections available!");
+            return FALSE;
+        }
+        if(is_resource($fp)) {
+            while(!feof($fp)) {
+                $block=fread($fp, $this->_ftp_buff_size);
+                if(!$this->_data_write_block($mode, $block)) return false;
+            }
+        } elseif(!$this->_data_write_block($mode, $fp)) return false;
+        return TRUE;
+    }
 
-	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
-		do {
-			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
-				$this->PushError("_data_write","Can't write to socket");
-				return FALSE;
-			}
-			$block=substr($block, $t);
-		} while(!empty($block));
-		return true;
-	}
+    function _data_write_block($mode, $block) {
+        if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+        do {
+            if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
+                $this->PushError("_data_write","Can't write to socket");
+                return FALSE;
+            }
+            $block=substr($block, $t);
+        } while(!empty($block));
+        return true;
+    }
 
-	function _data_close() {
-		@fclose($this->_ftp_data_sock);
-		$this->SendMSG("Disconnected data from remote host");
-		return TRUE;
-	}
+    function _data_close() {
+        @fclose($this->_ftp_data_sock);
+        $this->SendMSG("Disconnected data from remote host");
+        return TRUE;
+    }
 
-	function _quit($force=FALSE) {
-		if($this->_connected or $force) {
-			@fclose($this->_ftp_control_sock);
-			$this->_connected=false;
-			$this->SendMSG("Socket closed");
-		}
-	}
+    function _quit($force=FALSE) {
+        if($this->_connected or $force) {
+            @fclose($this->_ftp_control_sock);
+            $this->_connected=false;
+            $this->SendMSG("Socket closed");
+        }
+    }
 }
 
 ?>

Spacing +65 added lines, -65 removed lines

@@ -27,7 +27,7 @@ 
  */
 class ftp_pure extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(false, $verb, $le);
 	}
 
@@ -36,8 +36,8 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@stream_set_timeout($sock, $this->_timeout)) {
-			$this->PushError('_settimeout','socket set send timeout');
+		if (!@stream_set_timeout($sock, $this->_timeout)) {
+			$this->PushError('_settimeout', 'socket set send timeout');
 			$this->_quit();
 			return FALSE;
 		}
@@ -48,71 +48,71 @@ 
 		$this->SendMSG("Creating socket");
 		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
 		if (!$sock) {
-			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
+			$this->PushError('_connect', 'socket connect failed', $errstr . " (" . $errno . ")");
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
+	function _readmsg($fnction = "_readmsg") {
+		if (!$this->_connected) {
 			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@fgets($this->_ftp_control_sock, 512);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed');
+			$tmp = @fgets($this->_ftp_control_sock, 512);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed');
 			} else {
-				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				$this->_message .= $tmp;
+				if (preg_match("/^([0-9]{3})(-(.*[" . CRLF . "]{1,2})+\\1)? [^" . CRLF . "]+[" . CRLF . "]{1,2}$/", $this->_message, $regs)) $go = false;
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < " . rtrim($this->_message, CRLF) . CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if (!$this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed');
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @fputs($this->_ftp_control_sock, $cmd . CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed');
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if (!$this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+	function _data_prepare($mode = FTP_ASCII) {
+		if (!$this->_settype($mode)) return FALSE;
+		if ($this->_passive) {
+			if (!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if (!$this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
-			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
-			if(!$this->_ftp_data_sock) {
-				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
+			$this->_datahost = $ip_port[0] . "." . $ip_port[1] . "." . $ip_port[2] . "." . $ip_port[3];
+            $this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
+			$this->SendMSG("Connecting to " . $this->_datahost . ":" . $this->_dataport);
+			$this->_ftp_data_sock = @fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
+			if (!$this->_ftp_data_sock) {
+				$this->PushError("_data_prepare", "fsockopen fails", $errstr . " (" . $errno . ")");
 				$this->_data_close();
 				return FALSE;
 			}
@@ -124,47 +124,47 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if (!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
 		while (!feof($this->_ftp_data_sock)) {
-			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			$block = fread($this->_ftp_data_sock, $this->_ftp_buff_size);
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if (!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while (!feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if (!$this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif (!$this->_data_write_block($mode, $fp)) return false;
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
-				$this->PushError("_data_write","Can't write to socket");
+			if (($t = @fwrite($this->_ftp_data_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "Can't write to socket");
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while (!empty($block));
 		return true;
 	}
 
@@ -174,10 +174,10 @@ 
 		return TRUE;
 	}
 
-	function _quit($force=FALSE) {
-		if($this->_connected or $force) {
+	function _quit($force = FALSE) {
+		if ($this->_connected or $force) {
 			@fclose($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

Braces +44 added lines, -16 removed lines

@@ -71,10 +71,14 @@ 
 				$this->PushError($fnction,'Read failed');
 			} else {
 				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) {
+				    $go=false;
+				}
 			}
 		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		if($this->LocalEcho) {
+		    echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		}
 		$this->_code=(int)$regs[1];
 		return $result;
 	}
@@ -84,19 +88,25 @@ 
 			$this->PushError($fnction,'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		if($this->LocalEcho) {
+		    echo "PUT > ",$cmd,CRLF;
+		}
 		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed');
 			return FALSE;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		if(!$this->_readmsg($fnction)) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+		if(!$this->_settype($mode)) {
+		    return FALSE;
+		}
 		if($this->_passive) {
 			if(!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
@@ -115,8 +125,9 @@ 
 				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
 				return FALSE;
+			} else {
+			    $this->_ftp_data_sock;
 			}
-			else $this->_ftp_data_sock;
 		} else {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -125,24 +136,35 @@ 
 	}
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+		    $out=0;
+		} else {
+		    $out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
 		while (!feof($this->_ftp_data_sock)) {
 			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			if($mode!=FTP_BINARY) {
+			    $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			}
+			if(is_resource($fp)) {
+			    $out+=fwrite($fp, $block, strlen($block));
+			} else {
+			    $out.=$block;
+			}
 		}
 		return $out;
 	}
 
 	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+		    $out=0;
+		} else {
+		    $out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -150,14 +172,20 @@ 
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
 				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+				if(!$this->_data_write_block($mode, $block)) {
+				    return false;
+				}
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif(!$this->_data_write_block($mode, $fp)) {
+		    return false;
+		}
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if($mode!=FTP_BINARY) {
+		    $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		}
 		do {
 			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
 				$this->PushError("_data_write","Can't write to socket");

brighty/wp-admin/includes/import.php

Indentation +147 added lines, -147 removed lines

@@ -15,11 +15,11 @@ 
  * @return array
  */
 function get_importers() {
-	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
-	}
-	return $wp_importers;
+    global $wp_importers;
+    if ( is_array( $wp_importers ) ) {
+        uasort( $wp_importers, '_usort_by_first_member' );
+    }
+    return $wp_importers;
 }
 
 /**
@@ -35,7 +35,7 @@ 
  * @return int
  */
 function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+    return strnatcasecmp( $a[0], $b[0] );
 }
 
 /**
@@ -52,11 +52,11 @@ 
  * @return void|WP_Error Void on success. WP_Error when $callback is WP_Error.
  */
 function register_importer( $id, $name, $description, $callback ) {
-	global $wp_importers;
-	if ( is_wp_error( $callback ) ) {
-		return $callback;
-	}
-	$wp_importers[ $id ] = array( $name, $description, $callback );
+    global $wp_importers;
+    if ( is_wp_error( $callback ) ) {
+        return $callback;
+    }
+    $wp_importers[ $id ] = array( $name, $description, $callback );
 }
 
 /**
@@ -69,7 +69,7 @@ 
  * @param string $id Importer ID.
  */
 function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+    wp_delete_attachment( $id );
 }
 
 /**
@@ -80,52 +80,52 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
-		return array(
-			'error' => sprintf(
-				/* translators: 1: php.ini, 2: post_max_size, 3: upload_max_filesize */
-				__( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your %1$s file or by %2$s being defined as smaller than %3$s in %1$s.' ),
-				'php.ini',
-				'post_max_size',
-				'upload_max_filesize'
-			),
-		);
-	}
-
-	$overrides                 = array(
-		'test_form' => false,
-		'test_type' => false,
-	);
-	$_FILES['import']['name'] .= '.txt';
-	$upload                    = wp_handle_upload( $_FILES['import'], $overrides );
-
-	if ( isset( $upload['error'] ) ) {
-		return $upload;
-	}
-
-	// Construct the attachment array.
-	$attachment = array(
-		'post_title'     => wp_basename( $upload['file'] ),
-		'post_content'   => $upload['url'],
-		'post_mime_type' => $upload['type'],
-		'guid'           => $upload['url'],
-		'context'        => 'import',
-		'post_status'    => 'private',
-	);
-
-	// Save the data.
-	$id = wp_insert_attachment( $attachment, $upload['file'] );
-
-	/*
+    if ( ! isset( $_FILES['import'] ) ) {
+        return array(
+            'error' => sprintf(
+                /* translators: 1: php.ini, 2: post_max_size, 3: upload_max_filesize */
+                __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your %1$s file or by %2$s being defined as smaller than %3$s in %1$s.' ),
+                'php.ini',
+                'post_max_size',
+                'upload_max_filesize'
+            ),
+        );
+    }
+
+    $overrides                 = array(
+        'test_form' => false,
+        'test_type' => false,
+    );
+    $_FILES['import']['name'] .= '.txt';
+    $upload                    = wp_handle_upload( $_FILES['import'], $overrides );
+
+    if ( isset( $upload['error'] ) ) {
+        return $upload;
+    }
+
+    // Construct the attachment array.
+    $attachment = array(
+        'post_title'     => wp_basename( $upload['file'] ),
+        'post_content'   => $upload['url'],
+        'post_mime_type' => $upload['type'],
+        'guid'           => $upload['url'],
+        'context'        => 'import',
+        'post_status'    => 'private',
+    );
+
+    // Save the data.
+    $id = wp_insert_attachment( $attachment, $upload['file'] );
+
+    /*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+    wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
 
-	return array(
-		'file' => $upload['file'],
-		'id'   => $id,
-	);
+    return array(
+        'file' => $upload['file'],
+        'id'   => $id,
+    );
 }
 
 /**
@@ -136,97 +136,97 @@ 
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-
-	$locale            = get_user_locale();
-	$cache_key         = 'popular_importers_' . md5( $locale . $wp_version );
-	$popular_importers = get_site_transient( $cache_key );
-
-	if ( ! $popular_importers ) {
-		$url     = add_query_arg(
-			array(
-				'locale'  => $locale,
-				'version' => $wp_version,
-			),
-			'http://api.wordpress.org/core/importers/1.1/'
-		);
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
-
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
-		}
-
-		$response          = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		if ( is_array( $popular_importers ) ) {
-			set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
-		} else {
-			$popular_importers = false;
-		}
-	}
-
-	if ( is_array( $popular_importers ) ) {
-		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] ) {
-			return $popular_importers['importers'];
-		}
-
-		foreach ( $popular_importers['importers'] as &$importer ) {
-			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$importer['description'] = translate( $importer['description'] );
-			if ( 'WordPress' !== $importer['name'] ) {
-				// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-				$importer['name'] = translate( $importer['name'] );
-			}
-		}
-		return $popular_importers['importers'];
-	}
-
-	return array(
-		// slug => name, description, plugin slug, and register_importer() slug.
-		'blogger'     => array(
-			'name'        => __( 'Blogger' ),
-			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
-			'plugin-slug' => 'blogger-importer',
-			'importer-id' => 'blogger',
-		),
-		'wpcat2tag'   => array(
-			'name'        => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
-			'plugin-slug' => 'wpcat2tag-importer',
-			'importer-id' => 'wp-cat2tag',
-		),
-		'livejournal' => array(
-			'name'        => __( 'LiveJournal' ),
-			'description' => __( 'Import posts from LiveJournal using their API.' ),
-			'plugin-slug' => 'livejournal-importer',
-			'importer-id' => 'livejournal',
-		),
-		'movabletype' => array(
-			'name'        => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
-			'plugin-slug' => 'movabletype-importer',
-			'importer-id' => 'mt',
-		),
-		'rss'         => array(
-			'name'        => __( 'RSS' ),
-			'description' => __( 'Import posts from an RSS feed.' ),
-			'plugin-slug' => 'rss-importer',
-			'importer-id' => 'rss',
-		),
-		'tumblr'      => array(
-			'name'        => __( 'Tumblr' ),
-			'description' => __( 'Import posts & media from Tumblr using their API.' ),
-			'plugin-slug' => 'tumblr-importer',
-			'importer-id' => 'tumblr',
-		),
-		'wordpress'   => array(
-			'name'        => 'WordPress',
-			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
-			'plugin-slug' => 'wordpress-importer',
-			'importer-id' => 'wordpress',
-		),
-	);
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+
+    $locale            = get_user_locale();
+    $cache_key         = 'popular_importers_' . md5( $locale . $wp_version );
+    $popular_importers = get_site_transient( $cache_key );
+
+    if ( ! $popular_importers ) {
+        $url     = add_query_arg(
+            array(
+                'locale'  => $locale,
+                'version' => $wp_version,
+            ),
+            'http://api.wordpress.org/core/importers/1.1/'
+        );
+        $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $response          = wp_remote_get( $url, $options );
+        $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        if ( is_array( $popular_importers ) ) {
+            set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+        } else {
+            $popular_importers = false;
+        }
+    }
+
+    if ( is_array( $popular_importers ) ) {
+        // If the data was received as translated, return it as-is.
+        if ( $popular_importers['translated'] ) {
+            return $popular_importers['importers'];
+        }
+
+        foreach ( $popular_importers['importers'] as &$importer ) {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+            $importer['description'] = translate( $importer['description'] );
+            if ( 'WordPress' !== $importer['name'] ) {
+                // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+                $importer['name'] = translate( $importer['name'] );
+            }
+        }
+        return $popular_importers['importers'];
+    }
+
+    return array(
+        // slug => name, description, plugin slug, and register_importer() slug.
+        'blogger'     => array(
+            'name'        => __( 'Blogger' ),
+            'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
+            'plugin-slug' => 'blogger-importer',
+            'importer-id' => 'blogger',
+        ),
+        'wpcat2tag'   => array(
+            'name'        => __( 'Categories and Tags Converter' ),
+            'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+            'plugin-slug' => 'wpcat2tag-importer',
+            'importer-id' => 'wp-cat2tag',
+        ),
+        'livejournal' => array(
+            'name'        => __( 'LiveJournal' ),
+            'description' => __( 'Import posts from LiveJournal using their API.' ),
+            'plugin-slug' => 'livejournal-importer',
+            'importer-id' => 'livejournal',
+        ),
+        'movabletype' => array(
+            'name'        => __( 'Movable Type and TypePad' ),
+            'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
+            'plugin-slug' => 'movabletype-importer',
+            'importer-id' => 'mt',
+        ),
+        'rss'         => array(
+            'name'        => __( 'RSS' ),
+            'description' => __( 'Import posts from an RSS feed.' ),
+            'plugin-slug' => 'rss-importer',
+            'importer-id' => 'rss',
+        ),
+        'tumblr'      => array(
+            'name'        => __( 'Tumblr' ),
+            'description' => __( 'Import posts & media from Tumblr using their API.' ),
+            'plugin-slug' => 'tumblr-importer',
+            'importer-id' => 'tumblr',
+        ),
+        'wordpress'   => array(
+            'name'        => 'WordPress',
+            'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+            'plugin-slug' => 'wordpress-importer',
+            'importer-id' => 'wordpress',
+        ),
+    );
 }

Spacing +47 added lines, -47 removed lines

@@ -16,8 +16,8 @@ 
  */
 function get_importers() {
 	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
+	if (is_array($wp_importers)) {
+		uasort($wp_importers, '_usort_by_first_member');
 	}
 	return $wp_importers;
 }
@@ -34,8 +34,8 @@ 
  * @param array $b
  * @return int
  */
-function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+function _usort_by_first_member($a, $b) {
+	return strnatcasecmp($a[0], $b[0]);
 }
 
 /**
@@ -51,12 +51,12 @@ 
  * @param callable $callback    Callback to run.
  * @return void|WP_Error Void on success. WP_Error when $callback is WP_Error.
  */
-function register_importer( $id, $name, $description, $callback ) {
+function register_importer($id, $name, $description, $callback) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) ) {
+	if (is_wp_error($callback)) {
 		return $callback;
 	}
-	$wp_importers[ $id ] = array( $name, $description, $callback );
+	$wp_importers[$id] = array($name, $description, $callback);
 }
 
 /**
@@ -68,8 +68,8 @@ 
  *
  * @param string $id Importer ID.
  */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+function wp_import_cleanup($id) {
+	wp_delete_attachment($id);
 }
 
 /**
@@ -80,11 +80,11 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
+	if (!isset($_FILES['import'])) {
 		return array(
 			'error' => sprintf(
 				/* translators: 1: php.ini, 2: post_max_size, 3: upload_max_filesize */
-				__( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your %1$s file or by %2$s being defined as smaller than %3$s in %1$s.' ),
+				__('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your %1$s file or by %2$s being defined as smaller than %3$s in %1$s.'),
 				'php.ini',
 				'post_max_size',
 				'upload_max_filesize'
@@ -92,20 +92,20 @@ 
 		);
 	}
 
-	$overrides                 = array(
+	$overrides = array(
 		'test_form' => false,
 		'test_type' => false,
 	);
 	$_FILES['import']['name'] .= '.txt';
-	$upload                    = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload                    = wp_handle_upload($_FILES['import'], $overrides);
 
-	if ( isset( $upload['error'] ) ) {
+	if (isset($upload['error'])) {
 		return $upload;
 	}
 
 	// Construct the attachment array.
 	$attachment = array(
-		'post_title'     => wp_basename( $upload['file'] ),
+		'post_title'     => wp_basename($upload['file']),
 		'post_content'   => $upload['url'],
 		'post_mime_type' => $upload['type'],
 		'guid'           => $upload['url'],
@@ -114,13 +114,13 @@ 
 	);
 
 	// Save the data.
-	$id = wp_insert_attachment( $attachment, $upload['file'] );
+	$id = wp_insert_attachment($attachment, $upload['file']);
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+	wp_schedule_single_event(time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array($id));
 
 	return array(
 		'file' => $upload['file'],
@@ -140,45 +140,45 @@ 
 	require ABSPATH . WPINC . '/version.php';
 
 	$locale            = get_user_locale();
-	$cache_key         = 'popular_importers_' . md5( $locale . $wp_version );
-	$popular_importers = get_site_transient( $cache_key );
+	$cache_key         = 'popular_importers_' . md5($locale . $wp_version);
+	$popular_importers = get_site_transient($cache_key);
 
-	if ( ! $popular_importers ) {
-		$url     = add_query_arg(
+	if (!$popular_importers) {
+		$url = add_query_arg(
 			array(
 				'locale'  => $locale,
 				'version' => $wp_version,
 			),
 			'http://api.wordpress.org/core/importers/1.1/'
 		);
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+		$options = array('user-agent' => 'WordPress/' . $wp_version . '; ' . home_url('/'));
 
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
+		if (wp_http_supports(array('ssl'))) {
+			$url = set_url_scheme($url, 'https');
 		}
 
-		$response          = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+		$response          = wp_remote_get($url, $options);
+		$popular_importers = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( is_array( $popular_importers ) ) {
-			set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+		if (is_array($popular_importers)) {
+			set_site_transient($cache_key, $popular_importers, 2 * DAY_IN_SECONDS);
 		} else {
 			$popular_importers = false;
 		}
 	}
 
-	if ( is_array( $popular_importers ) ) {
+	if (is_array($popular_importers)) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] ) {
+		if ($popular_importers['translated']) {
 			return $popular_importers['importers'];
 		}
 
-		foreach ( $popular_importers['importers'] as &$importer ) {
+		foreach ($popular_importers['importers'] as &$importer) {
 			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$importer['description'] = translate( $importer['description'] );
-			if ( 'WordPress' !== $importer['name'] ) {
+			$importer['description'] = translate($importer['description']);
+			if ('WordPress' !== $importer['name']) {
 				// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-				$importer['name'] = translate( $importer['name'] );
+				$importer['name'] = translate($importer['name']);
 			}
 		}
 		return $popular_importers['importers'];
@@ -187,44 +187,44 @@ 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug.
 		'blogger'     => array(
-			'name'        => __( 'Blogger' ),
-			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
+			'name'        => __('Blogger'),
+			'description' => __('Import posts, comments, and users from a Blogger blog.'),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
 		'wpcat2tag'   => array(
-			'name'        => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+			'name'        => __('Categories and Tags Converter'),
+			'description' => __('Convert existing categories to tags or tags to categories, selectively.'),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name'        => __( 'LiveJournal' ),
-			'description' => __( 'Import posts from LiveJournal using their API.' ),
+			'name'        => __('LiveJournal'),
+			'description' => __('Import posts from LiveJournal using their API.'),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name'        => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
+			'name'        => __('Movable Type and TypePad'),
+			'description' => __('Import posts and comments from a Movable Type or TypePad blog.'),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
 		'rss'         => array(
-			'name'        => __( 'RSS' ),
-			'description' => __( 'Import posts from an RSS feed.' ),
+			'name'        => __('RSS'),
+			'description' => __('Import posts from an RSS feed.'),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
 		'tumblr'      => array(
-			'name'        => __( 'Tumblr' ),
-			'description' => __( 'Import posts & media from Tumblr using their API.' ),
+			'name'        => __('Tumblr'),
+			'description' => __('Import posts & media from Tumblr using their API.'),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
 		'wordpress'   => array(
 			'name'        => 'WordPress',
-			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+			'description' => __('Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
 		),