Corrects falsely blocked contacts because of some bug in the develop branch

diff --git a/boot.php b/boot.php
index 8937f78583710b0d32580130f34ab614ce5609b3..ece2b04f2ee2d815237b895ee8075c09c7a00c2b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.05-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1260);
+define('DB_UPDATE_VERSION',      1261);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/update.php b/update.php
index e85641007dad61f5d1cb29bfd47fe56ab7d28ab0..c39212152f84cfeb5bfc8e5c809dd3f8311171bb 100644 (file)
--- a/update.php
+++ b/update.php
@@ -227,3 +227,9 @@ function update_1260() {
        Config::set('system', 'maintenance', 0);
        return UPDATE_SUCCESS;
 }
+
+function update_1261() {
+       // This fixes the results of an issue in the develop branch of 2018-05.
+       dba::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
+       return UPDATE_SUCCESS;
+}