diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-02-29 12:31:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 12:31:58 +0100 |
| commit | fa0e3d66ba2af3b51121fe19f5afd50309a36475 (patch) | |
| tree | b4a3ef378f49ed42a1cea82657aa63eb4fed31c6 | |
| parent | 8df55ef5aa3ed2233132203e6316bb9fd855fef3 (diff) | |
| parent | 4af1c5cb3349f442521a128b62ed7db95eb13749 (diff) | |
| download | nextcloud-server-fa0e3d66ba2af3b51121fe19f5afd50309a36475.tar.gz nextcloud-server-fa0e3d66ba2af3b51121fe19f5afd50309a36475.zip | |
Merge pull request #42542 from nextcloud/aac-mimetype
| -rw-r--r-- | lib/private/Repair/RepairMimeTypes.php | 12 | ||||
| -rw-r--r-- | resources/config/mimetypemapping.dist.json | 1 | ||||
| -rw-r--r-- | version.php | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 4d15dda45dd..b204c27a9a2 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -246,6 +246,14 @@ class RepairMimeTypes implements IRepairStep { return $this->updateMimetypes($updatedMimetypes); } + private function introduceAacAudioType() { + $updatedMimetypes = [ + 'aac' => 'audio/aac', + ]; + + return $this->updateMimetypes($updatedMimetypes); + } + /** * Fix mime types */ @@ -310,5 +318,9 @@ class RepairMimeTypes implements IRepairStep { if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) { $out->info('Fixed eml and msg mime type'); } + + if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.6', '<') && $this->introduceAacAudioType()) { + $out->info('Fixed aac mime type'); + } } } diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index c98e33756b6..05bcbec7fbb 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -9,6 +9,7 @@ "3gp": ["video/3gpp"], "7z": ["application/x-7z-compressed"], + "aac": ["audio/aac"], "accdb": ["application/msaccess"], "adoc": ["text/asciidoc", "text/plain"], "ai": ["application/illustrator"], diff --git a/version.php b/version.php index a1855bfad5a..48c9498ea66 100644 --- a/version.php +++ b/version.php @@ -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, 5]; +$OC_Version = [29, 0, 0, 6]; // The human-readable string $OC_VersionString = '29.0.0 dev'; |