From 5ad60fe10f8c6389357a084525497a1102ef673e Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Wed, 29 Aug 2007 17:28:07 +0000
Subject: [PATCH] Fix xhtml output for RSS widget when feed contains no items.
 Fixed #4671 props brettz95 and Nazgul

git-svn-id: https://develop.svn.wordpress.org/trunk@5968 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/widgets.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index ac5abf06b9..fba00f2a33 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -966,10 +966,10 @@ function wp_widget_rss($args, $number = 1) {
 ?>
 		<?php echo $before_widget; ?>
 			<?php $title ? print($before_title . $title . $after_title) : null; ?>
-			<ul>
 <?php
-	if ( is_array( $rss->items ) ) {
+	if ( is_array( $rss->items ) && !empty( $rss->items ) ) {
 		$rss->items = array_slice($rss->items, 0, $num_items);
+		echo '<ul>';
 		foreach ($rss->items as $item ) {
 			while ( strstr($item['link'], 'http') != $item['link'] )
 				$item['link'] = substr($item['link'], 1);
@@ -987,13 +987,12 @@ function wp_widget_rss($args, $number = 1) {
 			}
 			echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>$summary</li>";
 		}
+		echo '</ul>';
 	} else {
-		echo '<li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li>';
+		echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
 	}
-?>
-			</ul>
-		<?php echo $after_widget; ?>
-<?php
+	
+	echo $after_widget;
 }
 
 function wp_widget_rss_control($number) {