From 9f549e8249acbd82b68e961a6e0a31de47d9ca32 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:50:41 -0500
Subject: [ticket/10205] Fix remaining db drivers.

PHPBB3-10205
---
 phpBB/includes/db/mysql.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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

diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index ae36fe6425..7314e92087 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -439,10 +439,20 @@ class dbal_mysql extends dbal
 	{
 		if (!$this->db_connect_id)
 		{
-			return array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno()
-			);
+			if (function_exists('mysql_error'))
+			{
+				return array(
+					'message'	=> @mysql_error(),
+					'code'		=> @mysql_errno()
+				);
+			}
+			else
+			{
+				return array(
+					'message'	=> $this->connect_error,
+					'code'		=> '',
+				);
+			}
 		}
 
 		return array(
-- 
cgit v1.2.1