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
This commit is contained in:
Andreas Fischer 2015-06-16 20:04:52 +02:00
commit 9296c75738

View file

@ -499,8 +499,7 @@ class container_builder
*/ */
protected function get_container_filename() protected function get_container_filename()
{ {
$filename = str_replace(array('/', '.'), array('slash', 'dot'), $this->phpbb_root_path); return $this->get_cache_dir() . 'container_' . md5($this->phpbb_root_path) . '.' . $this->php_ext;
return $this->get_cache_dir() . 'container_' . $filename . '.' . $this->php_ext;
} }
/** /**