fix upload ContentType guess based on the key object file extension #232
Conversation
![hm-linter[bot]](https://avatars.githubusercontent.com/in/5455?s=60&v=4){kind=small}
| @@ -187,10 +187,16 @@ public function stream_flush() | |||
| $params = $this->getOptions(true); | |||
There was a problem hiding this comment.
Expected 1 spaces after opening bracket; 0 found
Expected 1 spaces before closing bracket; 0 found
| @@ -187,10 +187,16 @@ public function stream_flush() | |||
| $params = $this->getOptions(true); | |||
| $params['Body'] = $this->body; | |||
|
|
|||
| //Added by EveryUP Srl | |||
| $objectKey = $params['Key']; | |||
There was a problem hiding this comment.
Variable "objectKey" is not in valid snake_case format
| @@ -187,10 +187,16 @@ public function stream_flush() | |||
| $params = $this->getOptions(true); | |||
| $params['Body'] = $this->body; | |||
|
|
|||
| //Added by EveryUP Srl | |||
| $objectKey = $params['Key']; | |||
| if(pathinfo($objectKey, PATHINFO_EXTENSION) == 'tmp') { | |||
There was a problem hiding this comment.
Expected 1 space(s) after IF keyword; 0 found
Space after opening control structure is required
No space before opening parenthesis is prohibited
No space after opening parenthesis is prohibited
Expected 1 spaces after opening bracket; 0 found
Expected 1 spaces before closing bracket; 0 found
Variable "objectKey" is not in valid snake_case format
Found: ==. Use strict comparisons (=== or !==).
No space before closing parenthesis is prohibited
| // Attempt to guess the ContentType of the upload based on the | ||
| // file extension of the key. Added by Joe Hoyle | ||
| if (!isset($params['ContentType']) && | ||
| ($type = Psr7\mimetype_from_filename($params['Key'])) |
There was a problem hiding this comment.
Variable "objectKey" is not in valid snake_case format
Expected 1 spaces after opening bracket; 0 found
Expected 1 spaces before closing bracket; 0 found
Variable "objectKey" is not in valid snake_case format
| if(pathinfo($objectKey, PATHINFO_EXTENSION) == 'tmp') { | ||
| $objectKey = substr($objectKey, 0, -4); | ||
| } | ||
|
|
||
| // Attempt to guess the ContentType of the upload based on the | ||
| // file extension of the key. Added by Joe Hoyle | ||
| if (!isset($params['ContentType']) && |
There was a problem hiding this comment.
No space after opening parenthesis is prohibited
Expected 1 space before "!"; 0 found
Expected 1 space after "!"; 0 found
Expected 1 spaces after opening bracket; 0 found
Expected 1 spaces before closing bracket; 0 found
| // Attempt to guess the ContentType of the upload based on the | ||
| // file extension of the key. Added by Joe Hoyle | ||
| if (!isset($params['ContentType']) && | ||
| ($type = Psr7\mimetype_from_filename($params['Key'])) | ||
| ($type = Psr7\mimetype_from_filename($objectKey)) |
There was a problem hiding this comment.
Assignments must be the first block of code on a line
Expected 1 spaces after opening bracket; 0 found
Expected 1 spaces before closing bracket; 0 found
Variable "objectKey" is not in valid snake_case format
|
@zvfvrv could you point me to where in WordPress Core the |
|
Hi @joehoyle , |
|
Hmm ok, seems like we need to investigate if this behavior is from Core or potentially a plugin, etc. |
|
@joehoyle i investigated on a wp instance with the issue, perhaps the problem is related to a plugin for image optimization WP SMUSH. |
|
@joehoyle for a start, perhaps see wp-admin/includes/file.php L610 (and wp-smushit/lib/class-wpsmush.php L248) |
wordpress append the .tmp extension to filenames when generating thumbnails. E.g.
-150x150.jpg.tmp
So when guessing the ContentType from the extension the Psr7\mimetype_from_filename() will not work properly.
To avoid this issue, we strip the .tmp extension if present.