aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/cache
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-11 17:59:41 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-20 21:01:01 +0100
commitacc91a2bbf28656d4a6917b457ba3dd6b4e02e37 (patch)
treedda36370c55d09650d5f8a41ea69105af7b39cb8 /phpBB/phpbb/cache
parentc98efc53a80150b6f9189c9b194855c748e9b03d (diff)
downloadforums-acc91a2bbf28656d4a6917b457ba3dd6b4e02e37.tar
forums-acc91a2bbf28656d4a6917b457ba3dd6b4e02e37.tar.gz
forums-acc91a2bbf28656d4a6917b457ba3dd6b4e02e37.tar.bz2
forums-acc91a2bbf28656d4a6917b457ba3dd6b4e02e37.tar.xz
forums-acc91a2bbf28656d4a6917b457ba3dd6b4e02e37.zip
[ticket/12620] Use the container to get the environment name
PHPBB3-12620
Diffstat (limited to 'phpBB/phpbb/cache')
-rw-r--r--phpBB/phpbb/cache/driver/file.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index d3708fe9a0..114959c06c 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -27,8 +27,9 @@ class file extends \phpbb\cache\driver\base
*/
function __construct($cache_dir = null)
{
- global $phpbb_root_path;
- $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
+ global $phpbb_root_path, $phpbb_container;
+
+ $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/';
if (!is_dir($this->cache_dir))
{