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

Timestamp:

09/18/2007 04:32:22 PM (18 years ago)

Author:

ryan

Message:

Add checks for WP_Error. Props filosofo. see #4809

File:

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

trunk/wp-admin/import/wordpress.php

@@ -251 +251 @@
         echo '<ol>';
 
-        foreach ($this->posts as $post)
-            $this->process_post($post);
+        foreach ($this->posts as $post) {
+            $result = $this->process_post($post);
+            if ( is_wp_error( $result ) )
+                return $result;
+        }
 
         echo '</ol>';
@@ -304 +307 @@
             $post_parent = (int) $post_parent;
             if ($parent = $this->posts_processed[$post_parent]) {
-                if (!$parent[1]) $this->process_post($parent[0]); // If not yet, process the parent first.
+                if (!$parent[1]) { 
+                    $result = $this->process_post($parent[0]); // If not yet, process the parent first.
+                    if ( is_wp_error( $result ) )
+                        return $result;
+                }
                 $post_parent = $parent[1]; // New ID of the parent;
             }
@@ -315 +322 @@
             $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'post_name', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'menu_order', 'post_type');
             $comment_post_ID = $post_id = wp_insert_post($postdata);
+            if ( is_wp_error( $post_id ) )
+                return $post_id;
 
             // Memorize old and new ID.
@@ -383 +392 @@
         $this->get_entries();
         $this->process_categories();
-        $this->process_posts();
+        $result = $this->process_posts();
+        if ( is_wp_error( $result ) )
+            return $result;
     }
 
@@ -403 +414 @@
             case 2:
                 check_admin_referer('import-wordpress');
-                $this->import();
+                $result = $this->import();
+                if ( is_wp_error( $result ) )
+                    echo $result->get_error_message();
                 break;
         }