diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-22 23:21:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-22 23:21:19 +0100 |
| commit | 4b808e2671e18dc32d44efda4abf9d8ed81aace9 (patch) | |
| tree | 291bd303c4ac3be3c49e537cf4f090e33619a3da /phpBB/includes/cache/driver | |
| parent | 9365d71b6b9cfd7e46e7b1872f56e5f4529ec363 (diff) | |
| parent | e50f69187f21e29a12512880e0c69f2876e84aa1 (diff) | |
| download | forums-4b808e2671e18dc32d44efda4abf9d8ed81aace9.tar forums-4b808e2671e18dc32d44efda4abf9d8ed81aace9.tar.gz forums-4b808e2671e18dc32d44efda4abf9d8ed81aace9.tar.bz2 forums-4b808e2671e18dc32d44efda4abf9d8ed81aace9.tar.xz forums-4b808e2671e18dc32d44efda4abf9d8ed81aace9.zip | |
Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
[ticket/11037] Eliminate global $db usage in cache drivers.
Diffstat (limited to 'phpBB/includes/cache/driver')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/interface.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/null.php | 4 |
4 files changed, 8 insertions, 11 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); diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/includes/cache/driver/interface.php index d403bbcd71..53f684d1c8 100644 --- a/phpBB/includes/cache/driver/interface.php +++ b/phpBB/includes/cache/driver/interface.php @@ -85,6 +85,7 @@ interface phpbb_cache_driver_interface * result to persistent storage. In other words, there is no need * to call save() afterwards. * + * @param phpbb_db_driver $db Database connection * @param string $query SQL query, should be used for generating storage key * @param mixed $query_result The result from dbal::sql_query, to be passed to * dbal::sql_fetchrow to get all rows and store them @@ -95,7 +96,7 @@ interface phpbb_cache_driver_interface * representing the query should be returned. Otherwise * the original $query_result should be returned. */ - public function sql_save($query, $query_result, $ttl); + public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl); /** * Check if result for a given SQL query exists in cache. diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php index c39f9f7850..f77a1df316 100644 --- a/phpBB/includes/cache/driver/memory.php +++ b/phpBB/includes/cache/driver/memory.php @@ -283,12 +283,10 @@ abstract class phpbb_cache_driver_memory 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); $hash = md5($query); diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/includes/cache/driver/null.php index 687604d14f..2fadc27ba3 100644 --- a/phpBB/includes/cache/driver/null.php +++ b/phpBB/includes/cache/driver/null.php @@ -105,9 +105,9 @@ class phpbb_cache_driver_null 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) { return $query_result; } |