aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/cache/driver/memory.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-12-22 23:21:19 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-12-22 23:21:19 +0100
commit4b808e2671e18dc32d44efda4abf9d8ed81aace9 (patch)
tree291bd303c4ac3be3c49e537cf4f090e33619a3da /phpBB/includes/cache/driver/memory.php
parent9365d71b6b9cfd7e46e7b1872f56e5f4529ec363 (diff)
parente50f69187f21e29a12512880e0c69f2876e84aa1 (diff)
downloadforums-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/memory.php')
-rw-r--r--phpBB/includes/cache/driver/memory.php6
1 files changed, 2 insertions, 4 deletions
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);