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

Timestamp:

08/29/2007 05:28:07 PM (17 years ago)

Author:

westi

Message:

Fix xhtml output for RSS widget when feed contains no items. Fixed #4671 props brettz95 and Nazgul

File:

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

trunk/wp-includes/widgets.php

@@ -967 +967 @@
         <?php echo $before_widget; ?>
             <?php $title ? print($before_title . $title . $after_title) : null; ?>
-            <ul>
-<?php
-    if ( is_array( $rss->items ) ) {
+<?php
+    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'] )
@@ -988 +988 @@
             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>';
-    }
-?>
-            </ul>
-        <?php echo $after_widget; ?>
-<?php
+        echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
+    }
+    
+    echo $after_widget;
 }