From: Michael <heluecht@pirati.ca>
Date: Thu, 10 May 2018 10:41:32 +0000 (+0000)
Subject: Corrects falsely blocked contacts because of some bug in the develop branch
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aafc314ccc06f96909f2ee490f0aa1c8a2da25f1;p=friendica.git

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

diff --git a/boot.php b/boot.php
index 8937f78583..ece2b04f2e 100644
--- 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 e85641007d..c39212152f 100644
--- 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;
+}