diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
| commit | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (patch) | |
| tree | 38b8570647124df06c637d4b923f6010211ef328 /perllib/FixMyStreet/App/Controller/Contact.pm | |
| parent | 40b3a51d33caefa8f5fb97ce9be18ef936c7e260 (diff) | |
| parent | 131ff6e9bf3626d6a8fff6ae54669d250148a63a (diff) | |
Merge remote branch 'origin/master' into fmb-read-only
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
templates/web/fixmystreet/alert/index.html
templates/web/fixmystreet/around/display_location.html
web/cobrands/fixmystreet/_layout.scss
web/js/map-OpenLayers.js
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Contact.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Contact.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm index f28d37989..91580f05a 100644 --- a/perllib/FixMyStreet/App/Controller/Contact.pm +++ b/perllib/FixMyStreet/App/Controller/Contact.pm @@ -183,7 +183,7 @@ generally required to stash sub setup_request : Private { my ( $self, $c ) = @_; - $c->stash->{contact_email} = $c->cobrand->contact_email; + $c->stash->{contact_email} = $c->cobrand->contact_email( 'contact' ); $c->stash->{contact_email} =~ s/\@/@/; for my $param (qw/em subject message/) { @@ -205,7 +205,7 @@ Sends the email sub send_email : Private { my ( $self, $c ) = @_; - my $recipient = $c->cobrand->contact_email(); + my $recipient = $c->cobrand->contact_email( 'contact' ); my $recipient_name = $c->cobrand->contact_name(); $c->stash->{host} = $c->req->header('HOST'); |