diff options
| author | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
| commit | ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9 (patch) | |
| tree | 0134ad4e33aa259250fb46a82e7da44b091db88e /inc/render.inc.php | |
| parent | [serversetup*] PXELinux and iPXE side-by-side (diff) | |
| parent | [inc/Dictionary] Teh evil unvalidated redirects must die! (diff) | |
| download | slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.gz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.xz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.zip | |
Merge branch 'master' into ipxeipxe
Diffstat (limited to 'inc/render.inc.php')
| -rw-r--r-- | inc/render.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php index 4b1d3643..4da0567e 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -213,7 +213,7 @@ class Render * @param string $module name of module to load template from; defaults to currently active module * @return string Rendered template */ - public static function parse($template, $params = false, $module = false) + public static function parse($template, $params = false, $module = false, $lang = false) { if ($module === false && class_exists('Page')) { $module = Page::getModule()->getIdentifier(); @@ -228,7 +228,7 @@ class Render } // Now find all language tags in this array if (preg_match_all('/{{\s*(lang_.+?)\s*}}/', $html, $out) > 0) { - $dictionary = Dictionary::getArray($module, 'template-tags'); + $dictionary = Dictionary::getArray($module, 'template-tags', $lang); $fallback = false; foreach ($out[1] as $tag) { if ($fallback === false && empty($dictionary[$tag])) { |