Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14

2017-11-22 08:42:13 +01:00 · 2017-11-22 08:42:13 +01:00 · 8d82340589
parent 38ea5ecb5f 0354e4e4a1
commit 8d82340589
1 changed files with 2 additions and 3 deletions
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@ -305,12 +305,11 @@ class Settings
     */
    public static function getTempDir()
    {
-        $tempDir = sys_get_temp_dir();
-
        if (!empty(self::$tempDir)) {
            $tempDir = self::$tempDir;
+        } else {
+            $tempDir = sys_get_temp_dir();
        }
-
        return $tempDir;
    }