diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
| commit | 5f3418307d6087f848eb1fdbf4531d67416121df (patch) | |
| tree | cb7dad95b6b21db3b237efabc9d0fa37879adc10 /app/models/info_request.rb | |
| parent | 07121bf22b0929e03215f02b8740c3979ae6c872 (diff) | |
| parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) | |
Merge branch 'release/0.6.9' into wdtk
Diffstat (limited to 'app/models/info_request.rb')
| -rw-r--r-- | app/models/info_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 194f8e105..3355b9443 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -138,7 +138,7 @@ class InfoRequest < ActiveRecord::Base if external_user_name.nil? fake_slug = "anonymous" else - fake_slug = external_user_name.parameterize + fake_slug = MySociety::Format.simplify_url_part(external_user_name, 'external_user', 32) end (public_body.url_name || "") + "_" + fake_slug else @@ -434,11 +434,11 @@ public elsif self.allow_new_responses_from == 'anybody' allow = true elsif self.allow_new_responses_from == 'authority_only' - if email.from_addrs.nil? || email.from_addrs.size == 0 + sender_email = MailHandler.get_from_address(email) + if sender_email.nil? allow = false reason = _('Only the authority can reply to this request, but there is no "From" address to check against') else - sender_email = email.from_addrs[0].spec sender_domain = PublicBody.extract_domain_from_email(sender_email) reason = _("Only the authority can reply to this request, and I don't recognise the address this reply was sent from") allow = false |