Fix escaping and userlang encoding of site keywords and description

This commit is contained in:
Kijin Sung 2016-05-08 23:29:47 +09:00
parent faf4b1ea54
commit f84715db5b
3 changed files with 7 additions and 6 deletions

View file

@ -299,20 +299,20 @@ class ModuleHandler extends Handler
$module_config = $oModuleModel->getModuleConfig('module');
if ($module_info->meta_keywords)
{
Context::addMetaTag('keywords', escape($module_info->meta_keywords));
Context::addMetaTag('keywords', $module_info->meta_keywords);
}
elseif($module_config->meta_keywords)
{
Context::addMetaTag('keywords', escape($module_config->meta_keywords));
Context::addMetaTag('keywords', $module_config->meta_keywords);
}
if ($module_info->meta_description)
{
Context::addMetaTag('description', escape($module_info->meta_description));
Context::addMetaTag('description', $module_info->meta_description);
}
elseif($module_config->meta_description)
{
Context::addMetaTag('description', escape($module_config->meta_description));
Context::addMetaTag('description', $module_config->meta_description);
}
$viewType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';