Bug 140407 - remove all references to directories template/default and template/custo...

diff --git a/checksetup.pl b/checksetup.pl
index 075ea2eaf9629e8fad178647681c9b4aadea8602..8df82361435ae4d20178a70a8be8789f7ec30c53 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -731,7 +731,7 @@ END
             print "\n\n";
             print "*** It appears that you still have an old index.html hanging\n";
             print "    around.  The contents of this file should be moved into a\n";
-            print "    template and placed in the 'template/custom' directory.\n\n";
+            print "    template and placed in the 'template/en/custom' directory.\n\n";
         }
         close HTML;
     }

diff --git a/globals.pl b/globals.pl
index 951c4d6a528236dcc97eebb3b8bebf3cf103589b..248bcd594d7fe8eec28e4da4db85d323429192a1 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -1530,7 +1530,7 @@ use Template;
 $::template ||= Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/custom:template/default:template/en/custom:template/en/default" ,
+    INCLUDE_PATH => "template/en/custom:template/en/default" ,
 
     # Remove white-space before template directives (PRE_CHOMP) and at the
     # beginning and end of templates and template blocks (TRIM) for better