Wizard: Ensure that privileges are checked only once

Another entry in the "The provided credentials cannot be used to create the database and/or the user" story...
Icinga · Apr 15, 2015 · d02c078 · d02c078
1 parent 923bc11
commit d02c078
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
@@ -158,7 +158,7 @@ public function setupPage(Form $page, Request $request)
             }
         } elseif ($page->getName() === 'setup_database_creation') {
             $page->setDatabaseSetupPrivileges(
-                array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
+                array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
             );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
             $page->setResourceConfig($this->getPageData('setup_db_resource'));
@@ -236,7 +236,9 @@ protected function getNewPage($requestedPage, Form $originPage)
                         // It is not possible to reliably determine whether a database exists or not if a user can't
                         // log in to the database, so we just require the user to be able to create the database
                         $skip = $db->checkPrivileges(
-                            array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges),
+                            array_unique(
+                                array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
+                            ),
                             $this->databaseTables
                         );
                     } catch (PDOException $_) {