diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-18 22:00:10 +0100 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-18 22:00:10 +0100 |
commit | b7deef46ac2f49b310d05d94067607e8f19c0817 (patch) | |
tree | ea051e66e5ce6955c72f1b8c2b44bdb0ca29c972 /phpBB/phpbb/cache/driver | |
parent | f6fd819764016afe39dcc3c486b0fe73c9478ad5 (diff) | |
parent | 6e4ab6509b38f03daa2fb2af30df61423b126bdf (diff) | |
download | forums-b7deef46ac2f49b310d05d94067607e8f19c0817.tar forums-b7deef46ac2f49b310d05d94067607e8f19c0817.tar.gz forums-b7deef46ac2f49b310d05d94067607e8f19c0817.tar.bz2 forums-b7deef46ac2f49b310d05d94067607e8f19c0817.tar.xz forums-b7deef46ac2f49b310d05d94067607e8f19c0817.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/13681] Invalidate and reset opcache where necessary
Diffstat (limited to 'phpBB/phpbb/cache/driver')
-rw-r--r-- | phpBB/phpbb/cache/driver/base.php | 5 | ||||
-rw-r--r-- | phpBB/phpbb/cache/driver/file.php | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php index 85762c4d95..f4b3dc278d 100644 --- a/phpBB/phpbb/cache/driver/base.php +++ b/phpBB/phpbb/cache/driver/base.php @@ -63,6 +63,11 @@ abstract class base implements \phpbb\cache\driver\driver_interface unset($this->sql_rowset); unset($this->sql_row_pointer); + if (function_exists('opcache_reset')) + { + @opcache_reset(); + } + $this->vars = array(); $this->sql_rowset = array(); $this->sql_row_pointer = array(); diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index bb055d3acf..d994394249 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -574,6 +574,11 @@ class file extends \phpbb\cache\driver\base fclose($handle); + if (function_exists('opcache_invalidate')) + { + @opcache_invalidate($this->cache_file); + } + try { $this->filesystem->phpbb_chmod($file, CHMOD_READ | CHMOD_WRITE); |