Merge pull request #3227 from annando/1703-pdo

[friendica.git] / include / dbupdate.php

diff --git a/include/dbupdate.php b/include/dbupdate.php
index eb2eda48da6051e07f410f2dd99200462015ecc7..14709208fa758c634e70e706ce5d9a4634a0e8cf 100644 (file)
--- a/include/dbupdate.php
+++ b/include/dbupdate.php
@@ -1,5 +1,7 @@
 <?php
 
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 
 function dbupdate_run(&$argv, &$argc) {
@@ -8,7 +10,7 @@ function dbupdate_run(&$argv, &$argc) {
        if(is_null($a)){
                $a = new App;
        }
-  
+
        if(is_null($db)) {
                @include(".htconfig.php");
                require_once("include/dba.php");
@@ -16,14 +18,16 @@ function dbupdate_run(&$argv, &$argc) {
                        unset($db_host, $db_user, $db_pass, $db_data);
        }
 
-       load_config('config');
-       load_config('system');
+       Config::load();
+
+       // 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);
+  dbupdate_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }
-