aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-06-26 10:27:22 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-06-26 10:27:22 +0200
commit963a03b120ba8262a6a9125c383e7b5a374d4157 (patch)
tree462004b25ff66782d899242e360744c805455ba3
parent597e7163c0a67ab225d77e7ba58912e361d85b20 (diff)
parent1a0e40489feeff2478cde98be31fee4f4578e9f7 (diff)
downloadforums-963a03b120ba8262a6a9125c383e7b5a374d4157.tar
forums-963a03b120ba8262a6a9125c383e7b5a374d4157.tar.gz
forums-963a03b120ba8262a6a9125c383e7b5a374d4157.tar.bz2
forums-963a03b120ba8262a6a9125c383e7b5a374d4157.tar.xz
forums-963a03b120ba8262a6a9125c383e7b5a374d4157.zip
Merge pull request #4367 from rxu/ticket/14690
[ticket/14690] Create email queue cache file in the current env cache folder
-rw-r--r--phpBB/includes/functions_messenger.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 10d4910494..fa9ed84a34 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -687,10 +687,10 @@ class queue
*/
function queue()
{
- global $phpEx, $phpbb_root_path, $phpbb_filesystem;
+ global $phpEx, $phpbb_root_path, $phpbb_filesystem, $phpbb_container;
$this->data = array();
- $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx";
+ $this->cache_file = $phpbb_container->getParameter('core.cache_dir') . "queue.$phpEx";
$this->filesystem = $phpbb_filesystem;
}