diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-07-30 18:44:40 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-07-30 18:44:40 -0500 |
| commit | 01bc818d465ab168288e260745a045ff2794648d (patch) | |
| tree | 299973235aa927758e62711ff686e391ac242933 /phpBB/includes/cache | |
| parent | edcac438df164764c84ca9fb7a7f751bf76d5c34 (diff) | |
| download | forums-01bc818d465ab168288e260745a045ff2794648d.tar forums-01bc818d465ab168288e260745a045ff2794648d.tar.gz forums-01bc818d465ab168288e260745a045ff2794648d.tar.bz2 forums-01bc818d465ab168288e260745a045ff2794648d.tar.xz forums-01bc818d465ab168288e260745a045ff2794648d.zip | |
[ticket/10875] Fix SQL Caching
The sql_save function cannot take arguments by reference since it is called
by call_user_func_array()
Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists
Replace $cache->cache_dir with $cache->get_driver()->cache_dir
PHPBB3-10875
Diffstat (limited to 'phpBB/includes/cache')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/interface.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/null.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index 0d3b06f621..da942b921c 100644 --- a/phpBB/includes/cache/driver/file.php +++ b/phpBB/includes/cache/driver/file.php @@ -364,7 +364,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base /** * Save sql query */ - function sql_save($query, &$query_result, $ttl) + function sql_save($query, $query_result, $ttl) { global $db; diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/includes/cache/driver/interface.php index 313a2d4b31..847ba97262 100644 --- a/phpBB/includes/cache/driver/interface.php +++ b/phpBB/includes/cache/driver/interface.php @@ -75,7 +75,7 @@ interface phpbb_cache_driver_interface /** * Save sql query */ - public function sql_save($query, &$query_result, $ttl); + public function sql_save($query, $query_result, $ttl); /** * Ceck if a given sql query exist in cache diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php index e25c9229a1..aabad2bb6c 100644 --- a/phpBB/includes/cache/driver/memory.php +++ b/phpBB/includes/cache/driver/memory.php @@ -280,7 +280,7 @@ class phpbb_cache_driver_memory extends phpbb_cache_driver_base /** * Save sql query */ - function sql_save($query, &$query_result, $ttl) + function sql_save($query, $query_result, $ttl) { global $db; diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/includes/cache/driver/null.php index c143803d0e..df2c6c026f 100644 --- a/phpBB/includes/cache/driver/null.php +++ b/phpBB/includes/cache/driver/null.php @@ -107,7 +107,7 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base /** * Save sql query */ - function sql_save($query, &$query_result, $ttl) + function sql_save($query, $query_result, $ttl) { } |