diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-08-14 02:30:49 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-08-14 02:30:49 -0700 |
| commit | dca9057559dbc627cd2f563eb0356c4ed55e2413 (patch) | |
| tree | c2a704ccf9fb0e9ed1e00084ac772219ed8a15e1 /phpBB/includes/cache | |
| parent | 7efca53b4734573e2bc1e4f306ee6f8e0b94515f (diff) | |
| parent | 4b7cdd4264b2669aaf0a0f99db2a9b00b2b58c4e (diff) | |
| download | forums-dca9057559dbc627cd2f563eb0356c4ed55e2413.tar forums-dca9057559dbc627cd2f563eb0356c4ed55e2413.tar.gz forums-dca9057559dbc627cd2f563eb0356c4ed55e2413.tar.bz2 forums-dca9057559dbc627cd2f563eb0356c4ed55e2413.tar.xz forums-dca9057559dbc627cd2f563eb0356c4ed55e2413.zip | |
Merge pull request #932 from EXreaction/ticket/10875
Ticket/10875
Diffstat (limited to 'phpBB/includes/cache')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/interface.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/null.php | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index 0d3b06f621..f64a9e3ea8 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; @@ -385,6 +385,8 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base { $query_result = $query_id; } + + return $query_id; } /** 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..92971c6cb2 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; @@ -335,6 +335,8 @@ class phpbb_cache_driver_memory extends phpbb_cache_driver_base $this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl); $query_result = $query_id; + + return $query_id; } /** 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) { } |