Changeset 10742 for trunk/wp-includes/widgets.php

Timestamp:

03/08/2009 05:01:26 AM (18 years ago)

Author:

azaozz

Message:

Better error handling and display in the RSS widget, props DD32, fixes #8495

File:

• trunk/wp-includes/widgets.php (modified) (2 diffs)

trunk/wp-includes/widgets.php

@@ -1765 +1765 @@
         $show_author    = (int) $show_author;
         $show_date      = (int) $show_date;
+
+        if ( !empty($error) ) {
+                $message = sprintf( __('Error in RSS Widget: %s'), $error);
+                echo "<div class='error'><p>$message</p></div>";
+                echo "<p class='hide-if-no-js'><strong>$message</strong></p>";
+        }
 
         if ( $inputs['url'] ) :
@@ -1855 +1861 @@
                 $link = '';
                 if ( is_wp_error($rss) ) {
-                        $url = wp_specialchars(__('Error: could not find an RSS or ATOM feed at that URL.'), 1);
-                        $error = sprintf(__('Error in RSS %1$d'), $widget_number );
+                        $error = $rss->get_error_message();
                 } else {
                         $link = clean_url(strip_tags($rss->get_permalink()));