From 804dfcf6c4b5b6380d607c8ec6b843d56ac82247 Mon Sep 17 00:00:00 2001
From: Kevin Jardine <kevinjardine@yahoo.com>
Date: Mon, 26 Sep 2011 12:42:11 +0200
Subject: major changes for Elgg 1.8

---
 views/default/event_calendar/show_events.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'views/default/event_calendar/show_events.php')

diff --git a/views/default/event_calendar/show_events.php b/views/default/event_calendar/show_events.php
index 580fb5a45..b51b1c05f 100644
--- a/views/default/event_calendar/show_events.php
+++ b/views/default/event_calendar/show_events.php
@@ -13,23 +13,21 @@
 $listing_format = $vars['listing_format'];
 
 if ($vars['events']) {
-	if (elgg_get_plugin_setting('agenda_view', 'event_calendar') == 'yes') {
+	if ($listing_format == 'agenda') {
 		$event_list = elgg_view('event_calendar/agenda_view',$vars);
+	} else if ($listing_format == 'paged') {
+		$event_list = elgg_view('event_calendar/paged_view',$vars);
 	} else {
-		if ($listing_format == 'paged') {
-			$event_list = elgg_view('event_calendar/paged_view',$vars);
-		} else {
-			$options = array(
-				'list_class' => 'elgg-list-entity',
-				'full_view' => FALSE,
-				'pagination' => TRUE,
-				'list_type' => 'listing',
-				'list_type_toggle' => FALSE,
-				'offset' => $vars['offset'],
-				'limit' => $vars['limit'],
-			);
-			$event_list = elgg_view_entity_list($vars['events'], $options);
-		}
+		$options = array(
+			'list_class' => 'elgg-list-entity',
+			'full_view' => FALSE,
+			'pagination' => TRUE,
+			'list_type' => 'listing',
+			'list_type_toggle' => FALSE,
+			'offset' => $vars['offset'],
+			'limit' => $vars['limit'],
+		);
+		$event_list = elgg_view_entity_list($vars['events'], $options);
 	}
 } else {
 	$event_list = '<p>'.elgg_echo('event_calendar:no_events_found').'</p>';
-- 
cgit v1.2.3