diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/import.php --- a/wp/wp-admin/includes/import.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/includes/import.php Mon Oct 14 17:39:30 2019 +0200 @@ -11,6 +11,7 @@ * * @since 2.0.0 * + * @global array $wp_importers * @return array */ function get_importers() { @@ -42,10 +43,12 @@ * * @since 2.0.0 * - * @param string $id Importer tag. Used to uniquely identify importer. - * @param string $name Importer name and title. - * @param string $description Importer description. - * @param callback $callback Callback to run. + * @global array $wp_importers + * + * @param string $id Importer tag. Used to uniquely identify importer. + * @param string $name Importer name and title. + * @param string $description Importer description. + * @param callable $callback Callback to run. * @return WP_Error Returns WP_Error when $callback is WP_Error. */ function register_importer( $id, $name, $description, $callback ) { @@ -122,19 +125,29 @@ function wp_get_popular_importers() { include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version - $locale = get_locale(); - $popular_importers = get_site_transient( 'popular_importers_' . $locale ); + $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( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' ); - $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() ); + $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( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS ); - else + 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 ) ) { @@ -154,49 +167,49 @@ // slug => name, description, plugin slug, and register_importer() slug 'blogger' => array( 'name' => __( 'Blogger' ), - 'description' => __( 'Install the Blogger importer to import posts, comments, and users from a Blogger blog.' ), + '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' => __( 'Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.' ), + 'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ), 'plugin-slug' => 'wpcat2tag-importer', 'importer-id' => 'wp-cat2tag', ), 'livejournal' => array( 'name' => __( 'LiveJournal' ), - 'description' => __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ), + 'description' => __( 'Import posts from LiveJournal using their API.' ), 'plugin-slug' => 'livejournal-importer', 'importer-id' => 'livejournal', ), 'movabletype' => array( 'name' => __( 'Movable Type and TypePad' ), - 'description' => __( 'Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.' ), + 'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ), 'plugin-slug' => 'movabletype-importer', 'importer-id' => 'mt', ), 'opml' => array( 'name' => __( 'Blogroll' ), - 'description' => __( 'Install the blogroll importer to import links in OPML format.' ), + 'description' => __( 'Import links in OPML format.' ), 'plugin-slug' => 'opml-importer', 'importer-id' => 'opml', ), 'rss' => array( 'name' => __( 'RSS' ), - 'description' => __( 'Install the RSS importer to import posts from an RSS feed.' ), + 'description' => __( 'Import posts from an RSS feed.' ), 'plugin-slug' => 'rss-importer', 'importer-id' => 'rss', ), 'tumblr' => array( 'name' => __( 'Tumblr' ), - 'description' => __( 'Install the Tumblr importer to import posts & media from Tumblr using their API.' ), + 'description' => __( 'Import posts & media from Tumblr using their API.' ), 'plugin-slug' => 'tumblr-importer', 'importer-id' => 'tumblr', ), 'wordpress' => array( 'name' => 'WordPress', - 'description' => __( 'Install the WordPress importer to 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', ),