diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index f463f56b1..cc61705da 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -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); diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index d5290ee3e..e1e613ed5 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -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;