cleaner

sources/db_mysql.php

@@ -41,7 +41,7 @@ class db {
 	// Variables in this class
 	//
 	var $connection;
-	var $queries;
+	var $queries = array();
 
 	//
 	// Make a connection to the MySQL server
@@ -61,11 +61,6 @@ function connect($config) {
 		if ( !(@mysql_select_db($config['dbname'], $this->connection)) )
 			$functions->usebb_die('General', 'Unable to connect to the database!', __FILE__, __LINE__);
 
-		//
-		// Initialize used queries array
-		//
-		$this->queries = array();
-
 	}
 
 	//
@@ -75,8 +70,7 @@ function query($query) {
 
 		$add_query = preg_replace("/\s+/", ' ', $query);
 		$this->queries[] = $add_query;
-		$result = @mysql_query($query, $this->connection);
-		return $result;
+		return @mysql_query($query, $this->connection);
 
 	}
 
@@ -85,8 +79,7 @@ function query($query) {
 	//
 	function fetch_result($result) {
 
-		$out = mysql_fetch_array($result, MYSQL_ASSOC);
-		return $out;
+		return mysql_fetch_array($result, MYSQL_ASSOC);
 
 	}
 
@@ -95,8 +88,7 @@ function fetch_result($result) {
 	//
 	function num_rows($result) {
 
-		$out = mysql_num_rows($result);
-		return $out;
+		return mysql_num_rows($result);
 
 	}
 
@@ -105,8 +97,7 @@ function num_rows($result) {
 	//
 	function last_id() {
 
-		$id = mysql_insert_id($this->connection);
-		return $id;
+		return mysql_insert_id($this->connection);
 
 	}
 

sources/db_mysqli.php

@@ -41,7 +41,7 @@ class db {
 	// Variables in this class
 	//
 	var $connection;
-	var $queries;
+	var $queries = array();
 
 	//
 	// Make a connection to the MySQL server
@@ -61,11 +61,6 @@ function connect($config) {
 		if ( !(@mysqli_select_db($config['dbname'], $this->connection)) )
 			$functions->usebb_die('General', 'Unable to connect to the database!', __FILE__, __LINE__);
 
-		//
-		// Initialize used queries array
-		//
-		$this->queries = array();
-
 	}
 
 	//
@@ -75,8 +70,7 @@ function query($query) {
 
 		$add_query = preg_replace("/\s+/", ' ', $query);
 		$this->queries[] = $add_query;
-		$result = @mysqli_query($query, $this->connection);
-		return $result;
+		return @mysqli_query($query, $this->connection);
 
 	}
 
@@ -85,8 +79,7 @@ function query($query) {
 	//
 	function fetch_result($result) {
 
-		$out = mysqli_fetch_array($result, MYSQL_ASSOC);
-		return $out;
+		return mysqli_fetch_array($result, MYSQL_ASSOC);
 
 	}
 
@@ -95,8 +88,7 @@ function fetch_result($result) {
 	//
 	function num_rows($result) {
 
-		$out = mysqli_num_rows($result);
-		return $out;
+		return mysqli_num_rows($result);
 
 	}
 
@@ -105,8 +97,7 @@ function num_rows($result) {
 	//
 	function last_id() {
 
-		$id = mysqli_insert_id($this->connection);
-		return $id;
+		return mysqli_insert_id($this->connection);
 
 	}