Merge pull request #9014 from annando/issue-9013

[friendica.git] / update.php

diff --git a/update.php b/update.php
index a4d71bc4fde2b30f11e3e0a0fe71f7a53439fa44..6152e2b1e01e144f760566d98cb3c42e8797477b 100644 (file)
--- a/update.php
+++ b/update.php
@@ -48,7 +48,6 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Model\Storage;
@@ -315,7 +314,6 @@ function update_1298()
                                                'was' => $data[$translateKey]]);
                                        Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
                                        Contact::updateSelfFromUserID($data['id']);
-                                       GContact::updateForUser($data['id']);
                                        $success++;
                                }
                        }
@@ -378,8 +376,8 @@ function update_1327()
 {
        $contacts = DBA::select('contact', ['uid', 'id', 'blocked', 'readonly'], ["`uid` != ? AND (`blocked` OR `readonly`) AND NOT `pending`", 0]);
        while ($contact = DBA::fetch($contacts)) {
-               Contact::setBlockedForUser($contact['id'], $contact['uid'], $contact['blocked']);
-               Contact::setIgnoredForUser($contact['id'], $contact['uid'], $contact['readonly']);
+               Contact\User::setBlocked($contact['id'], $contact['uid'], $contact['blocked']);
+               Contact\User::setIgnored($contact['id'], $contact['uid'], $contact['readonly']);
        }
        DBA::close($contacts);
 
@@ -562,16 +560,14 @@ function update_1357()
                return Update::FAILED;
        }
 
-       if (!DBA::e("UPDATE `gcontact` SET `failed` = true WHERE `last_contact` < `last_failure` AND `failed` IS NULL")) {
-               return Update::FAILED;
-       }
+       return Update::SUCCESS;
+}
 
-       if (!DBA::e("UPDATE `gcontact` SET `failed` = false WHERE `last_contact` > `last_failure` AND `failed` IS NULL")) {
+function pre_update_1358()
+{
+       if (!DBA::e("DELETE FROM `contact-relation` WHERE NOT `relation-cid` IN (SELECT `id` FROM `contact`) OR NOT `cid` IN (SELECT `id` FROM `contact`)")) {
                return Update::FAILED;
        }
 
-       if (!DBA::e("UPDATE `gcontact` SET `failed` = false WHERE `updated` > `last_failure` AND `failed` IS NULL")) {
-               return Update::FAILED;
-       }
        return Update::SUCCESS;
 }