1 files changed, 21 insertions, 27 deletions
diff --git a/views/default/event_calendar/group_module.php b/views/default/event_calendar/group_module.php
index 5fc644e8b..b1c1567e7 100644
--- a/views/default/event_calendar/group_module.php
+++ b/views/default/event_calendar/group_module.php
@@ -9,35 +9,29 @@ if ($group->event_calendar_enable == "no") {
 	return true;
 }
 
-$all_link = elgg_view('output/url', array(
-	'href' => "event_calendar/group/$group->guid/all",
-	'text' => elgg_echo('link:view:all'),
-));
-
 elgg_push_context('widgets');
-$options = array(
-	'type' => 'object',
-	'subtype' => 'event_calendar',
-	'container_guid' => elgg_get_page_owner_guid(),
-	'limit' => 6,
-	'full_view' => false,
-	'pagination' => false,
-);
-$content = elgg_list_entities($options);
+$content = elgg_view('event_calendar/groupprofile_calendar');
 elgg_pop_context();
 
-if (!$content) {
-	$content = '<p>' . elgg_echo('event_calendar:no_events_found') . '</p>';
+if (!$content) {	
+	if (elgg_get_plugin_setting('group_always_display', 'event_calendar') == 'yes') {
+    	$content = elgg_echo('event_calendar:no_events_found');
+	}
 }
 
-$new_link = elgg_view('output/url', array(
-	'href' => "event_calendar/add/$group->guid",
-	'text' => elgg_echo('event_calendar:new'),
-));
-
-echo elgg_view('groups/profile/module', array(
-	'title' => elgg_echo('event_calendar:group'),
-	'content' => $content,
-	'all_link' => $all_link,
-	'add_link' => $new_link,
-));
+if ($content) {
+	$all_link = elgg_view('output/url', array(
+		'href' => "event_calendar/group/$group->guid",
+		'text' => elgg_echo('link:view:all'),
+	));
+	$new_link = elgg_view('output/url', array(
+		'href' => "event_calendar/add/$group->guid",
+		'text' => elgg_echo('event_calendar:new'),
+	));
+	echo elgg_view('groups/profile/module', array(
+		'title' => elgg_echo('event_calendar:group'),
+		'content' => $content,
+		'all_link' => $all_link,
+		'add_link' => $new_link,
+	));
+}