From 9a7aa12d76538ba4401ecacaf44b9db7acb6ea29 Mon Sep 17 00:00:00 2001
From: Guy Halse <guy@tenet.ac.za>
Date: Tue, 30 Jul 2019 14:06:30 +0200
Subject: [PATCH] Allow themes to call their parent templates
---
lib/SimpleSAML/XHTML/Template.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 75bd71582..2baeecdfb 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -244,6 +244,7 @@ class Template extends Response
$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
}
@@ -524,7 +525,7 @@ class Template extends Response
public function show()
{
if ($this->useNewUI) {
- echo $this->getContents();
+ echo $this->getContents();
} else {
require($this->findTemplatePath($this->template));
}
--
GitLab