From 03433182484e11167306c392af05f591a0a351c7 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Tue, 1 Dec 2020 18:01:06 +0100 Subject: [PATCH 1/2] add text/org mimetype Signed-off-by: nik gaffney --- resources/config/mimetypemapping.dist.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index eedf45e5f9bd8..33e4ac016f9c2 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -133,6 +133,7 @@ "one": ["application/msonenote"], "opus": ["audio/ogg"], "orf": ["image/x-dcraw"], + "org": ["text/org", "text/plain"], "otf": ["application/font-sfnt"], "pages": ["application/x-iwork-pages-sffpages"], "pdf": ["application/pdf"], From 794cc3d8032f87dcb8a4c905d60fdea8e14e8587 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Thu, 3 Dec 2020 14:22:39 +0100 Subject: [PATCH 2/2] repair text/org MIME types Signed-off-by: nik gaffney --- lib/private/Repair/RepairMimeTypes.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index c5157f8161241..ecf46236483db 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -192,6 +192,15 @@ private function introduceOpenDocumentTemplates() { return $this->updateMimetypes($updatedMimetypes); } + private function introduceOrgModeType() { + $updatedMimetypes = [ + 'org' => 'text/org' + ]; + + return $this->updateMimetypes($updatedMimetypes); + } + + /** * Fix mime types */ @@ -232,5 +241,9 @@ public function run(IOutput $out) { if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) { $out->info('Fixed OpenDocument template mime types'); } + + if (version_compare($ocVersionFromBeforeUpdate, '21.0.0.7', '<') && $this->introduceOrgModeType()) { + $out->info('Fixed orgmode mime types'); + } } }