Skip to content
Snippets Groups Projects
Commit e69fca07 authored by Olav Morken's avatar Olav Morken
Browse files

config-templates: Remove unused theme.base.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1878 44740490-163a-0410-bde0-09ae8108e29a
parent c3ce2b22
Branches
Tags
No related merge requests found
...@@ -172,10 +172,9 @@ $config = array ( ...@@ -172,10 +172,9 @@ $config = array (
'language.default' => 'en', '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.use' => 'default',
'theme.base' => 'default',
/* /*
......
...@@ -531,13 +531,12 @@ class SimpleSAML_XHTML_Template { ...@@ -531,13 +531,12 @@ class SimpleSAML_XHTML_Template {
/* Try default theme. */ /* Try default theme. */
$baseTheme = $this->configuration->getString('theme.base', 'default');
if ($templateModule !== 'default') { if ($templateModule !== 'default') {
/* .../module/<templateModule>/templates/<baseTheme>/<templateName> */ /* .../module/<templateModule>/templates/<templateName> */
$filename = SimpleSAML_Module::getModuleDir($templateModule) . '/templates/' . $templateName; $filename = SimpleSAML_Module::getModuleDir($templateModule) . '/templates/' . $templateName;
} else { } else {
/* .../templates/<baseTheme>/<templateName> */ /* .../templates/<templateName> */
$filename = $this->configuration->getPathValue('templatedir', 'templates/') . '/' . $templateName; $filename = $this->configuration->getPathValue('templatedir', 'templates/') . '/' . $templateName;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment