X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=2d25ac83d2267e22fbe669d561e392bc30b9565a;hb=62ce87dfe6923aaf142939d98bef1c95e2745f78;hp=a4d71bc4fde2b30f11e3e0a0fe71f7a53439fa44;hpb=59bebe7bcfdf82f18d545cb21d04cac8a6735399;p=friendica.git diff --git a/update.php b/update.php index a4d71bc4fd..2d25ac83d2 100644 --- 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,5 @@ 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; - } - - if (!DBA::e("UPDATE `gcontact` SET `failed` = false WHERE `last_contact` > `last_failure` AND `failed` IS NULL")) { - 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; }