--CRM-16617, moved function to DAO

Conflicts:

	CRM/Core/DAO.php

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 189b6c8d59a626440de68f4d23b33d6c1fdba50d..f2f4ba5f237cea59a5b34ed643405ccd42441c1e 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2559,4 +2559,31 @@ SELECT contact_id
     return $clauses;
   }
 
+  /**
+   * function to check valid db name
+   *
+   * @param $database
+   * @param $testDetails
+   *
+   * @return bool
+   */
+  public static function requireValidDBName($database, $testDetails, $object = NULL) {
+    $matches = array();
+    preg_match(
+      "/^[0-9]*[a-zA-Z_]+[a-zA-Z0-9_]*$/",
+      $database,
+      $matches
+    );
+    if (empty($matches)) {
+      if ($object) {
+        $object->error($testDetails);
+      }
+      return FALSE;
+    }
+    if ($object) {
+      $object->testing($testDetails);
+    }
+    return TRUE;
+  }
+
 }

diff --git a/install/index.php b/install/index.php
index 292879c52cfb6950ce9879a1ba0aaf9b9c3caddb..cd4091cba25ac8c2d7567606ae354bc82f94f6f6 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -394,8 +394,9 @@ 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(
+        if (!CRM_Core_DAO::requireValidDBName(
           $databaseConfig['database'],
+          $this,
           array(
             ts("MySQL %1 Configuration", array(1 => $dbName)),
             ts("Is the provided database name valid?"),
@@ -1283,27 +1284,6 @@ class InstallRequirements {
     return count($this->warnings);
   }
 
-  /**
-   * function to check valid db name
-   *
-   * @param $database
-   * @param $testDetails
-   */
-  public function requireValidDBName($database, $testDetails) {
-    $matches = array();
-    preg_match(
-      "/^[0-9]*[a-zA-Z_]+[a-zA-Z0-9_]*$/",
-      $database,
-      $matches
-    );
-    if (empty($matches)) {
-      $this->error($testDetails);
-      return FALSE;
-    }
-    $this->testing($testDetails);
-    return TRUE;
-  }
-
 }
 
 /**