From e69fca0732f563e38bf9c809958ec7cd978299ea Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 19 Oct 2009 12:57:58 +0000
Subject: [PATCH] config-templates: Remove unused theme.base.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1878 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/config.php | 3 +--
lib/SimpleSAML/XHTML/Template.php | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index d957796f4..41b185a50 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -172,10 +172,9 @@ $config = array (
'language.default' => 'en',
/*
- * Which theme directory should be used? The base is fallback (leave it to default).
+ * Which theme directory should be used?
*/
'theme.use' => 'default',
- 'theme.base' => 'default',
/*
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 4646fea3d..6be9cb578 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -531,13 +531,12 @@ class SimpleSAML_XHTML_Template {
/* Try default theme. */
- $baseTheme = $this->configuration->getString('theme.base', 'default');
if ($templateModule !== 'default') {
- /* .../module/<templateModule>/templates/<baseTheme>/<templateName> */
+ /* .../module/<templateModule>/templates/<templateName> */
$filename = SimpleSAML_Module::getModuleDir($templateModule) . '/templates/' . $templateName;
} else {
- /* .../templates/<baseTheme>/<templateName> */
+ /* .../templates/<templateName> */
$filename = $this->configuration->getPathValue('templatedir', 'templates/') . '/' . $templateName;
}
--
GitLab