diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-01 00:35:16 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-01 00:35:16 +0100 |
| commit | b5fe1242e9d7c539efb0a706c6000ebca46aac70 (patch) | |
| tree | bfd39d8327b7cb5caa23759ef45b58565ea766fd /phpBB/includes/cache/driver/memory.php | |
| parent | 3c4a0c8577efa67da3eccbbb7a247b2861d7041b (diff) | |
| parent | 0c06ac466f61cdab1c647cec23ea66ef70b2ad7e (diff) | |
| download | forums-b5fe1242e9d7c539efb0a706c6000ebca46aac70.tar forums-b5fe1242e9d7c539efb0a706c6000ebca46aac70.tar.gz forums-b5fe1242e9d7c539efb0a706c6000ebca46aac70.tar.bz2 forums-b5fe1242e9d7c539efb0a706c6000ebca46aac70.tar.xz forums-b5fe1242e9d7c539efb0a706c6000ebca46aac70.zip | |
Merge remote-tracking branch 'p/ticket/10875' into ticket/10875
* p/ticket/10875:
[ticket/10875] Test for null cache driver and sql cache.
[ticket/10875] Revise sql cache test.
[ticket/10875] Must return query result on failure.
[ticket/10875] More documentation.
[ticket/10875] Spelling fix.
Diffstat (limited to 'phpBB/includes/cache/driver/memory.php')
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 2 |
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])); |