Fix exception in case the database access credentials are invalid

refs #7163
Icinga · Oct 1, 2014 · 464fefa · 464fefa
1 parent 3a11182
commit 464fefa
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/Icinga/Application/WebSetup.php b/library/Icinga/Application/WebSetup.php
@@ -130,8 +130,12 @@ protected function getNewPage($requestedPage, Form $originPage)
                         $skip = true;
                     }
                 } catch (PDOException $e) {
-                    $db->connectToHost();
-                    $skip = $db->checkPrivileges($this->databaseSetupPrivileges);
+                    try {
+                        $db->connectToHost();
+                        $skip = $db->checkPrivileges($this->databaseSetupPrivileges);
+                    } catch (PDOException $e) {
+                        // skip should already be false, nothing to do
+                    }
                 }
             } else {
                 $skip = true;