phpbb-php5mod-cvs-checkins

[Josh <jel...@us...>]

Update of /cvsroot/phpbb-php5mod/phpbb-php5/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14740/db

Modified Files:
	mysqli.php 
Log Message:
This works.

Index: mysqli.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/mysqli.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysqli.php	17 Oct 2004 17:22:54 -0000	1.3
--- mysqli.php	19 Dec 2004 01:12:48 -0000	1.4
***************
*** 50,54 ****
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? mysqli_connect($this->server, $this->user, $this->password) : mysqli_connect($this->server, $this->user, $this->password);
  
  		if( $this->db_connect_id )
--- 50,54 ----
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? mysqli_pconnect($this->server, $this->user, $this->password) : mysqli_connect($this->server, $this->user, $this->password);
  
  		if( $this->db_connect_id )
***************
*** 57,61 ****
  			{
  				$this->dbname = $database;
! 				$dbselect = mysqli_select_db($this->dbname);
  
  				if( !$dbselect )
--- 57,61 ----
  			{
  				$this->dbname = $database;
! 				$dbselect = mysqli_select_db($this->db_connect_id, $this->dbname);
  
  				if( !$dbselect )
***************
*** 112,116 ****
  			if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				$result = mysqli_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
--- 112,116 ----
  			if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				$result = mysqli_query($this->db_connect_id, "BEGIN");
  				if(!$result)
  				{
***************
*** 120,124 ****
  			}
  
! 			$this->query_result = mysqli_query($query, $this->db_connect_id);
  		}
  		else
--- 120,124 ----
  			}
  
! 			$this->query_result = mysqli_query($this->db_connect_id, $query);
  		}
  		else
***************
*** 132,137 ****
  		if( $this->query_result )
  		{
! 			unset($this->row[$this->query_result]);
! 			unset($this->rowset[$this->query_result]);
  
  			if( $transaction == END_TRANSACTION && $this->in_transaction )
--- 132,137 ----
  		if( $this->query_result )
  		{
! 			unset($this->row[ (string) $this->query_result]);
! 			unset($this->rowset[ (string) $this->query_result]);
  
  			if( $transaction == END_TRANSACTION && $this->in_transaction )
***************
*** 139,145 ****
  				$this->in_transaction = FALSE;
  
! 				if ( !mysqil_query("COMMIT", $this->db_connect_id) )
  				{
! 					mysqli_query("ROLLBACK", $this->db_connect_id);
  					return false;
  				}
--- 139,145 ----
  				$this->in_transaction = FALSE;
  
! 				if ( !mysqli_query($this->db_connect_id, "COMMIT") )
  				{
! 					mysqli_query($this->db_connect_id, "ROLLBACK");
  					return false;
  				}
***************
*** 152,156 ****
  			if( $this->in_transaction )
  			{
! 				mysqli_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
--- 152,156 ----
  			if( $this->in_transaction )
  			{
! 				mysqli_query($this->db_connect_id, "ROLLBACK");
  				$this->in_transaction = FALSE;
  			}
***************
*** 219,224 ****
  		if( $query_id )
  		{//hmm... i forgot to change MYSQL_ASSOC to MYSQLI_ASSOC, done now though :)
! 			$this->row[$query_id] = mysqli_fetch_array($query_id, MYSQLI_ASSOC);
! 			return $this->row[$query_id];
  		}
  		else
--- 219,224 ----
  		if( $query_id )
  		{//hmm... i forgot to change MYSQL_ASSOC to MYSQLI_ASSOC, done now though :)
! 			$this->row[ (string) $query_id] = mysqli_fetch_array($query_id, MYSQLI_ASSOC);
! 			return $this->row[ (string) $query_id];
  		}
  		else
***************
*** 238,247 ****
  		if( $query_id )
  		{
! 			unset($this->rowset[$query_id]);
! 			unset($this->row[$query_id]);
  
! 			while($this->rowset[$query_id] = mysqli_fetch_array($query_id, MYSQL_ASSOC))
  			{
! 				$result[] = $this->rowset[$query_id];
  			}
  
--- 238,247 ----
  		if( $query_id )
  		{
! 			unset($this->rowset[ (string) $query_id]);
! 			unset($this->row[ (string) $query_id]);
  
! 			while($this->rowset[ (string) $query_id] = mysqli_fetch_array($query_id, MYSQL_ASSOC))
  			{
! 				$result[] = $this->rowset[ (string) $query_id];
  			}
  
***************
*** 325,330 ****
  		if ( $query_id )
  		{
! 			unset($this->row[$query_id]);
! 			unset($this->rowset[$query_id]);
  
  			mysqli_free_result($query_id);
--- 325,330 ----
  		if ( $query_id )
  		{
! 			unset($this->row[ (string) $query_id]);
! 			unset($this->rowset[ (string) $query_id]);
  
  			mysqli_free_result($query_id);