aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/mysql4.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/db/mysql4.php')
-rw-r--r--phpBB/includes/db/mysql4.php11
1 files changed, 6 insertions, 5 deletions
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;
}