Remove extraneous dba::connect calls

2018-06-25 20:56:07 -04:00
parent decfc553f7
commit 3985a4bc43
11 changed files with 18 additions and 60 deletions
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -64,12 +64,8 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}

-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->mode == \Friendica\App::MODE_INSTALL) {
+			throw new \RuntimeException('Database isn\'t ready or populated yet');
 		}

 		Core\Config::load();