X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..febc815b2c9d85be5717da9e8d164bd2daa97e31:/wp-admin/includes/import.php

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index ab8e8e3d..4f0b7853 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -11,6 +11,7 @@
  *
  * @since 2.0.0
  *
+ * @global array $wp_importers
  * @return array
  */
 function get_importers() {
@@ -42,10 +43,12 @@ function _usort_by_first_member( $a, $b ) {
  *
  * @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 ) {
@@ -76,34 +79,32 @@ function wp_import_cleanup( $id ) {
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( !isset($_FILES['import']) ) {
-		$file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
-		return $file;
+	if ( ! isset( $_FILES['import'] ) ) {
+		return array(
+			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+		);
 	}
 
 	$overrides = array( 'test_form' => false, 'test_type' => false );
 	$_FILES['import']['name'] .= '.txt';
-	$file = wp_handle_upload( $_FILES['import'], $overrides );
-
-	if ( isset( $file['error'] ) )
-		return $file;
+	$upload = wp_handle_upload( $_FILES['import'], $overrides );
 
-	$url = $file['url'];
-	$type = $file['type'];
-	$file = $file['file'];
-	$filename = basename( $file );
+	if ( isset( $upload['error'] ) ) {
+		return $upload;
+	}
 
 	// Construct the object array
-	$object = array( 'post_title' => $filename,
-		'post_content' => $url,
-		'post_mime_type' => $type,
-		'guid' => $url,
+	$object = array(
+		'post_title' => 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( $object, $file );
+	$id = wp_insert_attachment( $object, $upload['file'] );
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
@@ -111,7 +112,7 @@ function wp_import_handle_upload() {
 	 */
 	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
 
-	return array( 'file' => $file, 'id' => $id );
+	return array( 'file' => $upload['file'], 'id' => $id );
 }
 
 /**
@@ -125,18 +126,23 @@ 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 );
+	$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/' );
+		$url = add_query_arg( array(
+			'locale'  => get_locale(),
+			'version' => $wp_version,
+		), 'http://api.wordpress.org/core/importers/1.1/' );
 		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
 		$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 ) ) {
@@ -156,49 +162,49 @@ function wp_get_popular_importers() {
 		// 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',
 		),