mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 19:42:35 +02:00
Code Issues Projects Releases Wiki Activity

MDL-64757 core_output: fixed incorrect string language mustache blocks

Browse Source 
Mustache blocks nested in parent templates where incorrectly rendering the default language Moodle.
This fix correctly passes the current language preference to all nested mustache templates such as blocks
which are children of another template.
This commit is contained in:
Tom Dickman 2019-07-17 12:46:22 +10:00
parent f7e108438f
commit a8561c38b8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/output/mustache_template_source_loader.php
View File

@ -158,7 +158,7 @@ class mustache_template_source_loader {
// Get the requested template source.
$templatesource = $this->load($templatecomponent, $templatename, $themename, $includecomments);
// This is a helper function to save a value in one of the result arrays (either $templates or $strings).
$save = function(array $results, array $seenlist, string $component, string $id, $value) {
$save = function(array $results, array $seenlist, string $component, string $id, $value) use ($lang) {
if (!isset($results[$component])) {
// If the results list doesn't already contain this component then initialise it.
$results[$component] = [];
@ -173,7 +173,7 @@ class mustache_template_source_loader {
};
// This is a helper function for processing a dependency. Does stuff like ignore duplicate processing,
// common result formatting etc.
$handler = function(array $dependency, array $ignorelist, callable $processcallback) {
$handler = function(array $dependency, array $ignorelist, callable $processcallback) use ($lang) {
foreach ($dependency as $component => $ids) {
foreach ($ids as $id) {
$dependencyid = "$component/$id";
@ -223,7 +223,8 @@ class mustache_template_source_loader {
&$seenstrings,
&$templates,
&$strings,
$save
$save,
$lang
) {
// We haven't seen this template yet so load it and it's dependencies.
$subdependencies = $this->load_with_dependencies(
@ -232,7 +233,8 @@ class mustache_template_source_loader {
$themename,
$includecomments,
$seentemplates,
$seenstrings
$seenstrings,
$lang
);
foreach ($subdependencies['templates'] as $component => $ids) {