diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 250a5e48d..4b38c80ab 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -335,14 +335,10 @@ class installAdminController extends install list($width, $height, $type_no, $attrs) = @getimagesize($target_file); if($iconname == 'favicon.ico') { - if(!preg_match('/^.*\.icon$/i',$type)) { + if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) { Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file')); return; } - if($width && $height && ($width != '16' || $height != '16')) { - Context::set('msg', Context::getLang('msg_invalid_format').' (size : 16x16)'); - return; - } } else if($iconname == 'mobicon.png') {