From 3c191b8373553a9c1c79e78d531ab16312c1d3d9 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Wed, 4 Jun 2014 23:13:38 +0900
Subject: [PATCH] =?UTF-8?q?#772=20favicon=20mime=20type=20=EC=9D=84=20x-ic?=
 =?UTF-8?q?on=20=EC=A7=80=EC=9B=90=20=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20favicon=20=ED=81=AC=EA=B8=B0=20=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=20=EC=95=88=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/install/install.admin.controller.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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')
 		{