WordPress 4.4.1

[autoinstalls/wordpress.git] / wp-admin / includes / import.php

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index 907bbb92fc7181672487043922f126fb294ed100..fa980e6f167b66a2e35acf6340302882a4d8d220 100644 (file)
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -11,24 +11,44 @@
  *
  * @since 2.0.0
  *
+ * @global array $wp_importers
  * @return array
  */
 function get_importers() {
        global $wp_importers;
-       if ( is_array($wp_importers) )
-               uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+       if ( is_array( $wp_importers ) ) {
+               uasort( $wp_importers, '_usort_by_first_member' );
+       }
        return $wp_importers;
 }
 
+/**
+ * Sorts a multidimensional array by first member of each top level member
+ *
+ * Used by uasort() as a callback, should not be used directly.
+ *
+ * @since 2.9.0
+ * @access private
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+function _usort_by_first_member( $a, $b ) {
+       return strnatcasecmp( $a[0], $b[0] );
+}
+
 /**
  * Register importer for WordPress.
  *
  * @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 ) {
@@ -59,39 +79,40 @@ 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 );
+       $upload = wp_handle_upload( $_FILES['import'], $overrides );
 
-       if ( isset( $file['error'] ) )
-               return $file;
-
-       $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 import or missing wp_import_cleanup() call
+       /*
+        * 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 ) );
 
-       return array( 'file' => $file, 'id' => $id );
+       return array( 'file' => $upload['file'], 'id' => $id );
 }
 
 /**
@@ -102,15 +123,16 @@ function wp_import_handle_upload() {
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-       include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+       include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
        $locale = get_locale();
        $popular_importers = get_site_transient( 'popular_importers_' . $locale );
 
        if ( ! $popular_importers ) {
-               $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.0/' );
+               $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' );
                $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
-               $popular_importers = maybe_unserialize( wp_remote_retrieve_body( wp_remote_get( $url, $options ) ) );
+               $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 );