Merge pull request #8079 from ozero/patch-1

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 7d25c6ac0ea51eeefd3f4e8fbaabea25ae90f126..924fac54589533d29c12d7dad80c610618e2aa87 100644 (file)
--- a/update.php
+++ b/update.php
@@ -416,10 +416,12 @@ function update_1330()
        // 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()) ||
-                   !Config::delete('storage', 'class')) {
+               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