mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-13 04:04:12 +02:00
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.
This commit is contained in:
4
phpBB/includes/cache/driver/file.php
vendored
4
phpBB/includes/cache/driver/file.php
vendored
@@ -388,10 +388,10 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
|
||||
|
||||
if ($this->_write('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl + time(), $query))
|
||||
{
|
||||
$query_result = $query_id;
|
||||
return $query_id;
|
||||
}
|
||||
|
||||
return $query_id;
|
||||
return $query_result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user