8 files changed, 103 insertions, 140 deletions
diff --git a/phpBB/db/db2.php b/phpBB/db/db2.php
index 704ae53f12..da471841c1 100644
--- a/phpBB/db/db2.php
+++ b/phpBB/db/db2.php
@@ -32,7 +32,8 @@ class sql_db
 	var $query_resultset;
 	var $query_numrows;
 	var $next_id;
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $row_index;
 	var $num_queries = 0;
 
diff --git a/phpBB/db/msaccess.php b/phpBB/db/msaccess.php
index 49e9a50e5a..a2ae1a32a5 100644
--- a/phpBB/db/msaccess.php
+++ b/phpBB/db/msaccess.php
@@ -28,16 +28,16 @@ class sql_db
 {
 
 	var $db_connect_id;
-	var $result_ids;
+	var $result_ids = array();
 	var $result;
 
 	var $next_id;
 
-	var $num_rows;
-	var $current_row;
-	var $field_names;
-	var $field_types;
-	var $result_rowset;
+	var $num_rows = array();
+	var $current_row = array();
+	var $field_names = array();
+	var $field_types = array();
+	var $result_rowset = array();
 
 	var $num_queries = 0;
 
diff --git a/phpBB/db/mssql-odbc.php b/phpBB/db/mssql-odbc.php
index ab9f887f55..f71f95bafc 100644
--- a/phpBB/db/mssql-odbc.php
+++ b/phpBB/db/mssql-odbc.php
@@ -32,11 +32,11 @@ class sql_db
 
 	var $next_id;
 
-	var $num_rows;
-	var $current_row;
-	var $field_names;
-	var $field_types;
-	var $result_rowset;
+	var $num_rows = array();
+	var $current_row = array();
+	var $field_names = array();
+	var $field_types = array();
+	var $result_rowset = array();
 
 	var $num_queries = 0;
 
diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php
index 52ae9c8a84..4754d8c422 100644
--- a/phpBB/db/mssql.php
+++ b/phpBB/db/mssql.php
@@ -33,7 +33,8 @@ class sql_db
 	var $next_id;
 	var $in_transaction = 0;
 
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $limit_offset;
 	var $query_limit_success;
 
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php
index 9922bc0615..ded3ae27c6 100644
--- a/phpBB/db/mysql.php
+++ b/phpBB/db/mysql.php
@@ -29,7 +29,8 @@ class sql_db
 
 	var $db_connect_id;
 	var $query_result;
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $num_queries = 0;
 
 	//
diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php
index bb812f9b9a..b40497b40e 100644
--- a/phpBB/db/mysql4.php
+++ b/phpBB/db/mysql4.php
@@ -4,7 +4,7 @@
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
+ *   email                : supportphpbb.com
  *
  *   $Id$
  *
@@ -29,7 +29,8 @@ class sql_db
 
 	var $db_connect_id;
 	var $query_result;
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $num_queries = 0;
 	var $in_transaction = 0;
 
@@ -38,33 +39,28 @@ class sql_db
 	//
 	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
 	{
-
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->password = $sqlpassword;
 		$this->server = $sqlserver;
 		$this->dbname = $database;
 
-		if($this->persistency)
-		{
-			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password);
-		}
-		else
-		{
-			$this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password);
-		}
-		if($this->db_connect_id)
+		$this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password);
+
+		if( $this->db_connect_id )
 		{
-			if($database != "")
+			if( $database != "" )
 			{
 				$this->dbname = $database;
-				$dbselect = @mysql_select_db($this->dbname);
-				if(!$dbselect)
+				$dbselect = mysql_select_db($this->dbname);
+
+				if( !$dbselect )
 				{
-					@mysql_close($this->db_connect_id);
+					mysql_close($this->db_connect_id);
 					$this->db_connect_id = $dbselect;
 				}
 			}
+
 			return $this->db_connect_id;
 		}
 		else
@@ -78,17 +74,17 @@ class sql_db
 	//
 	function sql_close()
 	{
-		if($this->db_connect_id)
+		if( $this->db_connect_id )
 		{
 			//
 			// Commit any remaining transactions
 			//
 			if( $this->in_transaction )
 			{
-				@mysql_query("COMMIT", $this->db_connect_id);
+				mysql_query("COMMIT", $this->db_connect_id);
 			}
-			$result = @mysql_close($this->db_connect_id);
-			return $result;
+
+			return mysql_close($this->db_connect_id);
 		}
 		else
 		{
@@ -108,10 +104,10 @@ class sql_db
 
 		if( $query != "" )
 		{
-//			$this->num_queries++;
+			$this->num_queries++;
 			if( $transaction == BEGIN_TRANSACTION )
 			{
-				$result = @mysql_query("BEGIN", $this->db_connect_id);
+				$result = mysql_query("BEGIN", $this->db_connect_id);
 				if(!$result)
 				{
 					return false;
@@ -119,7 +115,7 @@ class sql_db
 				$this->in_transaction = TRUE;
 			}
 
-			$this->query_result = @mysql_query($query, $this->db_connect_id);
+			$this->query_result = mysql_query($query, $this->db_connect_id);
 		}
 
 		if( $this->query_result )
@@ -129,16 +125,16 @@ class sql_db
 
 			if( $transaction == END_TRANSACTION )
 			{
-				$result = @mysql_query("COMMIT", $this->db_connect_id);
+				$result = mysql_query("COMMIT", $this->db_connect_id);
 			}
 			
 			return $this->query_result;
 		}
 		else
 		{
-			if($this->in_transaction)
+			if( $this->in_transaction )
 			{
-				@mysql_query("ROLLBACK", $this->db_connect_id);
+				mysql_query("ROLLBACK", $this->db_connect_id);
 				$this->in_transaction = FALSE;
 			}
 			return false;
@@ -150,89 +146,59 @@ class sql_db
 	//
 	function sql_numrows($query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_num_rows($query_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_num_rows($query_id) : false;
 	}
+
 	function sql_affectedrows()
 	{
-		if($this->db_connect_id)
-		{
-			$result = @mysql_affected_rows($this->db_connect_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+		return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
 	}
+
 	function sql_numfields($query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_num_fields($query_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_num_fields($query_id) : false;
 	}
+
 	function sql_fieldname($offset, $query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_field_name($query_id, $offset);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
 	}
+
 	function sql_fieldtype($offset, $query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_field_type($query_id, $offset);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_field_type($query_id, $offset) : false;
 	}
+
 	function sql_fetchrow($query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if( $query_id )
 		{
-			$this->row[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC);
+			$this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC);
 			return $this->row[$query_id];
 		}
 		else
@@ -240,20 +206,24 @@ class sql_db
 			return false;
 		}
 	}
+
 	function sql_fetchrowset($query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if( $query_id )
 		{
 			unset($this->rowset[$query_id]);
 			unset($this->row[$query_id]);
-			while($this->rowset[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC))
+
+			while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC))
 			{
 				$result[] = $this->rowset[$query_id];
 			}
+
 			return $result;
 		}
 		else
@@ -261,39 +231,42 @@ class sql_db
 			return false;
 		}
 	}
+
 	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
 	{
-		if(!$query_id)
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if( $query_id )
 		{
-			if($rownum > -1)
+			if( $rownum > -1 )
 			{
-				$result = @mysql_result($query_id, $rownum, $field);
+				$result = mysql_result($query_id, $rownum, $field);
 			}
 			else
 			{
-				if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
+				if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) )
 				{
-					if($this->sql_fetchrow())
+					if( $this->sql_fetchrow() )
 					{
 						$result = $this->row[$query_id][$field];
 					}
 				}
 				else
 				{
-					if($this->rowset[$query_id])
+					if( $this->rowset[$query_id] )
 					{
 						$result = $this->rowset[$query_id][$field];
 					}
-					else if($this->row[$query_id])
+					else if( $this->row[$query_id] )
 					{
 						$result = $this->row[$query_id][$field];
 					}
 				}
 			}
+
 			return $result;
 		}
 		else
@@ -301,51 +274,36 @@ class sql_db
 			return false;
 		}
 	}
-	function sql_rowseek($rownum, $query_id = 0){
-		if(!$query_id)
+
+	function sql_rowseek($rownum, $query_id = 0)
+	{
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_data_seek($query_id, $rownum);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false;
 	}
-	function sql_nextid(){
-		if($this->db_connect_id)
-		{
-			$result = @mysql_insert_id($this->db_connect_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+	function sql_nextid()
+	{
+		return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false;
 	}
-	function sql_freeresult($query_id = 0){
-		if(!$query_id)
+
+	function sql_freeresult($query_id = 0)
+	{
+		if( !$query_id )
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @mysql_free_result($query_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		return ( $query_id ) ? mysql_free_result($query_id) : false;
 	}
-	function sql_error($query_id = 0)
+
+	function sql_error()
 	{
-		$result["message"] = @mysql_error($this->db_connect_id);
-		$result["code"] = @mysql_errno($this->db_connect_id);
+		$result['message'] = mysql_error($this->db_connect_id);
+		$result['code'] = mysql_errno($this->db_connect_id);
 
 		return $result;
 	}
diff --git a/phpBB/db/oracle.php b/phpBB/db/oracle.php
index 560343bfe4..3319bca4ec 100644
--- a/phpBB/db/oracle.php
+++ b/phpBB/db/oracle.php
@@ -30,7 +30,8 @@ class sql_db
 	var $db_connect_id;
 	var $query_result;
 	var $in_transaction = 0;
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $num_queries = 0;
 	var $last_query_text = "";
 
diff --git a/phpBB/db/postgres7.php b/phpBB/db/postgres7.php
index f0f1821d1f..a9ae5926e5 100644
--- a/phpBB/db/postgres7.php
+++ b/phpBB/db/postgres7.php
@@ -30,7 +30,8 @@ class sql_db
 	var $db_connect_id;
 	var $query_result;
 	var $in_transaction = 0;
-	var $row;
+	var $row = array();
+	var $rowset = array();
 	var $rownum = array();
 	var $num_queries = 0;