Revision: 1878
Author: olavmrk
Date: Mon Oct 19 05:57:58 2009
Log: config-templates: Remove unused theme.base.
http://code.google.com/p/simplesamlphp/source/detail?r=1878

Modified:
  /trunk/config-templates/config.php
  /trunk/lib/SimpleSAML/XHTML/Template.php

=======================================
--- /trunk/config-templates/config.php  Mon Oct 19 05:57:47 2009
+++ /trunk/config-templates/config.php  Mon Oct 19 05:57:58 2009
@@ -172,10 +172,9 @@
        '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',


        /*
=======================================
--- /trunk/lib/SimpleSAML/XHTML/Template.php    Fri Aug 28 02:09:11 2009
+++ /trunk/lib/SimpleSAML/XHTML/Template.php    Mon Oct 19 05:57:58 2009
@@ -531,13 +531,12 @@


                /* 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;
                }


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/simplesamlphp-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to