Changeset 10697

Timestamp:

03/04/2009 07:24:48 PM (18 years ago)

Author:

ryan

Message:

Add RSS Error handling functionality to RSS Widget displays. Props DD32. fixes #9273

Location:

trunk

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/includes/dashboard.php

@@ -699 +699 @@
         $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>';
+        }
 }
 

trunk/wp-includes/widgets.php

@@ -1547 +1547 @@
                         return;
         } elseif ( !is_object($rss) ) {
+                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;
         }