From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 12 Feb 2008 08:27:10 +0000 (-0800)
Subject:  * Add missing mail/ directories for template location
X-Git-Tag: release/2.6.0~506^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6293d4f59dbe846578574a5969e291bef732d621;p=debbugs.git

 * Add missing mail/ directories for template location
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 97e1e7f7..aaba6d54 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -476,7 +476,7 @@ sub __return_append_to_log_options{
      if (not exists $param{message}) {
 	  $action = $param{action} if exists $param{action};
 	  my $date = rfc822_date();
-	  $param{message} = fill_in_template(template  => 'fake_control_message',
+	  $param{message} = fill_in_template(template  => 'mail/fake_control_message',
 					     variables => {request_addr => $param{request_addr},
 							   requester    => $param{requester},
 							   date         => $date,
diff --git a/scripts/service.in b/scripts/service.in
index b766ce0e..b89244b8 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -153,7 +153,7 @@ my $quickabort = 0;
 
 my $fuckheads = "(" . join("|", @gExcludeFromControl) . ")";
 if (@gExcludeFromControl and $replyto =~ m/$fuckheads/) {
-	&transcript(fill_template('excluded_from_control'));
+	&transcript(fill_template('mail/excluded_from_control'));
 	$quickabort = 1;
 }