Wordpress 2.0.11

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

diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php
index e4a81673df676a6b6a54dc331efb9e32a597b19f..187c8ac2459135f04d88c30ad8638533c36a751c 100644 (file)
--- a/wp-admin/import/rss.php
+++ b/wp-admin/import/rss.php
@@ -38,21 +38,22 @@ class RSS_Import {
                $index = 0;
                foreach ($this->posts as $post) {
                        preg_match('|<title>(.*?)</title>|is', $post, $post_title);
-                       $post_title = $wpdb->escape(trim($post_title[1]));
+                       $post_title = str_replace(array('<![CDATA[', ']]>'), '', $wpdb->escape( trim($post_title[1]) ));
 
-                       preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date);
+                       preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date_gmt);
 
-                       if ($post_date) {
-                               $post_date = strtotime($post_date[1]);
+                       if ($post_date_gmt) {
+                               $post_date_gmt = strtotime($post_date_gmt[1]);
                        } else {
                                // if we don't already have something from pubDate
-                               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);
+                               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);
                        }
 
-                       $post_date = gmdate('Y-m-d H:i:s', $post_date);
+                       $post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt);
+                       $post_date = get_date_from_gmt( $post_date_gmt );
 
                        preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
                        $categories = $categories[1];
@@ -90,7 +91,7 @@ class RSS_Import {
 
                        $post_author = 1;
                        $post_status = 'publish';
-                       $this->posts[$index] = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
+                       $this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
                        $index++;
                }
        }
@@ -153,6 +154,7 @@ class RSS_Import {
                                $this->greet();
                                break;
                        case 1 :
+                               check_admin_referer('import-upload');
                                $this->import();
                                break;
                }
@@ -167,5 +169,5 @@ class RSS_Import {
 
 $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'));
 ?>