moved check_db($via_worker) to Update::check($via_worker)

diff --git a/bin/worker.php b/bin/worker.php
index d5cd1f6b4b7cc56492e770a3f53d51214d11acfa..9ae2f68b3e6ae8a0fbe994b6fe47bf834aee2bb2 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -7,6 +7,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Core\Update;
 
 // Get options
 $shortopts = 'sn';
@@ -30,7 +31,7 @@ require_once "boot.php";
 $a = new App(dirname(__DIR__));
 
 // Check the database structure and possibly fixes it
-check_db(true);
+Update::check(true);
 
 // Quit when in maintenance
 if (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED)) {

diff --git a/boot.php b/boot.php
index efff5baffa818145277d0bfe7d8ef0963b1c8f1d..0ca2fcdf8b00a0ed40daccf3807189a7aae86fe7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -413,33 +413,6 @@ function defaults() {
        return $return;
 }
 
-/**
- * @brief Function to check if request was an AJAX (xmlhttprequest) request.
- *
- * @param boolean $via_worker boolean Is the check run via the worker?
- */
-function check_db($via_worker)
-{
-       $build = Config::get('system', 'build');
-
-       if (empty($build)) {
-               Config::set('system', 'build', DB_UPDATE_VERSION - 1);
-               $build = DB_UPDATE_VERSION - 1;
-       }
-
-       // We don't support upgrading from very old versions anymore
-       if ($build < NEW_UPDATE_ROUTINE_VERSION) {
-               die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
-       }
-
-       if ($build < DB_UPDATE_VERSION) {
-               // When we cannot execute the database update via the worker, we will do it directly
-               if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
-                       Update::run();
-               }
-       }
-}
-
 /**
  * @brief Automatic database updates
  * @param object $a App

diff --git a/src/Core/Update.php b/src/Core/Update.php
index d4bcd04bba192d03ddd450801dc1bb44c875b5ef..e749c7233a996542236483b9acdf3e9e2a0f6059 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -9,6 +9,33 @@ class Update
        const SUCCESS = 0;
        const FAILED  = 1;
 
+       /**
+        * @brief Function to check if the Database structure needs an update.
+        *
+        * @param boolean $via_worker boolean Is the check run via the worker?
+        */
+       public static function check($via_worker)
+       {
+               $build = Config::get('system', 'build');
+
+               if (empty($build)) {
+                       Config::set('system', 'build', DB_UPDATE_VERSION - 1);
+                       $build = DB_UPDATE_VERSION - 1;
+               }
+
+               // We don't support upgrading from very old versions anymore
+               if ($build < NEW_UPDATE_ROUTINE_VERSION) {
+                       die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
+               }
+
+               if ($build < DB_UPDATE_VERSION) {
+                       // When we cannot execute the database update via the worker, we will do it directly
+                       if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
+                               self::run();
+                       }
+               }
+       }
+
        /**
         * Automatic database updates
         */