diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-30 20:44:51 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-30 20:44:51 -0500 |
| commit | 3a702084e4249830a87dc0914127e00c1bb1b1dd (patch) | |
| tree | 71f225038696ff3f0275bb4c32ccda62c928cff7 /phpBB/includes/cache/driver/memory.php | |
| parent | 5d783464538807ef68f34d83d963af9e93a7268b (diff) | |
| parent | e4d2ad6b2788d9c3c030382f5ad2f02b6b7f75db (diff) | |
| download | forums-3a702084e4249830a87dc0914127e00c1bb1b1dd.tar forums-3a702084e4249830a87dc0914127e00c1bb1b1dd.tar.gz forums-3a702084e4249830a87dc0914127e00c1bb1b1dd.tar.bz2 forums-3a702084e4249830a87dc0914127e00c1bb1b1dd.tar.xz forums-3a702084e4249830a87dc0914127e00c1bb1b1dd.zip | |
Merge PR #974 branch 'bantu/ticket/10875' into develop
* bantu/ticket/10875:
[ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
[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.
[ticket/10875] Add docblocks for phpbb_cache_driver_interface
[ticket/10875] Add comment about cache's sql_load() method.
[ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
[ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
[ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
[ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
Diffstat (limited to 'phpBB/includes/cache/driver/memory.php')
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php index f6c42c0ea6..c39f9f7850 100644 --- a/phpBB/includes/cache/driver/memory.php +++ b/phpBB/includes/cache/driver/memory.php @@ -299,7 +299,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])); @@ -339,8 +339,6 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base $this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl); - $query_result = $query_id; - return $query_id; } |