Commit f59eaeb0 authored by Dries's avatar Dries

- Patch #531476 by JohnAlbin: corrected some favicon mime-type behavior.

parent 2dd0b6ff
......@@ -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'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment