diff options
| author | Kevin Jardine <kevinjardine@yahoo.com> | 2012-07-22 13:09:41 +0200 |
|---|---|---|
| committer | Kevin Jardine <kevinjardine@yahoo.com> | 2012-07-22 13:09:41 +0200 |
| commit | d4f4f93ff198915232d6ac575cc63e931dfcd0d8 (patch) | |
| tree | 8ce8d094c28d66263afec9cd55a687bcf154261d /views/default/widgets | |
| parent | 43df50de769ce11dac12ebedef07c7c1a7e9b7ab (diff) | |
| parent | 86d154541f9cf1de74f79cae6c1b05b3214bdca8 (diff) | |
| download | elgg-d4f4f93ff198915232d6ac575cc63e931dfcd0d8.tar.gz elgg-d4f4f93ff198915232d6ac575cc63e931dfcd0d8.tar.bz2 | |
Merge branch 'full' of github.com:kevinjardine/Elgg-Event-Calendar into full
Diffstat (limited to 'views/default/widgets')
| -rw-r--r-- | views/default/widgets/event_calendar/content.php | 8 | ||||
| -rw-r--r-- | views/default/widgets/event_calendar/view.php | 39 |
2 files changed, 6 insertions, 41 deletions
diff --git a/views/default/widgets/event_calendar/content.php b/views/default/widgets/event_calendar/content.php index 329046cb0..eaedb76bd 100644 --- a/views/default/widgets/event_calendar/content.php +++ b/views/default/widgets/event_calendar/content.php @@ -20,8 +20,12 @@ $num = 5; // Get the events - - $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num); + $owner = elgg_get_page_owner_entity(); + if(elgg_instanceof($owner, 'group')) { + $events = event_calendar_get_events_for_group(elgg_get_page_owner_guid(),$num); + } else { + $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num); + } // If there are any events to view, view them if (is_array($events) && sizeof($events) > 0) { diff --git a/views/default/widgets/event_calendar/view.php b/views/default/widgets/event_calendar/view.php deleted file mode 100644 index 329046cb0..000000000 --- a/views/default/widgets/event_calendar/view.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php - -/** - * Elgg event calendar widget - * - * @package event_calendar - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Kevin Jardine <kevin@radagast.biz> - * @copyright Radagast Solutions 2008 - * @link http://radagast.biz/ - * - */ - - // Load event calendar model - elgg_load_library('elgg:event_calendar'); - - //the number of events to display - $num = (int) $vars['entity']->num_display; - if (!$num) - $num = 5; - - // Get the events - - $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num); - - // If there are any events to view, view them - if (is_array($events) && sizeof($events) > 0) { - - echo "<div id=\"widget_calendar\">"; - - foreach($events as $event) { - echo elgg_view("object/event_calendar",array('entity' => $event)); - } - - echo "</div>"; - - } - -?>
\ No newline at end of file |