Merge pull request #725 from nexusz99/develop

favicon 등록 실패 문제 해결.
xpressengine · May 26, 2014 · b1edfde · b1edfde
2 parents e96e377 + cd4a3a7
commit b1edfde
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
@@ -335,7 +335,7 @@ private function saveIconTmp($icon, $iconname)
 		list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
 		if($iconname == 'favicon.ico')
 		{
-			if(!preg_match('/^.*\.ico$/i',$type)) {
+			if(!preg_match('/^.*\.icon$/i',$type)) {
 				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
@@ -346,7 +346,7 @@ private function saveIconTmp($icon, $iconname)
 		}
 		else if($iconname == 'mobicon.png')
 		{
-			if(!preg_match('/^.*\.png$/i',$type)) {
+			if(!preg_match('/^.*(png).*$/',$type)) {
 				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
 				return;
 			}