mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24488 from zzkt/patch-1

This commit is contained in:
Julius Härtl 2020-12-15 15:19:40 +01:00 committed by GitHub
parent d37034f161 794cc3d803
commit 2bedfbd4b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Repair/RepairMimeTypes.php
View File

@ -192,6 +192,15 @@ class RepairMimeTypes implements IRepairStep {
return $this->updateMimetypes($updatedMimetypes); return $this->updateMimetypes($updatedMimetypes);
} }
private function introduceOrgModeType() {
$updatedMimetypes = [
'org' => 'text/org'
];
return $this->updateMimetypes($updatedMimetypes);
}
/** /**
* Fix mime types * Fix mime types
*/ */
@ -232,5 +241,9 @@ class RepairMimeTypes implements IRepairStep {
if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) { if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
$out->info('Fixed OpenDocument template mime types'); $out->info('Fixed OpenDocument template mime types');
} }
if (version_compare($ocVersionFromBeforeUpdate, '21.0.0.7', '<') && $this->introduceOrgModeType()) {
$out->info('Fixed orgmode mime types');
}
} }
} }

1
resources/config/mimetypemapping.dist.json
View File

@ -133,6 +133,7 @@
"one": ["application/msonenote"], "one": ["application/msonenote"],
"opus": ["audio/ogg"], "opus": ["audio/ogg"],
"orf": ["image/x-dcraw"], "orf": ["image/x-dcraw"],
"org": ["text/org", "text/plain"],
"otf": ["application/font-sfnt"], "otf": ["application/font-sfnt"],
"pages": ["application/x-iwork-pages-sffpages"], "pages": ["application/x-iwork-pages-sffpages"],
"pdf": ["application/pdf"], "pdf": ["application/pdf"],