Issue 7659: Udate the "user-contact" value with the "contact" values

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 078d7c117707d650ad53b018d9546e25b20af353..bd8da30f6701b5b3a9fd162b45d533c6efbcd25e 100755 (executable)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1326);
+       define('DB_UPDATE_VERSION', 1327);
 }
 
 return [

diff --git a/update.php b/update.php
index 3132677ea7f5e8a7383064e51092db1a6b0573e5..40f39ebebad0783a07648d97f52abc4d870a63d6 100644 (file)
--- a/update.php
+++ b/update.php
@@ -396,3 +396,15 @@ function update_1323()
        return Update::SUCCESS;
 }
 
+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']);
+       }
+       DBA::close($contacts);
+
+       return Update::SUCCESS;
+}
+