Changes in trunk/wp-admin/import/rss.php [4349:3374]

File:

• trunk/wp-admin/import/rss.php (modified) (7 diffs)

trunk/wp-admin/import/rss.php

@@ -20 +20 @@
         return strtr($string, $trans_tbl);
     }
-
+    
     function greet() {
-        echo '<div class="narrow">';
         echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
         wp_import_upload_form("admin.php?import=rss&amp;step=1");
-        echo '</div>';
     }
 
     function get_posts() {
         global $wpdb;
-
+        
         set_magic_quotes_runtime(0);
         $datalines = file($this->file); // Read the file into an array
@@ -41 +39 @@
         foreach ($this->posts as $post) {
             preg_match('|<title>(.*?)</title>|is', $post, $post_title);
-            $post_title = str_replace(array('<![CDATA[', ']]>'), '', $wpdb->escape( trim($post_title[1]) ));
+            $post_title = $wpdb->escape(trim($post_title[1]));
 
-            preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date_gmt);
+            preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date);
 
-            if ($post_date_gmt) {
-                $post_date_gmt = strtotime($post_date_gmt[1]);
+            if ($post_date) {
+                $post_date = strtotime($post_date[1]);
             } else {
                 // if we don't already have something from pubDate
-                preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date_gmt);
-                $post_date_gmt = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date_gmt[1]);
-                $post_date_gmt = str_replace('T', ' ', $post_date_gmt);
-                $post_date_gmt = strtotime($post_date_gmt);
+                preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date);
+                $post_date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date[1]);
+                $post_date = str_replace('T', ' ', $post_date);
+                $post_date = strtotime($post_date);
             }
 
-            $post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt);
-            $post_date = get_date_from_gmt( $post_date_gmt );
+            $post_date = gmdate('Y-m-d H:i:s', $post_date);
 
             preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
@@ -94 +91 @@
             $post_author = 1;
             $post_status = 'publish';
-            $this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
+            $this->posts[$index] = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
             $index++;
         }
@@ -138 +135 @@
         $this->import_posts();
         wp_import_cleanup($file['id']);
-
+        
         echo '<h3>';
         printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
@@ -151 +148 @@
 
         $this->header();
-
+        
         switch ($step) {
             case 0 :
@@ -160 +157 @@
                 break;
         }
-
+        
         $this->footer();
     }
 
     function RSS_Import() {
-        // Nothing.
+        // Nothing. 
     }
 }
@@ -171 +168 @@
 $rss_import = new RSS_Import();
 
-register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
+register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
 ?>