summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/system/system.admin.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 2242c2f24..cf5335600 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -513,6 +513,13 @@ 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;
+ }
+ }
$key = $values['var'];
// Exclude unnecessary elements before saving.