Adding 'fallback' template setting; default is for filling a void in user prefs,...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11794 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index b11e04f137a23364808fb141e0e0aa42d3d6b422..038dfcb525d2fd459b06506ab49092cbde17c824 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -4155,6 +4155,13 @@ sub save_data {
 
         if ( $templateset_default eq '' ) { $templateset_default = '0'; }
         print CF "\$templateset_default = $templateset_default;\n";
+# FIXME: need to make this a setting the user can change herein
+#        This REALLY needs to be done, since the index of the "default"
+#        set cannot always be predicted!
+#        Heck, why are default and fallback indexes?  If we make them
+#        into the ID strings, then it would not cause such issues
+$templateset_fallback = 0;
+        print CF "\$templateset_fallback = $templateset_fallback;\n";
 
         for ( $count = 0 ; $count <= $#templateset_name ; $count++ ) {
             print CF "\$aTemplateSet[$count]['ID'] = '" . $templateset_id[$count] . "';\n";

diff --git a/config/config_default.php b/config/config_default.php
index c77cfb472e5f588008c852796bf71f3034fd24b4..447d6f2de42f5a84149732df43f25a547ca09614 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -857,6 +857,7 @@ $theme[51]['NAME'] = 'Turquoise';
  * @global integer $templateset_default
  */
 $templateset_default = 0;
+$templateset_fallback = 0;
 
 $aTemplateSet[0]['ID'] = 'default';
 $aTemplateSet[0]['NAME'] = 'Default';