From 3838173ba5d9a2b2ce74f4ab9599e8e54725877c Mon Sep 17 00:00:00 2001 From: pdontthink Date: Mon, 2 Oct 2006 09:52:26 +0000 Subject: [PATCH] Adding 'fallback' template setting; default is for filling a void in user prefs, whereas fallback is the last-resort template set to find missing template files when the code is trying to display a template git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11794 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 7 +++++++ config/config_default.php | 1 + 2 files changed, 8 insertions(+) diff --git a/config/conf.pl b/config/conf.pl index b11e04f1..038dfcb5 100755 --- 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 c77cfb47..447d6f2d 100644 --- 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'; -- 2.25.1