From bc3659a1861597b8edd5b9b3789260b93ac3f121 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 22 Jun 2014 23:13:10 +0200
Subject: [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult

PHPBB3-12387
---
 phpBB/phpbb/db/driver/mysqli.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db/driver/mysqli.php')

diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 410d84c1df..4c6963673e 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -293,11 +293,16 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			return $cache->sql_freeresult($query_id);
 		}
 
-		if (!$this->query_result)
+		if (!$query_id)
 		{
 			return false;
 		}
 
+		if ($query_id === true)
+		{
+			return true;
+		}
+
 		return mysqli_free_result($query_id);
 	}
 
-- 
cgit v1.2.1