Execute database update before post update is called

[friendica.git] / src / Core / Console / PostUpdate.php

diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 2ae640d48350815bfa0fe293036a19eb84512b8a..17ed231f978f1d3a0e365bf738c84e472483ffc1 100644 (file)
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -4,17 +4,15 @@ namespace Friendica\Core\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Core\Config;
+use Friendica\Core\Update;
 
 /**
- * @brief tool to block an account from the node
- *
- * With this tool, you can block an account in such a way, that no postings
- * or comments this account writes are accepted to the node.
+ * Performs database post updates
  *
  * License: AGPLv3 or later, same as Friendica
  *
- * @author Tobias Diekershoff <mrpetovan@gmail.com>
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PostUpdate extends \Asika\SimpleConsole\Console
 {
@@ -23,7 +21,7 @@ class PostUpdate extends \Asika\SimpleConsole\Console
         protected function getHelp()
         {
                 $help = <<<HELP
-console postupdate - Does database post updates
+console postupdate - Performs database post updates
 Usage
         bin/console postupdate [-h|--help|-?] [--reset <version>]
 
@@ -36,7 +34,7 @@ HELP;
 
        protected function doExecute()
        {
-               $a = get_app();
+               $a = \Friendica\BaseObject::getApp();
 
                if ($this->getOption($this->helpOptions)) {
                        $this->out($this->getHelp());
@@ -53,10 +51,14 @@ HELP;
                        return 0;
                }
 
-               if ($a->isInstallMode()) {
+               if ($a->getMode()->isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 
+               echo L10n::t('Check for pending update actions.') . "\n";
+               Update::run(true, true, false);
+               echo L10n::t('Done.') . "\n";
+
                echo L10n::t('Execute pending post updates.') . "\n";
 
                while (!\Friendica\Database\PostUpdate::update()) {