Move FSuggest to depository

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

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 087754dfc9e7806f80f87b5b7a3b3e5c64253884..84f0c6de8218b31d66bf874efbf822dbea60a44e 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1350,7 +1350,7 @@ class Diaspora
                                'notify' => $data['notify'], 'poll' => $data['poll'],
                                'network' => $data['network']];
 
-               DBA::update('contact', $fields, ['addr' => $old_handle]);
+               Contact::update($fields, ['addr' => $old_handle]);
 
                Logger::notice('Contacts are updated.');
 
@@ -2109,7 +2109,7 @@ class Diaspora
                        $fields['bd'] = $birthday;
                }
 
-               DBA::update('contact', $fields, ['id' => $contact['id']]);
+               Contact::update($fields, ['id' => $contact['id']]);
 
                Logger::info("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"]);
 
@@ -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']));