From 8fa8642917904bdbe9dcdd0b7bfb1f9309b7ed21 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Oct 2014 15:35:12 +0200
Subject: [PATCH] Do not show the db-creation step when the db-resource step
 was skipped

refs #7163
---
 library/Icinga/Application/WebSetup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Application/WebSetup.php b/library/Icinga/Application/WebSetup.php
index 84f732789..a78a61a47 100644
--- a/library/Icinga/Application/WebSetup.php
+++ b/library/Icinga/Application/WebSetup.php
@@ -22,7 +22,6 @@ use Icinga\Web\Request;
 use Icinga\Web\Setup\DbTool;
 use Icinga\Web\Setup\SetupWizard;
 use Icinga\Web\Setup\Requirements;
-use Icinga\Application\Platform;
 
 /**
  * Icinga Web 2 Setup Wizard
@@ -136,8 +135,8 @@ class WebSetup extends Wizard implements SetupWizard
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
         } elseif ($newPage->getName() === 'setup_database_creation') {
-            if ($this->hasPageData('setup_db_resource')) {
-                $db = new DbTool($this->getPageData('setup_db_resource'));
+            if (($config = $this->getPageData('setup_db_resource')) !== null && ! $config['skip_validation']) {
+                $db = new DbTool($config);
 
                 try {
                     $db->connectToDb();