From 60c35316c19eea40ad062673e8ca716e12153759 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Tue, 9 Dec 2008 21:50:35 +0000 Subject: [PATCH] Fix a few trailing spaces/tabs git-svn-id: https://develop.svn.wordpress.org/trunk@10157 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/import/opml.php | 2 +- wp-admin/import/wordpress.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-admin/import/opml.php b/wp-admin/import/opml.php index 46c94b564a..c84511591b 100644 --- a/wp-admin/import/opml.php +++ b/wp-admin/import/opml.php @@ -15,7 +15,7 @@ $title = __('Import Blogroll'); class OPML_Import { - function dispatch() { + function dispatch() { $step = $_POST['step']; if (!$step) $step = 0; ?> diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 892fe59c5c..86b7a07874 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -106,7 +106,7 @@ class WP_Import { // this doesn't check that the file is perfectly valid but will at least confirm that it's not the wrong format altogether if ( !$is_wxr_file && preg_match('|xmlns:wp="http://wordpress[.]org/export/\d+[.]\d+/"|', $importline) ) $is_wxr_file = true; - + if ( false !== strpos($importline, '') ) { preg_match('|(.*?)|is', $importline, $url); $this->base_url = $url[1]; @@ -413,7 +413,7 @@ class WP_Import { if ( $post_exists ) { echo '
  • '; printf(__('Post %s already exists.'), stripslashes($post_title)); - $comment_post_ID = $post_id = $post_exists; + $comment_post_ID = $post_id = $post_exists; } else { // If it has parent, process parent first. @@ -558,11 +558,11 @@ class WP_Import { function process_attachment($postdata, $remote_url) { if ($this->fetch_attachments and $remote_url) { printf( __('Importing attachment %s... '), htmlspecialchars($remote_url) ); - + // If the URL is absolute, but does not contain http, upload it assuming the base_site_url variable if ( preg_match('/^\/[\w\W]+$/', $remote_url) ) $remote_url = rtrim($this->base_url,'/').$remote_url; - + $upload = $this->fetch_remote_file($postdata, $remote_url); if ( is_wp_error($upload) ) { printf( __('Remote file error: %s'), htmlspecialchars($upload->get_error_message()) );