Changeset 38075 for trunk/src/wp-admin/includes/import.php

Timestamp:

07/17/2016 03:31:29 PM (10 years ago)

Author:

ocean90

Message:

Import: Enhance accessibility on the Import screen.

• Remove title attributes.
• Show "Install Now" and "Details" links if the importer isn't installed yet.
• Show a "Run Importer" link if the importer is installed. It also handles activation if the plugin isn't activated.
• Add aria-label attributes to each link.
• Unify the importer descriptions to make them independent from the plugin state. The API was changed in ​[meta3690].
• Adjust JavaScript callbacks for ajaxified importer installs.

Props afercia, swissspidy, ocean90.
See #24766.
Fixes #35191.

File:

• trunk/src/wp-admin/includes/import.php (modified) (9 diffs)

trunk/src/wp-admin/includes/import.php

@@ -127 +127 @@
 
         $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;
+                }
         }
 
@@ -158 +163 @@
                 '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',
@@ -164 +169 @@
                 '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',
@@ -170 +175 @@
                 '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',
@@ -176 +181 @@
                 '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',
@@ -182 +187 @@
                 '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',
@@ -188 +193 @@
                 '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',
@@ -194 +199 @@
                 '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',
@@ -200 +205 @@
                 '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',