diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:33:05 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:33:05 +0100 |
| commit | 46b3c3ecc43721e53c9711a196e91c300e03a1c8 (patch) | |
| tree | c936edfeb531760c3667a41c40799dd6bb61bb80 /phpBB/includes/cache/driver/file.php | |
| parent | e444f5bf2a8b30aefb3700ce358d2a6be66c8cb5 (diff) | |
| parent | 21b9ac6c880cbee7c8bda263871b24414671672a (diff) | |
| download | forums-46b3c3ecc43721e53c9711a196e91c300e03a1c8.tar forums-46b3c3ecc43721e53c9711a196e91c300e03a1c8.tar.gz forums-46b3c3ecc43721e53c9711a196e91c300e03a1c8.tar.bz2 forums-46b3c3ecc43721e53c9711a196e91c300e03a1c8.tar.xz forums-46b3c3ecc43721e53c9711a196e91c300e03a1c8.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop
Diffstat (limited to 'phpBB/includes/cache/driver/file.php')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index 691abe0438..85decbe3e8 100644 --- a/phpBB/includes/cache/driver/file.php +++ b/phpBB/includes/cache/driver/file.php @@ -367,12 +367,10 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base } /** - * Save sql query + * {@inheritDoc} */ - function sql_save($query, $query_result, $ttl) + function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) { - global $db; - // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); |