diff options
author | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:34:10 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:34:10 +0100 |
commit | c9338b38b35675bd1d620e4a8ca7d44a522faace (patch) | |
tree | 0746db7f0eb5f22780c04e3ece5fb6a549045860 /phpBB/includes/cache/driver/null.php | |
parent | e6aaef6066549696453063417167e5a79c53b353 (diff) | |
parent | 46b3c3ecc43721e53c9711a196e91c300e03a1c8 (diff) | |
download | forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.gz forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.bz2 forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.xz forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.zip |
Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars
Diffstat (limited to 'phpBB/includes/cache/driver/null.php')
-rw-r--r-- | phpBB/includes/cache/driver/null.php | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |