aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/App.pm10
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm5
2 files changed, 13 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 3d9f0a511..6ccc801ce 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -319,6 +319,16 @@ sub send_email_cron {
unpack('h*', random_bytes(5, 1))
);
+ $params->{_parameters_}->{signature} = '';
+ #$params->{_parameters_}->{signature} = $c->view('Email')->render(
+ # $c, 'signature.txt', {
+ # additional_template_paths => [
+ # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker, $c->stash->{lang_code} )->stringify,
+ # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker )->stringify,
+ # ]
+ # }
+ #);
+
my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) };
if ( FixMyStreet->test_mode ) {
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 37ff1ae76..daaaca499 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -595,8 +595,9 @@ sub setup_categories_and_councils : Private {
}
if (@category_options) {
- @category_options =
- ( _('-- Pick a category --'), @category_options, _('Other') );
+ @category_options = ( _('-- Pick a category --'), @category_options );
+ push @category_options, _('Other')
+ unless $first_council->{id} == 2482;
$category_label = _('Category');
}
}