Merge branch 'pull'
This commit is contained in:
commit
1d01b3a088
|
@ -199,7 +199,7 @@ function format_event_diaspora($ev) {
|
|||
$o .= '**' . bb2diaspora($ev['desc']) . '**' . "\n";
|
||||
|
||||
$o .= t('Starts:') . ' '
|
||||
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
|
||||
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['start'] , $bd_format ))
|
||||
: day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['start'] , $bd_format)))
|
||||
|
@ -207,7 +207,7 @@ function format_event_diaspora($ev) {
|
|||
|
||||
if(! $ev['nofinish'])
|
||||
$o .= t('Finishes:') . ' '
|
||||
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
|
||||
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['finish'] , $bd_format ))
|
||||
: day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['finish'] , $bd_format )))
|
||||
|
|
Loading…
Reference in a new issue