upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #42542 from nextcloud/aac-mimetype

Browse source
This commit is contained in:
John Molakvoæ 2024-02-29 12:31:58 +01:00 committed by GitHub
commit fa0e3d66ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Repair/RepairMimeTypes.php
View file

@ -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');
}
}
}

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

@ -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"],

2
version.php
View file

@ -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';