From d7b53ad4f8c40bd8589604a4cde9db259fcb07ec Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 4 Mar 2009 19:24:48 +0000
Subject: [PATCH] Add RSS Error handling functionality to RSS Widget displays.
 Props DD32. fixes #9273

git-svn-id: http://svn.automattic.com/wordpress/trunk@10697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/dashboard.php | 17 ++++++++++++-----
 wp-includes/widgets.php         |  9 +++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 01471aada..e0fb26b6a 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -698,12 +698,19 @@ function wp_dashboard_secondary_output() {
 	@extract( @$widgets['dashboard_secondary'], EXTR_SKIP );
 	$rss = @fetch_feed( $url );
 
-	if ( !$rss->get_item_quantity() )
+	if ( is_wp_error($rss) ) {
+		if ( is_admin() || current_user_can('manage_options') ) {
+			echo '<div class="rss-widget"><p>';
+			printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
+			echo '</p></div>';
+		}
+	} elseif ( !$rss->get_item_quantity() ) {
 		return false;
-
-	echo "<div class='rss-widget'>";
-	wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
-	echo "</div>";
+	} else {
+		echo '<div class="rss-widget">';
+		wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
+		echo '</div>';
+	}
 }
 
 function wp_dashboard_plugins() {
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 537a99497..1bb8522ae 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -1549,6 +1549,15 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 		return;
 	}
 
+	if ( is_wp_error($rss) ) {
+		if ( is_admin() || current_user_can('manage_options') ) {
+			echo '<p>';
+			printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
+			echo '</p>';
+		}
+		return;
+	}
+
 	$default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0 );
 	$args = wp_parse_args( $args, $default_args );
 	extract( $args, EXTR_SKIP );