X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysql.inc;h=d3857cabb945a5517dd9d779e82a99a4c60ce659;hb=f8219593c85e1020093b93972386fd477675504f;hp=aa30740fb869ae5c19228c94398f04e8d889b63a;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index aa30740f..d3857cab 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -25,15 +25,19 @@ function set_global_connection($company=-1)
 	$_SESSION["wa_current_user"]->cur_con = $company;
 
 	$connection = $db_connections[$company];
+	
+	$server = $connection["host"];
+	if (!empty($connection["port"]))
+		$server .= ":".$connection["port"];
 
-	$db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
-		mysql_select_db($connection["dbname"], $db);
+	$db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]);
+	mysql_select_db($connection["dbname"], $db);
 	///// From MySql release 5.6.6 the sql_mode is no longer empty as it was prior to
 	///// this release. Just for safety we make it empty for all 5.6 release and higher.
 	///// This non empty sql_mode values can interphere with FA, so all is set empty during
 	///// our sessions.
 	///// We are, however, investigating the existing code to be compatible in the future.
-		db_query("SET sql_mode = '".SQL_MODE."'");
+	db_query("SET sql_mode = '".SQL_MODE."'");
 	/////
 	$SysPrefs->refresh();
 	return $db;
@@ -197,8 +201,10 @@ function db_set_collation($db, $fa_collation)
 */
 function db_create_db($connection)
 {
-	$db = mysql_connect($connection["host"] ,
-		$connection["dbuser"], $connection["dbpassword"]);
+	$server = $connection["host"];
+	if (!empty($connection["port"]))
+		$server .= ":".$connection["port"];
+	$db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]);
 
 	if (!mysql_select_db($connection["dbname"], $db))
 	{