Skip to content

[stable13] Fix mimetype detection for junked uploads - #10829

Merged
blizzz merged 1 commit into
stable13from
backport/10828/mimetype-detection-broken-for-junked-uploads
Sep 13, 2018
Merged

[stable13] Fix mimetype detection for junked uploads#10829
blizzz merged 1 commit into
stable13from
backport/10828/mimetype-detection-broken-for-junked-uploads

Conversation

@nickvergessen

Copy link
Copy Markdown
Member

Backport #10828

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen

Copy link
Copy Markdown
MemberAuthor

Second review please for this backport @blizzz@schiessle

$path = $this->request->getPathInfo();
$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') {
if ($this->request->getMethod() === 'MOVE') {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could have been an elsif, less nesting, but OK

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@blizzz
blizzz merged commit 9c68ce1 into stable13Sep 13, 2018
@blizzz
blizzz deleted the backport/10828/mimetype-detection-broken-for-junked-uploads branch September 13, 2018 08:51
This was referenced Oct 3, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@rullzer@blizzz