diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
| commit | e036434b8a2dbd8594c0ac5ac7233f4700e4e475 (patch) | |
| tree | 0d37048ec06d603e45fd9852f208478a89e84476 /include/event.php | |
| parent | 0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (diff) | |
| parent | c1b2e90e3720961c280f6378e48fda7bad7c3ad0 (diff) | |
| download | volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.gz volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.bz2 volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/event.php')
| -rw-r--r-- | include/event.php | 23 |
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 +} + + + |