diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-04-06 21:00:36 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-04-06 21:00:36 +0200 |
| commit | c53eae7abca55929aeb700cfbe3e760418dce7f1 (patch) | |
| tree | d10074213f67d5cd610248a57b6635761a595429 | |
| parent | cdc7f1722dc81ce57fc5af20a4c6b0b10666a0d0 (diff) | |
| parent | 7bf8006b67f6a2f56317fb6c4ab25ca623757ba5 (diff) | |
| download | forums-c53eae7abca55929aeb700cfbe3e760418dce7f1.tar forums-c53eae7abca55929aeb700cfbe3e760418dce7f1.tar.gz forums-c53eae7abca55929aeb700cfbe3e760418dce7f1.tar.bz2 forums-c53eae7abca55929aeb700cfbe3e760418dce7f1.tar.xz forums-c53eae7abca55929aeb700cfbe3e760418dce7f1.zip | |
Merge pull request #4280 from Nicofuma/ticket/14198
[ticket/14198] Use the build option to calculate the container cache filename
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 16 |
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; } /** |