Ticket #4671: widgetpatch.patch

wp-includes/widgets.php

@@ -966 +966 @@
 ?>
                 <?php echo $before_widget; ?>
                         <?php $title ? print($before_title . $title . $after_title) : null; ?>
-                        <ul>
 <?php
         if ( is_array( $rss->items ) ) {
                 $rss->items = array_slice($rss->items, 0, $num_items);
-                foreach ($rss->items as $item ) {
-                        while ( strstr($item['link'], 'http') != $item['link'] )
-                                $item['link'] = substr($item['link'], 1);
-                        $link = clean_url(strip_tags($item['link']));
-                        $title = attribute_escape(strip_tags($item['title']));
-                        if ( empty($title) )
-                                $title = __('Untitled');
-                        $desc = '';
-                        if ( $show_summary ) {
-                                $summary = '<div class="rssSummary">' . $item['description'] . '</div>';
-                        } else {
-                                if ( isset( $item['description'] ) && is_string( $item['description'] ) )
-                                        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
-                                $summary = '';
+                if (!empty($rss->items)) {
+                        print '<ul>';
+                        foreach ($rss->items as $item ) {
+                                while ( strstr($item['link'], 'http') != $item['link'] )
+                                        $item['link'] = substr($item['link'], 1);
+                                $link = clean_url(strip_tags($item['link']));
+                                $title = attribute_escape(strip_tags($item['title']));
+                                if ( empty($title) )
+                                        $title = __('Untitled');
+                                $desc = '';
+                                if ( $show_summary ) {
+                                        $summary = '<div class="rssSummary">' . $item['description'] . '</div>';
+                                } else {
+                                        if ( isset( $item['description'] ) && is_string( $item['description'] ) )
+                                                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
+                                        $summary = '';
+                                }
+                                echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>$summary</li>";
                         }
-                        echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>$summary</li>";
+                        print '</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
 }