1 files changed, 38 insertions, 13 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 58361ff0f8..2ed08211ad 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -61,7 +61,11 @@ class mysqli extends \phpbb\db\driver\mysql_base
 		}
 
 		$this->db_connect_id = mysqli_init();
-		@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS);
+
+		if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS))
+		{
+			$this->db_connect_id = '';
+		}
 
 		if ($this->db_connect_id && $this->dbname != '')
 		{
@@ -71,10 +75,17 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
 			{
 				$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
-				$row = @mysqli_fetch_assoc($result);
-				@mysqli_free_result($result);
+				if ($result !== null)
+				{
+					$row = @mysqli_fetch_assoc($result);
 
-				$modes = array_map('trim', explode(',', $row['sql_mode']));
+					$modes = array_map('trim', explode(',', $row['sql_mode']));
+				}
+				else
+				{
+					$modes = array();
+				}
+				@mysqli_free_result($result);
 
 				// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
 				if (!in_array('TRADITIONAL', $modes))
@@ -109,15 +120,18 @@ class mysqli extends \phpbb\db\driver\mysql_base
 		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysqli_version')) === false)
 		{
 			$result = @mysqli_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @mysqli_fetch_assoc($result);
-			@mysqli_free_result($result);
+			if ($result !== null)
+			{
+				$row = @mysqli_fetch_assoc($result);
 
-			$this->sql_server_version = $row['version'];
+				$this->sql_server_version = $row['version'];
 
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mysqli_version', $this->sql_server_version);
+				if (!empty($cache) && $use_cache)
+				{
+					$cache->put('mysqli_version', $this->sql_server_version);
+				}
 			}
+			@mysqli_free_result($result);
 		}
 
 		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
@@ -165,6 +179,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -180,6 +198,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if ($cache && $cache_ttl)
 				{
@@ -224,7 +246,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			return $cache->sql_fetchrow($query_id);
 		}
 
-		if ($query_id !== false)
+		if ($query_id !== false && $query_id !== null)
 		{
 			$result = @mysqli_fetch_assoc($query_id);
 			return $result !== null ? $result : false;
@@ -434,9 +456,12 @@ class mysqli extends \phpbb\db\driver\mysql_base
 				$endtime = $endtime[0] + $endtime[1];
 
 				$result = @mysqli_query($this->db_connect_id, $query);
-				while ($void = @mysqli_fetch_assoc($result))
+				if ($result !== null)
 				{
-					// Take the time spent on parsing rows into account
+					while ($void = @mysqli_fetch_assoc($result))
+					{
+						// Take the time spent on parsing rows into account
+					}
 				}
 				@mysqli_free_result($result);