aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-14 20:22:36 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-14 20:22:36 +0200
commit0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee (patch)
treea5184c998a6306ddde0a945bec422d47d1bc3568 /phpBB/includes
parent0c109c9d377e10757c208c1d87aa6d4bf8d9af44 (diff)
downloadforums-0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee.tar
forums-0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee.tar.gz
forums-0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee.tar.bz2
forums-0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee.tar.xz
forums-0c4b53e2f1ea14dcdc82d2e2abac1ba96e4669ee.zip
[ticket/11224] Fix returned data
PHPBB3-11224
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acm/acm_memory.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php
index d975e4b348..83b0e61182 100644
--- a/phpBB/includes/acm/acm_memory.php
+++ b/phpBB/includes/acm/acm_memory.php
@@ -295,7 +295,7 @@ class acm_memory
if (!preg_match_all('/(?:FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?)|(?:JOIN (`?\\w+`?(?: \\w+)?))/', $query, $regs, PREG_SET_ORDER))
{
// Bail out if the match fails.
- return $query_result;
+ return;
}
$tables = array();
@@ -448,4 +448,4 @@ class acm_memory
}
}
-?> \ No newline at end of file
+?>