From 228e4f2287fd5d73727178b87de7a9652bf1c5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 15 Apr 2020 15:46:39 +0200
Subject: [PATCH] Fix issue #1312
---
lib/SimpleSAML/XHTML/Template.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index cf2b3010c..37ebe5a3a 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -228,14 +228,15 @@ class Template extends Response
$loader = new TemplateLoader();
$templateDirs = $this->findThemeTemplateDirs();
if ($this->module && $this->module != 'core') {
- $templateDirs[] = [$this->module => TemplateLoader::getModuleTemplateDir($this->module)];
+ $modDir = TemplateLoader::getModuleTemplateDir($this->module);
+ $templateDirs[] = [$this->module => $modDir];
+ $templateDirs[] = ['__parent__' => $modDir];
}
if ($this->theme['module']) {
try {
$templateDirs[] = [
$this->theme['module'] => TemplateLoader::getModuleTemplateDir($this->theme['module'])
];
- $templateDirs[] = ['__parent__' => TemplateLoader::getModuleTemplateDir($this->module)];
} catch (\InvalidArgumentException $e) {
// either the module is not enabled or it has no "templates" directory, ignore
}
--
GitLab