Fix favicon for new domain and error message for nonexistent domain

This commit is contained in:
Kijin Sung 2017-03-13 15:35:48 +09:00
parent e7c5d884e8
commit 01bb364e10
2 changed files with 8 additions and 5 deletions

View file

@ -948,7 +948,7 @@ class adminAdminController extends admin
$domain_info = getModel('module')->getSiteInfo($domain_srl);
if ($domain_info->domain_srl != $domain_srl)
{
$domain_info = null;
return new Object(-1, 'msg_domain_not_found');
}
}

View file

@ -702,10 +702,13 @@ class adminAdminView extends admin
Context::set('domain_timezone', $domain_timezone);
// Get favicon and images.
$oAdminAdminModel = getAdminModel('admin');
Context::set('favicon_url', $oAdminAdminModel->getFaviconUrl($domain_info->domain_srl));
Context::set('mobicon_url', $oAdminAdminModel->getMobileIconUrl($domain_info->domain_srl));
Context::set('default_image_url', $oAdminAdminModel->getSiteDefaultImageUrl($domain_info->domain_srl));
if ($domain_info)
{
$oAdminAdminModel = getAdminModel('admin');
Context::set('favicon_url', $oAdminAdminModel->getFaviconUrl($domain_info->domain_srl));
Context::set('mobicon_url', $oAdminAdminModel->getMobileIconUrl($domain_info->domain_srl));
Context::set('default_image_url', $oAdminAdminModel->getSiteDefaultImageUrl($domain_info->domain_srl));
}
$this->setTemplateFile('config_domains_edit');
}