diff options
| author | Friendika <info@friendika.com> | 2011-09-04 00:51:42 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-04 00:51:42 -0700 |
| commit | 1d01b3a088aaaaf47844544b76b55f76f7f31182 (patch) | |
| tree | 18407227c401ba676a542f6a30373af32fb53da2 /include | |
| parent | 9ff1a3444e9029c94541a7c84f0ed5ba764adef3 (diff) | |
| parent | c0a2cc3e98868b3b10472dee00a4590bb11f45c1 (diff) | |
| download | volse-hubzilla-1d01b3a088aaaaf47844544b76b55f76f7f31182.tar.gz volse-hubzilla-1d01b3a088aaaaf47844544b76b55f76f7f31182.tar.bz2 volse-hubzilla-1d01b3a088aaaaf47844544b76b55f76f7f31182.zip | |
Merge branch 'pull'
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb2diaspora.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index f9e3b3f28..ca0c961b3 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -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 ))) |