WP Merge to WP 2.2.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 3 deletions

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index da7bc1b..44005a7 100644
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -815,8 +815,7 @@ function parse_w3cdtf ( $date_str ) {
 	else {
 		return -1;
 	}
-}
-
+	}
 function wp_rss ($url, $num_items) {
 	//ini_set("display_errors", false); uncomment to suppress php errors thrown if the feed is not returned.
 	$rss = fetch_rss($url);
@@ -833,7 +832,7 @@ function wp_rss ($url, $num_items) {
 			echo "</ul>";
 	}
 		else {
-			echo 'An error has occurred the feed is probably down, try again later.';
+			echo "an error has occured the feed is probably down, try again later.";
 	}
 }