Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events

[friendica.git] / include / dbupdate.php

diff --git a/include/dbupdate.php b/include/dbupdate.php
index 3fcd6b7f05d6091ab5cc64bcd38c8a6a1b6795af..799ca262c837b4229b80b3b464bd3bf5f6ac1624 100644 (file)
--- a/include/dbupdate.php
+++ b/include/dbupdate.php
@@ -1,28 +1,13 @@
 <?php
 
-require_once("boot.php");
+use Friendica\Core\Config;
 
 function dbupdate_run(&$argv, &$argc) {
-       global $a, $db;
+       global $a;
 
-       if(is_null($a)){
-               $a = new App;
-       }
-
-       if(is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-                       unset($db_host, $db_user, $db_pass, $db_data);
-       }
-
-       load_config('config');
-       load_config('system');
+       // We are deleting the latest dbupdate entry.
+       // This is done to avoid endless loops because the update was interupted.
+       Config::delete('database', 'dbupdate_'.DB_UPDATE_VERSION);
 
        update_db($a);
 }
-
-if (array_search(__file__,get_included_files())===0){
-  dbupdate_run($argv,$argc);
-  killme();
-}