aboutsummaryrefslogtreecommitdiff
path: root/views/default/object/event_calendar.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-20 05:45:54 +0200
committerSem <sembrestels@riseup.net>2012-07-20 05:45:54 +0200
commit3ac2c8fd0cacc57b8080be5f7d381b8cf5524f2f (patch)
tree46475df7579e0bf12c7bff62c3e125b16c641247 /views/default/object/event_calendar.php
parent6e3d519f4ff1e163fe698607adba1568386d8c55 (diff)
parent86d154541f9cf1de74f79cae6c1b05b3214bdca8 (diff)
downloadelgg-3ac2c8fd0cacc57b8080be5f7d381b8cf5524f2f.tar.gz
elgg-3ac2c8fd0cacc57b8080be5f7d381b8cf5524f2f.tar.bz2
Merge branch 'full' of https://github.com/kevinjardine/Elgg-Event-Calendar
Diffstat (limited to 'views/default/object/event_calendar.php')
-rw-r--r--views/default/object/event_calendar.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php
index 717e2803e..afd4325f1 100644
--- a/views/default/object/event_calendar.php
+++ b/views/default/object/event_calendar.php
@@ -11,11 +11,17 @@
*
*/
+elgg_load_library('elgg:event_calendar');
+
$event = $vars['entity'];
$full = elgg_extract('full_view', $vars, FALSE);
if ($full) {
$body = elgg_view('event_calendar/strapline',$vars);
+ if ($event->web_conference) {
+ $body .= '<br />';
+ $body .= elgg_view('event_calendar/conference_button',array('event'=>$event));
+ }
$event_items = event_calendar_get_formatted_full_items($event);
$body .= '<br />';