fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix #1116 파비콘 기본값 제거 복구, default option 추가

Browse source
This commit is contained in:
jhyeon1010 2014-12-30 18:06:34 +09:00
parent 527c3d1be1
commit a901ad5f16
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/display/HTMLDisplayHandler.php
View file

@ -219,8 +219,8 @@ class HTMLDisplayHandler
// set icon
$oAdminModel = getAdminModel('admin');
$favicon_url = $oAdminModel->getFaviconUrl();
$mobicon_url = $oAdminModel->getMobileIconUrl();
$favicon_url = $oAdminModel->getFaviconUrl(false);
$mobicon_url = $oAdminModel->getMobileIconUrl(false);
Context::set('favicon_url', $favicon_url);
Context::set('mobicon_url', $mobicon_url);

16
modules/admin/admin.admin.model.php
View file

@ -935,17 +935,17 @@ class adminAdminModel extends admin
return $output->data->count;
}
function getFaviconUrl()
function getFaviconUrl($default = true)
{
return $this->iconUrlCheck('favicon.ico', 'faviconSample.png');
return $this->iconUrlCheck('favicon.ico', 'faviconSample.png', $default);
}
function getMobileIconUrl()
function getMobileIconUrl($default = true)
{
return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png');
return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $default);
}
function iconUrlCheck($iconname, $default_icon_name)
function iconUrlCheck($iconname, $default_icon_name, $default)
{
$site_info = Context::get('site_module_info');
$virtual_site = '';
@ -955,7 +955,11 @@ class adminAdminModel extends admin
}
$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
if($file_exsit)
if(!$file_exsit && $default === true)
{
$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
}
elseif($file_exsit)
{
$default_url = Context::getDefaultUrl();
$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;