Changeset 12469 for trunk/wp-admin/import/wordpress.php

Timestamp:

12/21/2009 03:26:57 PM (15 years ago)

Author:

westi

Message:

Fix some notices in the importer when importing files from old WordPress versions or not fetching attachments. See #11484.
Ensure that we check that a user is created for the username we specify and otherwise fallback to the current user
See #10319.

File:

• trunk/wp-admin/import/wordpress.php (modified) (3 diffs)

trunk/wp-admin/import/wordpress.php

@@ -61 +61 @@
         global $wpdb;
         preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-        $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
-        $return = $wpdb->escape( trim( $return ) );
+        if ( isset($return[1]) ) {
+            $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
+            $return = $wpdb->escape( trim( $return ) );
+        } else {
+            $return = '';
+        }
         return $return;
     }
@@ -191 +195 @@
                     $user_id = wp_create_user($new_author_name, wp_generate_password());
                 }
-
-                $this->author_ids[$in_author_name] = $user_id;
+                
+                if ( !is_wp_error( $user_id ) ) {
+                    $this->author_ids[$in_author_name] = $user_id;
+                }
             }
 
@@ -843 +849 @@
             case 2:
                 check_admin_referer('import-wordpress');
-                $result = $this->import( $_GET['id'], $_POST['attachments'] );
+                $fetch_attachments = (!empty($_POST['attachments'])) ? true : false;
+                $result = $this->import( $_GET['id'], $fetch_attachments);
                 if ( is_wp_error( $result ) )
                     echo $result->get_error_message();