[Vtigercrm-commits] [vtiger-commits] r7592 - in /vtigercrm/trunk: adodb/drivers/adodb-mysql.inc.php install/3confirmConfig.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Wed Jun 28 00:31:07 2006
New Revision: 7592

Log:
Jeff is right, we really should never change these distributed libs, and with a good lib you should never have to.
refs #1151
refs #7569


Modified:
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/trunk/install/3confirmConfig.php

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Wed Jun 28 00:31:07 2006
@@ -351,9 +351,11 @@
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
 		
 		if (ADODB_PHPVER >= 0x4300)
-		$this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect,$this->clientFlags);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect,$this->clientFlags);
 		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
 	

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Wed Jun 28 00:31:07 2006
@@ -44,11 +44,11 @@
 //Checking for database connection parameters
 if($db_type)
 {
-	include('adodb/adodb.inc.php');
-	$conn = &NewADOConnection($db_type);
-	$db_type_status = true;
-	if($conn->Connect($db_hostname,$db_username,$db_password))
-	{
+	include('adodb/adodb.inc.php');
+	$conn = &NewADOConnection($db_type);
+	$db_type_status = true;
+	if(@$conn->Connect($db_hostname,$db_username,$db_password))
+	{
 		$db_server_status = true;
 		if($db_type=='mysql')
 		{