diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2022-10-25 15:10:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 15:10:09 +0300 |
| commit | d49c7a3bdca64d4de3a9c34fb2a3c3d764450706 (patch) | |
| tree | 6a7c13d85e9608cc77ed19055dc9e1c4a0bc4e16 | |
| parent | 05c9f0acb6e9ea86bdc4f5de51a5b601679f33e0 (diff) | |
| parent | 487759652bcb7baea88cbe8ea7a582096ee9a8c4 (diff) | |
Merge pull request #34791 from nextcloud/backport/32859/stable25
[stable25] Fix Uninitialized string offset 0 at GenerateMimetypeFileBuilder.php#39
| -rw-r--r-- | core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php index 97432473722..873744e6f94 100644 --- a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php +++ b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php @@ -30,17 +30,15 @@ namespace OC\Core\Command\Maintenance\Mimetype; class GenerateMimetypeFileBuilder { /** * Generate mime type list file - * @param $aliases + * + * @param array $aliases * @return string */ public function generateFile(array $aliases): string { // Remove comments - $keys = array_filter(array_keys($aliases), function ($k) { - return $k[0] === '_'; - }); - foreach ($keys as $key) { - unset($aliases[$key]); - } + $aliases = array_filter($aliases, static function ($key) { + return !($key === '' || $key[0] === '_'); + }, ARRAY_FILTER_USE_KEY); // Fetch all files $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes'); |