From e2f1540f25cae5b647fbebacac105d03cff17502 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 7 Jun 2011 22:13:07 -0700
Subject: events, continued. Also better regex matching accounting for empty
 elements

---
 include/event.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/event.php')

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 */ )
-- 
cgit v1.2.3