Merge pull request #725 from nexusz99/develop

favicon 등록 실패 문제 해결.
This commit is contained in:
akasima 2014-05-26 14:51:05 +09:00
commit b1edfde7f4

View file

@ -335,7 +335,7 @@ class installAdminController extends install
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 @@ class installAdminController extends install
}
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;
}