L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52366-32-mustachethemedir' of git://github.com/mudrd8mz/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-12-28 12:23:49 +01:00
parent 44b94d9324 b7f902b5b3
commit 3b37e372f2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/output/mustache_template_finder.php
+6
View File
@@ -76,10 +76,16 @@ class mustache_template_finder {
// First check the theme.
$dirs[] = $CFG->dirroot . '/theme/' . $themename . '/templates/' . $component . '/';
if (isset($CFG->themedir)) {
$dirs[] = $CFG->themedir . '/' . $themename . '/templates/' . $component . '/';
}
// Now check the parent themes.
// Search each of the parent themes second.
foreach ($parents as $parent) {
$dirs[] = $CFG->dirroot . '/theme/' . $parent . '/templates/' . $component . '/';
if (isset($CFG->themedir)) {
$dirs[] = $CFG->themedir . '/' . $parent . '/templates/' . $component . '/';
}
}
$dirs[] = $compdirectory . '/templates/';