Skip to content

[stable18] Get correct mimetype on objectstores #19916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Mar 13, 2020
Merged

[stable18] Get correct mimetype on objectstores #19916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Get correct mimetype on objectstores 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer @backportbot
rullzer authored and backportbot[bot] committed Mar 12, 2020
commit ebba16a2196b0bebbf4e869f16dfdfaa59550785
7 changes: 1 addition & 6 deletions lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,7 @@ public function rename($source, $target) {

public function getMimeType($path) {
$path = $this->normalizePath($path);
$stat = $this->stat($path);
if (is_array($stat)) {
return $stat['mimetype'];
} else {
return false;
}
return parent::getMimeType($path);
}

public function touch($path, $mtime = null) {
Expand Down