fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2203 'this' in lang directive will refer to current module

Browse source
This commit is contained in:
Kijin Sung 2023-10-31 21:59:33 +09:00
parent 3233619eac
commit e72336c90c
7 changed files with 69 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
common/framework/Template.php
View file

@ -18,6 +18,7 @@ class Template
*/
public $config;
public $source_type;
public $source_name;
public $parent;
public $vars;
@ -184,7 +185,11 @@ class Template
$this->config->version = 2;
$this->config->autoescape = true;
}
$this->source_type = preg_match('!^((?:m\.)?[a-z]+)/!', $this->relative_dirname, $match) ? $match[1] : null;
if (preg_match('!^(addons|common|(?:m\.)?layouts|modules|plugins|themes|widgets|widgetstyles)/(\w+)!', $this->relative_dirname, $match))
{
$this->source_type = $match[1];
$this->source_name = $match[2];
}
$this->path = $this->absolute_dirname;
$this->web_path = \RX_BASEURL . $this->relative_dirname;
$this->setCachePath();
@ -928,4 +933,26 @@ class Template
}
return count($args) ? in_array((string)$validator_id, $args, true) : true;
}
/**
* Lang shortcut for v2.
*
* @param ...$args
* @return string
*/
protected function _v2_lang(...$args): string
{
if (!isset($GLOBALS['lang']) || !$GLOBALS['lang'] instanceof Lang)
{
$GLOBALS['lang'] = Lang::getInstance(\Context::getLangType());
$GLOBALS['lang']->loadDirectory(\RX_BASEDIR . 'common/lang', 'common');
}
if (isset($args[0]) && !strncmp($args[0], 'this.', 5))
{
$args[0] = $this->source_name . '.' . substr($args[0], 5);
}
return $GLOBALS['lang']->get(...$args);
}
}