]> git.mxchange.org Git - friendica.git/blobdiff - src/Core/Update.php
Merge pull request #10819 from MrPetovan/task/refactor-notifications
[friendica.git] / src / Core / Update.php
index d2a3c810e3a8a71e1c17162e51aa160f7c62cced..fa3c6b62d0fa15121791e04d85686ccffd292176 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -72,8 +72,8 @@ class Update
                        }
                }
 
-               // The postupdate has to completed version 1281 for the new post views to take over
-               $postupdate = DI::config()->get("system", "post_update_version");
+               // The postupdate has to completed version 1288 for the new post views to take over
+               $postupdate = DI::config()->get("system", "post_update_version", NEW_TABLE_STRUCTURE_VERSION);
                if ($postupdate < NEW_TABLE_STRUCTURE_VERSION) {
                        $error = DI::l10n()->t('Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.', $postupdate);
                        if (DI::mode()->getExecutor() == Mode::INDEX) {
@@ -166,7 +166,7 @@ class Update
 
                                        // update the structure in one call
                                        Logger::notice('Execute structure update');
-                                       $retval = DBStructure::update($basePath, $verbose, true);
+                                       $retval = DBStructure::performUpdate(false, $verbose);
                                        if (!empty($retval)) {
                                                if ($sendMail) {
                                                        self::updateFailed(
@@ -213,6 +213,8 @@ class Update
                                        if ($sendMail) {
                                                self::updateSuccessful($stored, $current);
                                        }
+                               } else {
+                                       Logger::warning('Update lock could not be acquired');
                                }
                        }
                }