diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-24 21:15:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-24 21:15:13 +0100 |
| commit | 23be4d8af21319644a008670c292ca19044430cd (patch) | |
| tree | 7b69235ea54ec3555fb66ba3f32194d7c586d555 /phpBB/phpbb/cache | |
| parent | d2ecbfcc1b60928bfc962139978eadcae43627ab (diff) | |
| parent | 56c2caf6c0778c0da48fe0ac688c893777b89ee4 (diff) | |
| download | forums-23be4d8af21319644a008670c292ca19044430cd.tar forums-23be4d8af21319644a008670c292ca19044430cd.tar.gz forums-23be4d8af21319644a008670c292ca19044430cd.tar.bz2 forums-23be4d8af21319644a008670c292ca19044430cd.tar.xz forums-23be4d8af21319644a008670c292ca19044430cd.zip | |
Merge pull request #4237 from Nicofuma/ticket/14555
[ticket/14555] Uniformize cache directory usages
Diffstat (limited to 'phpBB/phpbb/cache')
| -rw-r--r-- | phpBB/phpbb/cache/driver/file.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cache/driver/memory.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index d994394249..a210d877f0 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -32,9 +32,9 @@ class file extends \phpbb\cache\driver\base */ function __construct($cache_dir = null) { - global $phpbb_root_path, $phpbb_container; + global $phpbb_container; - $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/'; + $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_container->getParameter('core.cache_dir'); $this->filesystem = new \phpbb\filesystem\filesystem(); if (!is_dir($this->cache_dir)) diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index baae22d809..cc03804705 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -25,9 +25,9 @@ abstract class memory extends \phpbb\cache\driver\base */ function __construct() { - global $phpbb_root_path, $dbname, $table_prefix; + global $phpbb_root_path, $dbname, $table_prefix, $phpbb_container; - $this->cache_dir = $phpbb_root_path . 'cache/'; + $this->cache_dir = $phpbb_container->getParameter('core.cache_dir'); $this->key_prefix = substr(md5($dbname . $table_prefix), 0, 8) . '_'; if (!isset($this->extension) || !extension_loaded($this->extension)) |