Merge pull request #8079 from ozero/patch-1

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 3132677ea7f5e8a7383064e51092db1a6b0573e5..924fac54589533d29c12d7dad80c610618e2aa87 100644 (file)
--- a/update.php
+++ b/update.php
@@ -12,6 +12,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Model\Storage;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
@@ -396,3 +397,38 @@ 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;
+}
+
+function update_1330()
+{
+       $currStorage = Config::get('storage', 'class', '');
+
+       // set the name of the storage instead of the classpath as config
+       if (!empty($currStorage)) {
+               /** @var Storage\IStorage $currStorage */
+               if (!Config::set('storage', 'name', $currStorage::getName())) {
+                       return Update::FAILED;
+               }
+
+               // try to delete the class since it isn't needed. This won't work with config files
+               Config::delete('storage', 'class');
+       }
+
+       // Update attachments and photos
+       if (!DBA::p("UPDATE `photo` SET `photo`.`backend-class` = SUBSTR(`photo`.`backend-class`, 22) WHERE `photo`.`backend-class` LIKE 'Friendica\\Model\\Storage\\%'") ||
+           !DBA::p("UPDATE `attach` SET `attach`.`backend-class` = SUBSTR(`attach`.`backend-class`, 22) WHERE `attach`.`backend-class` LIKE 'Friendica\\Model\\Storage\\%'")) {
+               return Update::FAILED;
+       };
+
+       return Update::SUCCESS;
+}