From 649162c35fad74eae7342ded250ed54789aa5b78 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Fri, 29 Sep 2006 09:11:23 +0000 Subject: [PATCH] Make temporary code more obvious git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11766 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index c199a435..8b9ca9d3 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -196,17 +196,17 @@ while ( $line = ) { $options[1] =~ s/^\.\.\/config/\.\.\/templates/; } $templateset_id[$sub] = $options[1]; -##### FIXME: This section here so old prefs files don't blow up when running conf.pl +##### FIXME: This section BELOW here so old prefs files don't blow up when running conf.pl ##### Remove after a month or two - } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) { - $sub = $options[0]; - $sub =~ s/\]\[['"]PATH['"]\]//; - $sub =~ s/.*\[//; - if ( -e "../templates" ) { - $options[1] =~ s/^\.\.\/config/\.\.\/templates/; - } - $templateset_id[$sub] = $options[1]; -##### FIXME: This section here so old prefs files don't blow up when running conf.pl +} elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]PATH['"]\]//; + $sub =~ s/.*\[//; + if ( -e "../templates" ) { + $options[1] =~ s/^\.\.\/config/\.\.\/templates/; + } + $templateset_id[$sub] = $options[1]; +##### FIXME: This section ABOVE here so old prefs files don't blow up when running conf.pl ##### Remove after a month or two } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]NAME['"]\]/ ) { $sub = $options[0]; -- 2.25.1