Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #480 from fergusean/patch-1 

Skip inquiring PHP for temp directory when it's user defined
This commit is contained in:
troosan 2017-11-22 00:24:03 +01:00 committed by GitHub
parent 670d46e543 00adf6de81
commit 0354e4e4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/PhpWord/Settings.php
View File

@ -305,12 +305,11 @@ class Settings
*/ */
public static function getTempDir() public static function getTempDir()
{ {
$tempDir = sys_get_temp_dir();
if (!empty(self::$tempDir)) { if (!empty(self::$tempDir)) {
$tempDir = self::$tempDir; $tempDir = self::$tempDir;
} else {
$tempDir = sys_get_temp_dir();
} }
return $tempDir; return $tempDir;
} }