--CRM-16617, stop further processing if DB name is invalid

diff --git a/install/index.php b/install/index.php
index 69cae03501bfdd867693506a70002f2d715c8987..a4f4d719e2ec3bebdb2ca9ae6786691e84946533 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -340,6 +340,16 @@ class InstallRequirements {
             ts("An auto_increment_increment value greater than 1 is not currently supported. Please see issue CRM-7923 for further details and potential workaround."),
           )
         );
+        if (!$this->requireValidDBName(
+          $databaseConfig['database'],
+          array(
+            ts("MySQL %1 Configuration", array(1 => $dbName)),
+            ts("Is the provided database name valid?"),
+            ts("The database name provided is not valid. Please use only 0-9, a-z, A-Z and _ as characters in the name."),
+          ))
+        ) {
+          return FALSE;
+        }
         $this->requireMySQLThreadStack($databaseConfig['server'],
           $databaseConfig['username'],
           $databaseConfig['password'],
@@ -354,14 +364,6 @@ class InstallRequirements {
         );
       }
       $onlyRequire = ($dbName == 'Drupal') ? TRUE : FALSE;
-      $this->requireValidDBName(
-        $databaseConfig['database'],
-        array(
-          ts("MySQL %1 Configuration", array(1 => $dbName)),
-          ts("Is the provided database name valid?"),
-          ts("The database name provided is not valid. Please use only 0-9, a-z, A-Z and _ as characters in the name."),
-        )
-      );
       $this->requireDatabaseOrCreatePermissions(
         $databaseConfig['server'],
         $databaseConfig['username'],
@@ -1233,8 +1235,10 @@ class InstallRequirements {
     );
     if (empty($matches)) {
       $this->error($testDetails);
-      return;
+      return FALSE;
     }
+    $this->testing($testDetails);
+    return TRUE;
   }
 
 }