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: change mime type for msg file #41867

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix: change mime type for msg file #41867

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
4 changes: 2 additions & 2 deletions lib/private/Repair/RepairMimeTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private function introduceEnhancedMetafileFormatType() {
private function introduceEmlAndMsgFormatType() {
$updatedMimetypes = [
'eml' => 'message/rfc822',
'msg' => 'application/x-ole-storage',
'msg' => 'application/vnd.ms-outlook',
];

return $this->updateMimetypes($updatedMimetypes);
Expand Down Expand Up @@ -307,7 +307,7 @@ public function run(IOutput $out) {
$out->info('Fixed Enhanced Metafile Format mime types');
}

if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.1', '<') && $this->introduceEmlAndMsgFormatType()) {
if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
$out->info('Fixed eml and msg mime type');
}
}
Expand Down
2 changes: 1 addition & 1 deletion resources/config/mimetypemapping.dist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"mpeg": ["video/mpeg"],
"mpg": ["video/mpeg"],
"mpo": ["image/jpeg"],
"msg": ["application/x-ole-storage", "text/plain"],
"msg": ["application/vnd.ms-outlook"],
"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, 1];
$OC_Version = [29, 0, 0, 2];

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