[Phpbb-php5mod-cvs-checkins] phpbb-php5/db mysqli.php,1.2,1.3

[Christian H. <fli...@us...>]

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

Modified Files:
	mysqli.php 
Log Message:
Ok, this should be all that is needed. Begin testing now, kplsthnx :)

Index: mysqli.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/mysqli.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mysqli.php	28 Sep 2004 03:52:51 -0000	1.2
--- mysqli.php	17 Oct 2004 17:22:54 -0000	1.3
***************
*** 86,93 ****
  			if( $this->in_transaction )
  			{
! 				mysql_query("COMMIT", $this->db_connect_id);
  			}
  
! 			return mysql_close($this->db_connect_id);
  		}
  		else
--- 86,93 ----
  			if( $this->in_transaction )
  			{
! 				mysqli_query("COMMIT", $this->db_connect_id);
  			}
  
! 			return mysqli_close($this->db_connect_id);
  		}
  		else
***************
*** 112,116 ****
  			if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				$result = mysql_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
--- 112,116 ----
  			if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				$result = mysqli_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
***************
*** 120,124 ****
  			}
  
! 			$this->query_result = mysql_query($query, $this->db_connect_id);
  		}
  		else
--- 120,124 ----
  			}
  
! 			$this->query_result = mysqli_query($query, $this->db_connect_id);
  		}
  		else
***************
*** 126,130 ****
  			if( $transaction == END_TRANSACTION && $this->in_transaction )
  			{
! 				$result = mysql_query("COMMIT", $this->db_connect_id);
  			}
  		}
--- 126,130 ----
  			if( $transaction == END_TRANSACTION && $this->in_transaction )
  			{
! 				$result = mysqli_query("COMMIT", $this->db_connect_id);
  			}
  		}
***************
*** 139,145 ****
  				$this->in_transaction = FALSE;
  
! 				if ( !mysql_query("COMMIT", $this->db_connect_id) )
  				{
! 					mysql_query("ROLLBACK", $this->db_connect_id);
  					return false;
  				}
--- 139,145 ----
  				$this->in_transaction = FALSE;
  
! 				if ( !mysqil_query("COMMIT", $this->db_connect_id) )
  				{
! 					mysqli_query("ROLLBACK", $this->db_connect_id);
  					return false;
  				}
***************
*** 152,156 ****
  			if( $this->in_transaction )
  			{
! 				mysql_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
--- 152,156 ----
  			if( $this->in_transaction )
  			{
! 				mysqli_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
***************
*** 169,178 ****
  		}
  
! 		return ( $query_id ) ? mysql_num_rows($query_id) : false;
  	}
  
  	function sql_affectedrows()
  	{
! 		return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
  	}
  
--- 169,178 ----
  		}
  
! 		return ( $query_id ) ? mysqli_num_rows($query_id) : false;
  	}
  
  	function sql_affectedrows()
  	{
! 		return ( $this->db_connect_id ) ? mysqli_affected_rows($this->db_connect_id) : false;
  	}
  
***************
*** 184,188 ****
  		}
  
! 		return ( $query_id ) ? mysql_num_fields($query_id) : false;
  	}
  
--- 184,188 ----
  		}
  
! 		return ( $query_id ) ? mysqli_num_fields($query_id) : false;
  	}
  
***************
*** 194,198 ****
  		}
  
! 		return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
  	}
  
--- 194,198 ----
  		}
  
! 		return ( $query_id ) ? mysqli_field_name($query_id, $offset) : false;
  	}