Changes from branches/2.2/wp-admin/import/greymatter.php at r5405 to trunk/wp-admin/import/greymatter.php at r4608

File:

• trunk/wp-admin/import/greymatter.php (modified) (6 diffs)

trunk/wp-admin/import/greymatter.php

@@ -35 +35 @@
 <input type="hidden" name="import" value="greymatter" />
 <input type="hidden" name="step" value="1" />
-<?php wp_nonce_field('import-greymatter'); ?>
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
 <p><table cellpadding="0">
@@ -89 +88 @@
 
         if (!chdir($archivespath))
-            wp_die(__("Wrong path, the path to the GM entries does not exist on the server"));
+            wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $archivespath));
 
         if (!chdir($gmpath))
-            wp_die(__("Wrong path, the path to the GM files does not exist on the server"));
-
-        $lastentry = (int) $lastentry;
-
+            wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
+            
         $this->header();
 ?>
@@ -132 +129 @@
         $user_id = wp_insert_user($user_info);
         $this->gmnames[$userdata[0]] = $user_id;
-
+        
         printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
     }
@@ -217 +214 @@
                     $user_url=$wpdb->escape("");
                     $user_joindate=$wpdb->escape($user_joindate);
-
+                    
                     $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
                     $user_id = wp_insert_user($user_info);
                     $this->gmnames[$postinfo[1]] = $user_id;
-
+                    
                     echo ': ';
                     printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
                 }
-
+            
                 if (array_key_exists($postinfo[1], $this->gmnames)) {
                     $post_author = $this->gmnames[$postinfo[1]];
@@ -231 +228 @@
                     $post_author = $user_id;
                 }
-
+            
                 $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
                 $post_ID = wp_insert_post($postdata);
@@ -301 +298 @@
                 break;
             case 1:
-                check_admin_referer('import-greymatter');
                 $this->import();
                 break;