diff options
author | Friendika <info@friendika.com> | 2011-06-07 22:13:07 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-06-07 22:13:07 -0700 |
commit | e2f1540f25cae5b647fbebacac105d03cff17502 (patch) | |
tree | f4ae61e2cca0f923c919edc80a2ebc2a0f1e5e15 /include/event.php | |
parent | 33fe26ecb01ec009a639c4c8fdfc4f93b2bd34ac (diff) | |
download | volse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.tar.gz volse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.tar.bz2 volse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.zip |
events, continued. Also better regex matching accounting for empty elements
Diffstat (limited to 'include/event.php')
-rw-r--r-- | include/event.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/event.php b/include/event.php index 17e12d7cf..33970efff 100644 --- a/include/event.php +++ b/include/event.php @@ -12,8 +12,8 @@ function format_event_html($ev) { $o .= '<p class="description">' . bbcode($ev['desc']) . '</p>'; - $o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="' - . datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME) + $o .= '<p>' . t('Starts:') . ' <abbr class="dtstart" title="' + . datetime_convert('UTC','UTC',$ev['start'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) . '" >' . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $ev['start'] /*, format */ ) @@ -22,8 +22,8 @@ function format_event_html($ev) { . '</abbr></p>'; if(! $ev['nofinish']) - $o .= '<p>' . t('Ends: ') . '<abbr class="dtend" title="' - . datetime_convert('UTC','UTC',$ev['finish'], ATOM_TIME) + $o .= '<p>' . t('Finishes:') . ' <abbr class="dtend" title="' + . datetime_convert('UTC','UTC',$ev['finish'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) . '" >' . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $ev['finish'] /*, format */ ) |