Add do-not-reply config variable, removing special case from code.

2 files changed, 3 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index 926a3f2a5..c8b0c2046 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -184,7 +184,7 @@ generally required to stash
 sub setup_request : Private {
     my ( $self, $c ) = @_;
 
-    $c->stash->{contact_email} = $c->cobrand->contact_email( 'contact' );
+    $c->stash->{contact_email} = $c->cobrand->contact_email;
     $c->stash->{contact_email} =~ s/\@/@/;
 
     for my $param (qw/em subject message/) {
@@ -206,7 +206,7 @@ Sends the email
 sub send_email : Private {
     my ( $self, $c ) = @_;
 
-    my $recipient      = $c->cobrand->contact_email( 'contact' );
+    my $recipient      = $c->cobrand->contact_email;
     my $recipient_name = $c->cobrand->contact_name();
 
     $c->stash->{host} = $c->req->header('HOST');
diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 040b0d3e6..3382c0cea 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -100,7 +100,7 @@ sub error : Private {
 sub get_discovery : Private {
     my ( $self, $c ) = @_;
 
-    my $contact_email = $c->config->{CONTACT_EMAIL};
+    my $contact_email = $c->cobrand->contact_email;
     my $prod_url = 'http://www.fiksgatami.no/open311';
     my $test_url = 'http://fiksgatami-dev.nuug.no/open311';
     my $prod_changeset = '2011-04-08T00:00:00Z';