WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


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

1 files changed, 3 insertions, 2 deletions

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index 44005a7..da7bc1b 100644
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -815,7 +815,8 @@ 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);
@@ -832,7 +833,7 @@ function wp_rss ($url, $num_items) {
 			echo "</ul>";
 	}
 		else {
-			echo "an error has occured the feed is probably down, try again later.";
+			echo 'An error has occurred the feed is probably down, try again later.';
 	}
 }