Make temporary code more obvious
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 29 Sep 2006 09:11:23 +0000 (09:11 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 29 Sep 2006 09:11:23 +0000 (09:11 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11766 7612ce4b-ef26-0410-bec9-ea0150e637f0

config/conf.pl

index c199a43..8b9ca9d 100755 (executable)
@@ -196,17 +196,17 @@ while ( $line = <FILE> ) {
                 $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];