[Cs-content-commits] SF.net SVN: cs-content:[396] trunk/1.0/db_types/cs_phpDB__mysql.class.php

[<cra...@us...>]

Revision: 396
          http://cs-content.svn.sourceforge.net/cs-content/?rev=396&view=rev
Author:   crazedsanity
Date:     2009-06-19 14:20:16 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
A few fixes for the mysql database layer.

/db_types/cs_phpDB__mysql.class.php:
	* close():
		-- resent transStatus, inTrans, and transactionTree.
	* connect():
		-- only check if paramsAreSet, so the connection can be reset (i.e. a
		new connection can be created).

Modified Paths:
--------------
    trunk/1.0/db_types/cs_phpDB__mysql.class.php

Modified: trunk/1.0/db_types/cs_phpDB__mysql.class.php
===================================================================
--- trunk/1.0/db_types/cs_phpDB__mysql.class.php	2009-06-17 15:19:02 UTC (rev 395)
+++ trunk/1.0/db_types/cs_phpDB__mysql.class.php	2009-06-19 14:20:16 UTC (rev 396)
@@ -129,7 +129,10 @@
 		$this->isConnected = FALSE;
 		$retval = null;
 		if($this->connectionID != -1) {
-			$retval = mysqlclose($this->connectionID);
+			$retval = mysql_close($this->connectionID);
+			$this->transStatus = null;
+			$this->inTrans=null;
+			$this->transactionTree=null;
 		}
 		else {
 			throw new exception(__METHOD__ .": Failed to close connection: connection is invalid");
@@ -152,7 +155,7 @@
 			$this->set_db_info($dbParams);
 		}
 		
-		if($this->paramsAreSet === TRUE && $this->isConnected === FALSE) {
+		if($this->paramsAreSet === TRUE) {
 			
 			//start output buffer for displaying error.
 			ob_start();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.