aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/di
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-04-04 21:32:46 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-04-04 21:32:46 +0200
commit7bf8006b67f6a2f56317fb6c4ab25ca623757ba5 (patch)
treed10074213f67d5cd610248a57b6635761a595429 /phpBB/phpbb/di
parenta319d58d036e605673c1d37e24d73fbf5dab3879 (diff)
downloadforums-7bf8006b67f6a2f56317fb6c4ab25ca623757ba5.tar
forums-7bf8006b67f6a2f56317fb6c4ab25ca623757ba5.tar.gz
forums-7bf8006b67f6a2f56317fb6c4ab25ca623757ba5.tar.bz2
forums-7bf8006b67f6a2f56317fb6c4ab25ca623757ba5.tar.xz
forums-7bf8006b67f6a2f56317fb6c4ab25ca623757ba5.zip
[ticket/14198] Use the build option to calculate the container cache filename
PHPBB3-14198
Diffstat (limited to 'phpBB/phpbb/di')
-rw-r--r--phpBB/phpbb/di/container_builder.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 7bfe1bbb87..b9284d04be 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -556,7 +556,13 @@ class container_builder
*/
protected function get_container_filename()
{
- return $this->get_cache_dir() . 'container_' . md5($this->phpbb_root_path) . '.' . $this->php_ext;
+ $container_params = [
+ 'phpbb_root_path' => $this->phpbb_root_path,
+ 'use_extensions' => $this->use_extensions,
+ 'config_path' => $this->config_path,
+ ];
+
+ return $this->get_cache_dir() . 'container_' . md5(implode(',', $container_params)) . '.' . $this->php_ext;
}
/**
@@ -566,7 +572,13 @@ class container_builder
*/
protected function get_autoload_filename()
{
- return $this->get_cache_dir() . 'autoload_' . md5($this->phpbb_root_path) . '.' . $this->php_ext;
+ $container_params = [
+ 'phpbb_root_path' => $this->phpbb_root_path,
+ 'use_extensions' => $this->use_extensions,
+ 'config_path' => $this->config_path,
+ ];
+
+ return $this->get_cache_dir() . 'autoload_' . md5(implode(',', $container_params)) . '.' . $this->php_ext;
}
/**