Merge pull request #3972 from tobiasd/20171127-messages

[friendica.git] / util / maintenance.php

diff --git a/util/maintenance.php b/util/maintenance.php
index 40634e0d89de1d33dee9bd95f7d7d353525721a7..39c2acb0e1f13a304d0c966ce7ec10bafb064992 100644 (file)
--- a/util/maintenance.php
+++ b/util/maintenance.php
@@ -5,14 +5,17 @@ use Friendica\Core\Config;
 
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
+
 @include(".htconfig.php");
 
 $lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("include/dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+dba::connect($db_host, $db_user, $db_pass, $db_data, false);
 unset($db_host, $db_user, $db_pass, $db_data);
 
 Config::load();
@@ -24,7 +27,7 @@ if ($argc > 1) {
 
 Config::set('system', 'maintenance', $maint_mode);
 
-if ($maint_mode AND ($argc > 2)) {
+if ($maint_mode && ($argc > 2)) {
        $reason_arr = $argv;
        array_shift($reason_arr);
        array_shift($reason_arr);