Merge pull request #5129 from tobiasd/20180526-adminpanel

[friendica.git/.git] / update.php

diff --git a/update.php b/update.php
index 0208273..c392121 100644 (file)
--- a/update.php
+++ b/update.php
@@ -8,6 +8,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Core\L10n;
 
 require_once 'include/dba.php';
 
@@ -195,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;
@@ -211,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;
@@ -226,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;
+}