3 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php
index 4c20ad916d..b357431589 100644
--- a/phpBB/phpbb/cache/driver/base.php
+++ b/phpBB/phpbb/cache/driver/base.php
@@ -90,14 +90,14 @@ abstract class base implements \phpbb\cache\driver\driver_interface
 	{
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
+		$query_id = md5($query);
 
-		if (($rowset = $this->_read('sql_' . md5($query))) === false)
+		if (($result = $this->_read('sql_' . $query_id)) === false)
 		{
 			return false;
 		}
 
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = $rowset;
+		$this->sql_rowset[$query_id] = $result;
 		$this->sql_row_pointer[$query_id] = 0;
 
 		return $query_id;
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index fd5bce4515..adfe87b740 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -305,7 +305,7 @@ class file extends \phpbb\cache\driver\base
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
 
-		$query_id = sizeof($this->sql_rowset);
+		$query_id = md5($query);
 		$this->sql_rowset[$query_id] = array();
 		$this->sql_row_pointer[$query_id] = 0;
 
@@ -315,7 +315,7 @@ class file extends \phpbb\cache\driver\base
 		}
 		$db->sql_freeresult($query_result);
 
-		if ($this->_write('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl + time(), $query))
+		if ($this->_write('sql_' . $query_id, $this->sql_rowset[$query_id], $ttl + time(), $query))
 		{
 			return $query_id;
 		}
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php
index 56308be8da..add87b9bfa 100644
--- a/phpBB/phpbb/cache/driver/memory.php
+++ b/phpBB/phpbb/cache/driver/memory.php
@@ -203,7 +203,7 @@ abstract class memory extends \phpbb\cache\driver\base
 	{
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$hash = md5($query);
+		$query_id = md5($query);
 
 		// determine which tables this query belongs to
 		// Some queries use backticks, namely the get_database_size() query
@@ -232,14 +232,13 @@ abstract class memory extends \phpbb\cache\driver\base
 				$temp = array();
 			}
 
-			$temp[$hash] = true;
+			$temp[$query_id] = true;
 
 			// This must never expire
 			$this->_write('sql_' . $table_name, $temp, 0);
 		}
 
 		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
 		$this->sql_rowset[$query_id] = array();
 		$this->sql_row_pointer[$query_id] = 0;
 
@@ -249,7 +248,7 @@ abstract class memory extends \phpbb\cache\driver\base
 		}
 		$db->sql_freeresult($query_result);
 
-		$this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl);
+		$this->_write('sql_' . $query_id, $this->sql_rowset[$query_id], $ttl);
 
 		return $query_id;
 	}