Skip to content
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

fix: add mimetype for eml and msg #41803

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix: add mimetype for eml and msg #41803

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions lib/private/Repair/RepairMimeTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,15 @@ private function introduceEnhancedMetafileFormatType() {
return $this->updateMimetypes($updatedMimetypes);
}

private function introduceEmlAndMsgFormatType() {
$updatedMimetypes = [
'eml' => 'message/rfc822',
'msg' => 'application/x-ole-storage',
Copy link
Member

Choose a reason for hiding this comment

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

yet I'm wondering if it should be application/vnd.ms-outlook

];

return $this->updateMimetypes($updatedMimetypes);
}

/**
* Fix mime types
*/
Expand Down Expand Up @@ -297,5 +306,9 @@ public function run(IOutput $out) {
if (version_compare($ocVersionFromBeforeUpdate, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) {
$out->info('Fixed Enhanced Metafile Format mime types');
}

if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.1', '<') && $this->introduceEmlAndMsgFormatType()) {
$out->info('Fixed eml and msg mime type');
}
}
}
2 changes: 2 additions & 0 deletions resources/config/mimetypemapping.dist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"dotx": ["application/vnd.openxmlformats-officedocument.wordprocessingml.template"],
"dv": ["video/dv"],
"emf": ["image/emf"],
"eml": ["message/rfc822", "text/plain"],
"eot": ["application/vnd.ms-fontobject"],
"eps": ["application/postscript"],
"epub": ["application/epub+zip"],
Expand Down Expand Up @@ -122,6 +123,7 @@
"mpeg": ["video/mpeg"],
"mpg": ["video/mpeg"],
"mpo": ["image/jpeg"],
"msg": ["application/x-ole-storage", "text/plain"],
"msi": ["application/x-msi"],
"mt2s": ["video/MP2T"],
"mts": ["video/MP2T"],
Expand Down
2 changes: 1 addition & 1 deletion version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
// when updating major/minor version number.

$OC_Version = [29, 0, 0, 0];
$OC_Version = [29, 0, 0, 1];

// The human-readable string
$OC_VersionString = '29.0.0 dev';
Expand Down
Loading