diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index 4a443c4d30296..886663f31f3e8 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -82,9 +82,15 @@ function get_content() { // Daryl Hawes note: if count of rssidarray is greater than 1 // we should possibly display a drop down menu of selected feed titles // so user can select a single feed to view (similar to RSSFeed) + $numids = count($rssidarray); + $count = 0; if (!empty($rssidarray)) { foreach ($rssidarray as $rssid) { - $output .= $this->get_rss_by_id($rssid, $display_description, $shownumentries); + $output .= $this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false); + if ($numids > 1 && $count != $numids -1) { + $output .= '
'; + } + $count ++; } } @@ -107,7 +113,7 @@ function instance_allow_config() { /** * */ - function get_rss_by_id($rssid, $display_description, $shownumentries) { + function get_rss_by_id($rssid, $display_description, $shownumentries, $showtitle=false) { global $CFG; $returnstring = ''; $rss_record = get_record('block_rss_client', 'id', $rssid); @@ -121,7 +127,10 @@ function get_rss_by_id($rssid, $display_description, $shownumentries) { } return; } - + + if ($showtitle) { + $returnstring .= '

'. $rss_record->title .'

'; + } if ($shownumentries > 0 && $shownumentries < count($rss->items) ) { $count_to = $shownumentries; } else {