mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Code Issues Releases Wiki Activity

[ticket/16368] Container isFresh check order

Browse Source 
PHPBB3-16368
This commit is contained in:
mrgoldy
2020-02-27 14:54:00 +01:00
parent b1f0276307
commit cdb252faaa
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/phpbb/di/container_builder.php
View File

@ -137,13 +137,14 @@ class container_builder
{ {
try try
{ {
$container_filename = $this->get_container_filename(); $build_container = true;
$config_cache = new ConfigCache($container_filename, defined('DEBUG'));
if ($this->use_cache && $config_cache->isFresh()) if ($this->use_cache)
{ {
if ($this->use_extensions) if ($this->use_extensions)
{ {
$autoload_cache = new ConfigCache($this->get_autoload_filename(), defined('DEBUG')); $autoload_cache = new ConfigCache($this->get_autoload_filename(), defined('DEBUG'));
if (!$autoload_cache->isFresh()) if (!$autoload_cache->isFresh())
{ {
// autoload cache should be refreshed // autoload cache should be refreshed
@ -153,10 +154,18 @@ class container_builder
require($this->get_autoload_filename()); require($this->get_autoload_filename());
} }
$container_filename = $this->get_container_filename();
$config_cache = new ConfigCache($container_filename, defined('DEBUG'));
if ($config_cache->isFresh())
{
require($config_cache->getPath()); require($config_cache->getPath());
$this->container = new \phpbb_cache_container(); $this->container = new \phpbb_cache_container();
$build_container = false;
} }
else }
if ($build_container)
{ {
$this->container_extensions = [ $this->container_extensions = [
new extension\core($this->get_config_path()), new extension\core($this->get_config_path()),