Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-08-19 15:41:14 +09:00
commit 9782c30654
14 changed files with 42 additions and 18 deletions

View file

@ -2395,7 +2395,7 @@ class Context
*/
public static function addHtmlHeader($header)
{
self::$_instance->html_header .= "\n" . $header;
self::$_instance->html_header .= (self::$_instance->html_header ? "\n" : '') . $header;
}
public static function clearHtmlHeader()
@ -2442,7 +2442,7 @@ class Context
*/
public static function addBodyHeader($header)
{
self::$_instance->body_header .= "\n" . $header;
self::$_instance->body_header .= (self::$_instance->body_header ? "\n" : '') . $header;
}
/**
@ -2462,7 +2462,7 @@ class Context
*/
public static function addHtmlFooter($footer)
{
self::$_instance->html_footer .= (self::$_instance->Htmlfooter ? "\n" : '') . $footer;
self::$_instance->html_footer .= (self::$_instance->html_footer ? "\n" : '') . $footer;
}
/**