Skip to content

Commit e69fca0

Browse files
committed
config-templates: Remove unused theme.base.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1878 44740490-163a-0410-bde0-09ae8108e29a
1 parent c3ce2b2 commit e69fca0

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

config-templates/config.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,9 @@
172172
'language.default' => 'en',
173173

174174
/*
175-
* Which theme directory should be used? The base is fallback (leave it to default).
175+
* Which theme directory should be used?
176176
*/
177177
'theme.use' => 'default',
178-
'theme.base' => 'default',
179178

180179

181180
/*

lib/SimpleSAML/XHTML/Template.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,13 +531,12 @@ private function findTemplatePath($template) {
531531

532532

533533
/* Try default theme. */
534-
$baseTheme = $this->configuration->getString('theme.base', 'default');
535534
if ($templateModule !== 'default') {
536-
/* .../module/<templateModule>/templates/<baseTheme>/<templateName> */
535+
/* .../module/<templateModule>/templates/<templateName> */
537536
$filename = SimpleSAML_Module::getModuleDir($templateModule) . '/templates/' . $templateName;
538537

539538
} else {
540-
/* .../templates/<baseTheme>/<templateName> */
539+
/* .../templates/<templateName> */
541540
$filename = $this->configuration->getPathValue('templatedir', 'templates/') . '/' . $templateName;
542541
}
543542

0 commit comments

Comments
 (0)