Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-07-31 15:36:40 +09:00
commit 0f469baae8
40 changed files with 384 additions and 157 deletions

View file

@ -32,6 +32,23 @@ class boardController extends board
$obj->module_srl = $this->module_srl;
$obj->commentStatus = $obj->comment_status;
// Remove disallowed Unicode symbols.
if ($this->module_info->filter_specialchars !== 'N')
{
if (isset($obj->title))
{
$obj->title = utf8_clean($obj->title);
}
if (isset($obj->content))
{
$obj->content = utf8_clean($obj->content);
}
if (isset($obj->tags))
{
$obj->tags = utf8_clean($obj->tags);
}
}
// Return error if content is empty.
if (is_empty_html_content($obj->content))
{
@ -368,6 +385,15 @@ class boardController extends board
$obj = Context::getRequestVars();
$obj->module_srl = $this->module_srl;
// Remove disallowed Unicode symbols.
if ($this->module_info->filter_specialchars !== 'N')
{
if (isset($obj->content))
{
$obj->content = utf8_clean($obj->content);
}
}
// Return error if content is empty.
if (is_empty_html_content($obj->content))
{