Ticket #9273: 9273.diff

wp-admin/includes/dashboard.php

@@ -698 +698 @@
         @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() {

wp-includes/widgets.php

@@ -1549 +1600 @@
                 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 );