From dee0f40fd2b27f441c2f4b60382c7985b9f0789d Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Thu, 12 Jun 2003 17:11:43 +0000
Subject: various fixes and alterations

git-svn-id: file:///svn/phpbb/trunk@4118 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/mysql4.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/db/mysql4.php')

diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index 6eb0a2c811..d916239088 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -35,8 +35,7 @@ class sql_db
 	var $num_queries = 0;
 	var $open_queries = array();
 
-	// Constructor
-	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
 	{
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
@@ -54,7 +53,7 @@ class sql_db
 			}
 		}
 
-		$this->sql_error('');
+		return $this->sql_error('');
 	}
 
 	// Other base methods
@@ -424,8 +423,10 @@ class sql_db
 			trigger_error($message, E_USER_ERROR);
 		}
 
-		$result['message'] = @mysql_error();
-		$result['code'] = @mysql_errno();
+		$result = array(
+			'message'	=> @mysql_error(),
+			'code'		=> @mysql_errno()
+		);
 
 		return $result;
 	}
-- 
cgit v1.2.1