1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 07:16:36 +02:00

Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
This commit is contained in:
Tristan Darricau 2016-02-18 22:00:10 +01:00
commit b7deef46ac
3 changed files with 20 additions and 0 deletions

View File

@ -873,6 +873,11 @@ class queue
fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
fclose($fp);
if (function_exists('opcache_invalidate'))
{
@opcache_invalidate($this->cache_file);
}
try
{
$this->filesystem->phpbb_chmod($this->cache_file, CHMOD_READ | CHMOD_WRITE);
@ -922,6 +927,11 @@ class queue
fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>");
fclose($fp);
if (function_exists('opcache_invalidate'))
{
@opcache_invalidate($this->cache_file);
}
try
{
$this->filesystem->phpbb_chmod($this->cache_file, CHMOD_READ | CHMOD_WRITE);

View File

@ -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();

View File

@ -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);