diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-08-14 08:09:48 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-08-14 08:09:48 +0000 |
commit | f59eaeb0a3e8a1d32d5e349a7cfaafdc94bc3066 (patch) | |
tree | 21a48e0f31a0c40d314c5616286891dfc27924da /modules | |
parent | 2dd0b6ff5dc85c03d91c0df6caf55a1200eee744 (diff) | |
download | brdo-f59eaeb0a3e8a1d32d5e349a7cfaafdc94bc3066.tar.gz brdo-f59eaeb0a3e8a1d32d5e349a7cfaafdc94bc3066.tar.bz2 |
- Patch #531476 by JohnAlbin: corrected some favicon mime-type behavior.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/system/system.admin.inc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 88f8d410a..54f7cca16 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -559,11 +559,7 @@ function system_theme_settings(&$form_state, $key = '') { function system_theme_settings_submit($form, &$form_state) { $values = $form_state['values']; if (empty($values['default_favicon']) && !empty($values['favicon_path'])) { - $mimetype = file_get_mimetype($values['favicon_path']); - // Use the default MIME type for favicons if no other was found. - if ($mimetype != 'application/octet-stream') { - $values['favicon_mimetype'] = $mimetype; - } + $values['favicon_mimetype'] = file_get_mimetype($values['favicon_path']); } $key = $values['var']; |