Bug 104261 - incorrect template paths. r=myk, ddk.

diff --git a/Attachment.pm b/Attachment.pm
index 9f46fd0839fde4396d023a9994dfc217d439536a..1ba194d77bebd4b3da2c2ffc551eead53afccd8b 100644 (file)
--- a/Attachment.pm
+++ b/Attachment.pm
@@ -42,7 +42,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => 'template/default' ,
+    INCLUDE_PATH => 'template/custom:template/default' ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 9f46fd0839fde4396d023a9994dfc217d439536a..1ba194d77bebd4b3da2c2ffc551eead53afccd8b 100644 (file)
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -42,7 +42,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => 'template/default' ,
+    INCLUDE_PATH => 'template/custom:template/default' ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }

diff --git a/attachment.cgi b/attachment.cgi
index d908a5ebd29b99af89ba7da31e94e7e67e5a1fed..e5c3f52fe13a09a719ddce707a64210eb9034940 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -45,7 +45,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/default" ,
+    INCLUDE_PATH => "template/custom:template/default" ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }

diff --git a/editattachstatuses.cgi b/editattachstatuses.cgi
index 9feb9a765d67fead99d09744b8d29e7c0ed6ed7c..6596a79c991eac99354185fb13f99f16a4747b60 100755 (executable)
--- a/editattachstatuses.cgi
+++ b/editattachstatuses.cgi
@@ -45,7 +45,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/default" ,
+    INCLUDE_PATH => "template/custom:template/default" ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }