aboutsummaryrefslogtreecommitdiff
path: root/models/model.php
diff options
context:
space:
mode:
authorKevin Jardine <kevinjardine@yahoo.com>2012-06-21 15:55:59 +0200
committerKevin Jardine <kevinjardine@yahoo.com>2012-06-21 15:55:59 +0200
commitd760deb0117b3a1b1adec1b38c73ebe412d02e1e (patch)
tree89c4cdedd0f601f2564720793d8680de75564b46 /models/model.php
parente75bc90b93afb36d75dd67695eb0f3b9599d7052 (diff)
downloadelgg-d760deb0117b3a1b1adec1b38c73ebe412d02e1e.tar.gz
elgg-d760deb0117b3a1b1adec1b38c73ebe412d02e1e.tar.bz2
small tweaks for UF
Diffstat (limited to 'models/model.php')
-rw-r--r--models/model.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/models/model.php b/models/model.php
index d25c8dca3..aea6bca2f 100644
--- a/models/model.php
+++ b/models/model.php
@@ -2144,7 +2144,6 @@ function event_calendar_get_page_content_fullcalendar_events($start_date,$end_da
'id' => $event->guid,
'guid' => $event->guid,
'title' => $event->title,
- 'url' => elgg_get_site_url().'event_calendar/view_light_box/'.$event->guid,
'start' => date('c',$ed['start_time']),
'end' => date('c',$ed['end_time']),
);
@@ -2157,6 +2156,11 @@ function event_calendar_get_page_content_fullcalendar_events($start_date,$end_da
if ($polls_supported && isset($e['is_event_poll']) && $e['is_event_poll']) {
$event_item['className'] = 'event-poll-class';
$event_item['title'] .= ' '.elgg_echo('event_calendar:poll_suffix');
+ $event_item['is_event_poll'] = TRUE;
+ $event_item['url'] = elgg_get_site_url().'event_poll/vote/'.$event->guid;
+ } else {
+ $event_item['is_event_poll'] = FALSE;
+ $event_item['url'] = elgg_get_site_url().'event_calendar/view_light_box/'.$event->guid;
}
$event_array[] = $event_item;