0001767: Company Creation assigning externally created database + Fix

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index c181b98952e434744cc1018d3868a2aeefef5439..b0c33f6489c30f2fbf18368a822cfc0bd0027d41 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -174,7 +174,7 @@ function db_create_db($connection)
                $connection["dbuser"], $connection["dbpassword"]);
        if (!mysql_select_db($connection["dbname"], $db))
        {
-               $sql = "CREATE DATABASE " . $connection["dbname"] . "";
+               $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
                if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
                        return 0;
        }
@@ -186,7 +186,7 @@ function db_drop_db($connection)
 
        if ($connection["tbpref"] == "")
        {
-               $sql = "DROP DATABASE " . $connection["dbname"] . "";
+               $sql = "DROP DATABASE IF EXISTS " . $connection["dbname"] . "";
                return mysql_query($sql);
        }
        else