diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-10-15 17:09:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 17:09:29 +0200 |
| commit | 4bcf2ac63983e6ab7e2effaa1a988c0d75802b97 (patch) | |
| tree | c6ad1f2386d23344722751db70406811ff99e429 /apps | |
| parent | 87f8a09ac93d7742ca27e659aa2a31031747a87a (diff) | |
| parent | dfa17e91744bfc77c7ff26881c69e07014a6b937 (diff) | |
| download | nextcloud-server-4bcf2ac63983e6ab7e2effaa1a988c0d75802b97.tar.gz nextcloud-server-4bcf2ac63983e6ab7e2effaa1a988c0d75802b97.zip | |
Merge pull request #15999 from gary-kim/bugfix/15954/set-favicon-ico
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/lib/ImageManager.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index 3fe76899dcd..2b58fa499f4 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -260,6 +260,11 @@ class ImageManager { $supportedFormats[] = 'image/svg'; } + if ($key === 'favicon') { + $supportedFormats[] = 'image/x-icon'; + $supportedFormats[] = 'image/vnd.microsoft.icon'; + } + return $supportedFormats; } |