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

troosan · troosan · commit 8d8234058908 · 2017-11-22T08:42:13.000+01:00
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
@@ -305,12 +305,11 @@ public static function setTempDir($tempDir)
      */
     public static function getTempDir()
     {
-        $tempDir = sys_get_temp_dir();
-
         if (!empty(self::$tempDir)) {
             $tempDir = self::$tempDir;
+        } else {
+            $tempDir = sys_get_temp_dir();
         }
-
         return $tempDir;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -305,12 +305,11 @@ public static function setTempDir($tempDir)`
`305`	`305`	`*/`
`306`	`306`	`public static function getTempDir()`
`307`	`307`	`{`
`308`		`- $tempDir = sys_get_temp_dir();`
`309`		`-`
`310`	`308`	`if (!empty(self::$tempDir)) {`
`311`	`309`	`$tempDir = self::$tempDir;`
	`310`	`+ } else {`
	`311`	`+ $tempDir = sys_get_temp_dir();`
`312`	`312`	`}`
`313`		`-`
`314`	`313`	`return $tempDir;`
`315`	`314`	`}`
`316`	`315`