aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-30 12:11:52 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-30 12:11:52 -0500
commit1ebc6eb68bedc4d6708cb6f23959d129030cf31e (patch)
tree841dd4a4f5b4213f085fd430a0cfb0200fa80097 /phpBB/includes
parent3eb15ab59e202f6d995f40da7cbee0056e73f5d1 (diff)
downloadforums-1ebc6eb68bedc4d6708cb6f23959d129030cf31e.tar
forums-1ebc6eb68bedc4d6708cb6f23959d129030cf31e.tar.gz
forums-1ebc6eb68bedc4d6708cb6f23959d129030cf31e.tar.bz2
forums-1ebc6eb68bedc4d6708cb6f23959d129030cf31e.tar.xz
forums-1ebc6eb68bedc4d6708cb6f23959d129030cf31e.zip
[ticket/10875] Must return query result on failure.
PHPBB3-10875
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/cache/driver/memory.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
index bc08494c0c..e4da5767cf 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -294,7 +294,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
if (!preg_match('/FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?/', $query, $regs))
{
// Bail out if the match fails.
- return;
+ return $query_result;
}
$tables = array_map('trim', explode(',', $regs[1]));