Merged a notice fix

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index b2d0d65ae973a661cf09f3fd41a1c4061d390c8f..64989425a7658a01003bd66069a1c37146954c1a 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -200,6 +200,12 @@
                 }
             }
 
+            // first we must verify that the rss feed is loaded
+            // by checking $rss and $rss->items exist before using them
+            if (empty($rss) || empty($rss->items)) {
+                return '';
+            }
+
             if ($shownumentries > 0 && $shownumentries < count($rss->items) ) {
                 $rss->items = array_slice($rss->items, 0, $shownumentries);
             }
@@ -230,11 +236,6 @@
 
             $formatoptions->para = false;
 
-            // first we must verify that the rss feed is loaded
-            // by checking $rss and $rss->items exist before using them
-            if (empty($rss) || empty($rss->items)) {
-                return '';
-            }
 
             /// Accessibility: markup as a list.
             $returnstring .= '<ul class="list">'."\n";