Merge pull request #10846 from nupplaphil/feat/adapt_vagrant

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 1daea43fd46aa1d67614469bd6d3c7d114903220..84f0c6de8218b31d66bf874efbf822dbea60a44e 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2719,7 +2719,7 @@ class Diaspora
 
                /// @todo enable support for polls
                //if ($data->poll) {
-               //      foreach ($data->poll AS $poll)
+               //      foreach ($data->poll as $poll)
                //              print_r($poll);
                //      die("poll!\n");
                //}
@@ -3314,15 +3314,12 @@ class Diaspora
                $eventdata["all_day"] = "false";
 
                $eventdata['timezone'] = 'UTC';
-               if (!$event['adjust'] && $owner['timezone']) {
-                       $eventdata['timezone'] = $owner['timezone'];
-               }
 
                if ($event['start']) {
-                       $eventdata['start'] = DateTimeFormat::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
+                       $eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
                }
                if ($event['finish'] && !$event['nofinish']) {
-                       $eventdata['end'] = DateTimeFormat::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
+                       $eventdata['end'] = DateTimeFormat::utc($event['finish'], $mask);
                }
                if ($event['summary']) {
                        $eventdata['summary'] = html_entity_decode(BBCode::toMarkdown($event['summary']));