diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-16 20:04:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-16 20:06:28 +0200 |
| commit | 9296c75738a2598e7073f097c43fefebb964b8b7 (patch) | |
| tree | 5eb5680958bb61579f8093637b60b26dc3bb14da | |
| parent | beb830df712e74107d3f50f094ac143a1d812efc (diff) | |
| parent | 0bab5db1dd8e3c3e855b258471b0b24a1ace268d (diff) | |
| download | forums-9296c75738a2598e7073f097c43fefebb964b8b7.tar forums-9296c75738a2598e7073f097c43fefebb964b8b7.tar.gz forums-9296c75738a2598e7073f097c43fefebb964b8b7.tar.bz2 forums-9296c75738a2598e7073f097c43fefebb964b8b7.tar.xz forums-9296c75738a2598e7073f097c43fefebb964b8b7.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13903] Replacing regexp path naming for container by md5.
Conflicts:
phpBB/phpbb/di/container_builder.php
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 4a31339b9a..c9adbe7d63 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -499,8 +499,7 @@ class container_builder */ protected function get_container_filename() { - $filename = str_replace(array('/', '.'), array('slash', 'dot'), $this->phpbb_root_path); - return $this->get_cache_dir() . 'container_' . $filename . '.' . $this->php_ext; + return $this->get_cache_dir() . 'container_' . md5($this->phpbb_root_path) . '.' . $this->php_ext; } /** |