Skip to content

Commit 5fcebbc

Browse files
committed
Merge branch 'master' of github.com:reactfilemanager/php-server into fixWP
# Conflicts: # src/Plugins/ProgressiveJPEG.php
2 parents 5eaf2d4 + 1459854 commit 5fcebbc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Plugins/ProgressiveJPEG.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function init()
3737
private static function isInterlaced($filename)
3838
{
3939
try {
40-
$handle = fopen($filename, "r");
40+
$handle = fopen($filename, 'r');
4141
$contents = fread($handle, 32);
4242
fclose($handle);
4343

@@ -54,7 +54,7 @@ public function convert()
5454
{
5555
try {
5656
$filepath = fm_absolutePath(fm_request_path(), fm_request('filepath'));
57-
$im = imagecreatefromjpeg($filepath);
57+
$im = imagecreatefromjpeg($filepath);
5858
imageinterlace($im, true);
5959
imagejpeg($im, $filepath, 100);
6060

@@ -63,4 +63,4 @@ public function convert()
6363
return fm_jsonResponse($e->getMessage(), 500);
6464
}
6565
}
66-
}
66+
}

src/helpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ function fm_getThumb($path)
482482
return fm_genThumb($file);
483483
});
484484

485-
$thumb = tempnam("/tmp", $file->getFilename());
485+
$thumb = tempnam(config('cache'), $file->getFilename());
486486

487487
$handle = fopen($thumb, "w");
488488
fwrite($handle, $thumbImage);

0 commit comments

Comments
 (0)