diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
| commit | 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc (patch) | |
| tree | c6fd23b598f3994eddb18cb1c0f2e8d95ff054fa /wp-admin/import/rss.php | |
| parent | f650f48c048bfbbb2ae702b6425d87e39358d748 (diff) | |
| download | wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.gz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.xz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.zip | |
Merged with WordPress 2.5, unstable, only for testing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/import/rss.php')
| -rw-r--r-- | wp-admin/import/rss.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php index 11fc770..60a4490 100644 --- a/wp-admin/import/rss.php +++ b/wp-admin/import/rss.php @@ -71,7 +71,7 @@ class RSS_Import { $cat_index++; } - preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid); + preg_match('|<guid.*?>(.*?)</guid>|is', $post, $guid); if ($guid) $guid = $wpdb->escape(trim($guid[1])); else @@ -141,6 +141,7 @@ class RSS_Import { if ( is_wp_error( $result ) ) return $result; wp_import_cleanup($file['id']); + do_action('import_done', 'rss'); echo '<h3>'; printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')); @@ -177,5 +178,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')); ?> |