X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=c39212152f84cfeb5bfc8e5c809dd3f8311171bb;hb=9ea6d4b26d4375502c567276705dff2ff678122e;hp=1a6bcdf7b24b7e0d1681935f69c7a4d9c0ebdf71;hpb=d3f122dfe295ad7ea62c86d706962eba4d7927b8;p=friendica.git

diff --git a/update.php b/update.php
index 1a6bcdf7b2..c39212152f 100644
--- a/update.php
+++ b/update.php
@@ -196,7 +196,7 @@ function update_1260() {
 		WHERE `owner-id` = 0 AND `owner-link` != ''");
 	while ($item = dba::fetch($items)) {
 		$contact = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
-			'avatar' => $item['owner-avatar'], 'network' => $item['network']];
+			'photo' => $item['owner-avatar'], 'network' => $item['network']];
 		$cid = Contact::getIdForURL($item['owner-link'], 0, false, $contact);
 		if (empty($cid)) {
 			continue;
@@ -212,7 +212,7 @@ function update_1260() {
 		WHERE `author-id` = 0 AND `author-link` != ''");
 	while ($item = dba::fetch($items)) {
 		$contact = ['url' => $item['author-link'], 'name' => $item['author-name'],
-			'avatar' => $item['author-avatar'], 'network' => $item['network']];
+			'photo' => $item['author-avatar'], 'network' => $item['network']];
 		$cid = Contact::getIdForURL($item['author-link'], 0, false, $contact);
 		if (empty($cid)) {
 			continue;
@@ -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;
+}