Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Kijin Sung 2023-11-25 22:31:44 +09:00
commit 1bf03c101e

View file

@ -783,7 +783,7 @@ class TemplateParser_v1
{
if (preg_match('/^\$[\\\\\w\[\]\'":>-]+$/i', $str))
{
$str = preg_match('/^\$lang->/', $str) ? $str : "$str ?? ''";
$str = preg_match('/^\$(__Context->)?lang->/', $str) ? $str : "$str ?? ''";
}
switch($escape_option)