aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/cache
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-11-12 11:10:25 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-11-12 11:16:39 +0100
commit0fd3bb170b95bc8c99329e47990e38c038629075 (patch)
tree4222da246667aba91d51a4c2e335c317a766f18a /phpBB/includes/cache
parentbf641a7f31f87eb7b88437214315872bff36ae84 (diff)
downloadforums-0fd3bb170b95bc8c99329e47990e38c038629075.tar
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.gz
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.bz2
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.xz
forums-0fd3bb170b95bc8c99329e47990e38c038629075.zip
[ticket/11015] Fixup some things from the big merge
PHPBB3-11015
Diffstat (limited to 'phpBB/includes/cache')
-rw-r--r--phpBB/includes/cache/driver/file.php2
-rw-r--r--phpBB/includes/cache/driver/interface.php2
-rw-r--r--phpBB/includes/cache/driver/memory.php2
-rw-r--r--phpBB/includes/cache/driver/null.php2
-rw-r--r--phpBB/includes/cache/service.php40
5 files changed, 4 insertions, 44 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index 23063a1a28..b20c0064ea 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -368,7 +368,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 623ae44144..98ac02b161 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -284,7 +284,7 @@ abstract 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)
{
}
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 7858e27a5c..e63ec6e33a 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -58,11 +58,6 @@ class phpbb_cache_service
return call_user_func_array(array($this->driver, $method), $arguments);
}
- public function __get($var)
- {
- return $this->driver->$var;
- }
-
/**
* Obtain list of naughty words and build preg style replacement arrays for use by the
* calling script
@@ -413,39 +408,4 @@ class phpbb_cache_service
return $hook_files;
}
-
- public function sql_load()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
-
- public function sql_save($query, &$query_result, $ttl)
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), array($query, &$query_result, $ttl));
- }
-
- public function sql_exists()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
-
- public function sql_fetchrow()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
-
- public function sql_fetchfield()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
-
- public function sql_rowseek()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
-
- public function sql_freeresult()
- {
- return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
- }
}