diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-06-17 22:26:25 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-06-17 22:26:25 +0100 |
| commit | c2ae41f1ce87b82be9eb5b1423521e2478d46888 (patch) | |
| tree | 146f21519cd435cfe99bdbe178e99d70d3bea0f7 | |
| parent | 4324fbc7a336b281e491c46bc665a965e852040e (diff) | |
No need for EMAIL_VHOST now, until such time as we have multiple cobrands sharing a database on different installs.
| -rw-r--r-- | conf/general-example | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/conf/general-example b/conf/general-example index d2ac743e0..bc58f56d3 100644 --- a/conf/general-example +++ b/conf/general-example @@ -31,10 +31,6 @@ define('OPTION_EMAIL_DOMAIN', 'example.org'); define('OPTION_CONTACT_EMAIL', 'team@'.OPTION_EMAIL_DOMAIN); define('OPTION_TEST_EMAIL_PREFIX', null); -# this should be the same as the OPTION_BASE_URL for historical reasons -define('OPTION_EMAIL_VHOST', 'www.example.com'); -define('OPTION_EMAIL_VHOST_EMPTYHOMES', 'www.example.com'); - define('OPTION_CONTACT_NAME', 'FixMyStreet'); define('OPTION_STAGING_SITE', 1); diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 47bee1e0a..864415b4c 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -615,16 +615,7 @@ Return if we are the virtual host that sends email for this cobrand =cut sub email_host { - my $self = shift; - my $cobrand_moniker_uc = uc( $self->moniker ); - - my $email_vhost = - mySociety::Config::get("EMAIL_VHOST_$cobrand_moniker_uc", '') - || mySociety::Config::get("EMAIL_VHOST") - || ''; - - return $email_vhost - && "http://$email_vhost" eq mySociety::Config::get("BASE_URL"); + return 1; } =item remove_redundant_councils |