aboutsummaryrefslogtreecommitdiffstats
path: root/include/event.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/event.php')
-rw-r--r--include/event.php23
1 files changed, 16 insertions, 7 deletions
diff --git a/include/event.php b/include/event.php
index 06239b2ab..38ab83316 100644
--- a/include/event.php
+++ b/include/event.php
@@ -3,32 +3,41 @@
function format_event_html($ev) {
+ require_once('include/bbcode.php');
+
if(! ((is_array($ev)) && count($ev)))
return '';
$o = '<div class="vevent">';
- $o .= '<p class="description">' . $ev['desc'] . '</p>';
+ $o .= '<p class="description">' . bbcode($ev['desc']) . '</p>';
$o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="'
. datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME)
. '" >'
- . datetime_convert('UTC', date_default_timezone_get(),
- $ev['start'] /*, format */ )
+ . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(),
+ $ev['start'] /*, format */ )
+ : datetime_convert('UTC', 'UTC',
+ $ev['start'] /*, format */ ))
. '</abbr></p>';
$o .= '<p>' . t('Ends: ') . '<abbr class="dtend" title="'
. datetime_convert('UTC','UTC',$ev['finish'], ATOM_TIME)
. '" >'
- . datetime_convert('UTC', date_default_timezone_get(),
- $ev['finish'] /*, format */ )
+ . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(),
+ $ev['finish'] /*, format */ )
+ : datetime_convert('UTC', 'UTC',
+ $ev['finish'] /*, format */ ))
. '</abbr></p>';
$o .= '<p> ' . t('Location:') . '<span class="location">'
- . $ev['location']
+ . bbcode($ev['location'])
. '</span></p>';
$o .= '</div>';
return $o;
-} \ No newline at end of file
+}
+
+
+