Allow automated mysql installation via config.php.

habari · Dec 7, 2011 · e8c19f8 · e8c19f8
1 parent d5207bb
commit e8c19f8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/handlers/installhandler.php b/handlers/installhandler.php
@@ -133,14 +133,13 @@ public function act_begin_install()
 		}
 
 		$db_type = $this->handler_vars['db_type'];
-		if ( $db_type == 'mysql' || $db_type == 'pgsql' ) {
+		if ( (!Config::exists('db_connection') || Config::get( 'db_connection' )->connection_string == '') && ($db_type == 'mysql' || $db_type == 'pgsql') ) {
 			$this->handler_vars['db_host'] = $_POST["{$db_type}_db_host"];
 			$this->handler_vars['db_user'] = $_POST["{$db_type}_db_user"];
 			$this->handler_vars['db_pass'] = $_POST["{$db_type}_db_pass"];
 			$this->handler_vars['db_schema'] = $_POST["{$db_type}_db_schema"];
 		}
 
-
 		// we got here, so we have all the info we need to install
 
 		// make sure the admin password is correct