WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@10742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-03-08 05:01:26 +00:00
parent 2416f426d9
commit 6198cca609
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/widgets.php
View File

@ -1765,6 +1765,12 @@ function wp_widget_rss_form( $args, $inputs = null ) {
$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'] ) :
?>
<p>
@ -1854,8 +1860,7 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
$error = false;
$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()));
while ( stristr($link, 'http') != $link )