summaryrefslogtreecommitdiff
path: root/vendor/swiftmailer/preferences.php
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-09-09 07:21:10 +0200
committerFrédéric Guillot <fred@kanboard.net>2014-09-09 07:21:10 +0200
commit54a77cd58589e8c73543360af1469151fb1a550c (patch)
tree86ab929a2981a8147656c2e6119c7f1e0e130c3e /vendor/swiftmailer/preferences.php
parent0d4b6525dd86f837eb9e931e48a92fc6a0033e11 (diff)
Update dependencies
Diffstat (limited to 'vendor/swiftmailer/preferences.php')
-rw-r--r--vendor/swiftmailer/preferences.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/vendor/swiftmailer/preferences.php b/vendor/swiftmailer/preferences.php
index 42239437..e5195014 100644
--- a/vendor/swiftmailer/preferences.php
+++ b/vendor/swiftmailer/preferences.php
@@ -14,18 +14,8 @@ $preferences->setCharset('utf-8');
// Without these lines the default caching mechanism is "array" but this uses a lot of memory.
// If possible, use a disk cache to enable attaching large attachments etc.
// You can override the default temporary directory by setting the TMPDIR environment variable.
-
-// The @ operator in front of is_writable calls is to avoid PHP warnings
-// when using open_basedir
-$tmp = getenv('TMPDIR');
-if ($tmp && @is_writable($tmp)) {
- $preferences
- ->setTempDir($tmp)
- ->setCacheType('disk');
-} elseif (function_exists('sys_get_temp_dir') && @is_writable(sys_get_temp_dir())) {
- $preferences
- ->setTempDir(sys_get_temp_dir())
- ->setCacheType('disk');
+if (@is_writable($tmpDir = sys_get_temp_dir())) {
+ $preferences->setTempDir($tmpDir)->setCacheType('disk');
}
// this should only be done when Swiftmailer won't use the native QP content encoder