1 files changed, 2 insertions, 14 deletions
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php
index 0cef9c3483..add87b9bfa 100644
--- a/phpBB/phpbb/cache/driver/memory.php
+++ b/phpBB/phpbb/cache/driver/memory.php
@@ -208,24 +208,12 @@ abstract class memory extends \phpbb\cache\driver\base
 		// determine which tables this query belongs to
 		// Some queries use backticks, namely the get_database_size() query
 		// don't check for conformity, the SQL would error and not reach here.
-		if (!preg_match_all('/(?:FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?)|(?:JOIN (`?\\w+`?(?: \\w+)?))/', $query, $regs, PREG_SET_ORDER))
+		if (!preg_match('/FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?/', $query, $regs))
 		{
 			// Bail out if the match fails.
 			return $query_result;
 		}
-
-		$tables = array();
-		foreach ($regs as $match)
-		{
-			if ($match[0][0] == 'F')
-			{
-				$tables = array_merge($tables, array_map('trim', explode(',', $match[1])));
-			}
-			else
-			{
-				$tables[] = $match[2];
-			}
-		}
+		$tables = array_map('trim', explode(',', $regs[1]));
 
 		foreach ($tables as $table_name)
 		{