aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-08-21 11:00:47 +0100
committerLouise Crow <louise.crow@gmail.com>2012-08-21 11:00:47 +0100
commitdce7797d92cafc29c50fe5b91e62874f10659846 (patch)
tree99c62802e58d0a962396d861be62fe2f099337e6
parentb8ed99e84120c561bfc9650144c26c5ccada4939 (diff)
parent7127ebcad5407eb616931c8ef24dbde105d03a29 (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
-rw-r--r--app/models/info_request.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 23e18b858..19ec949ba 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -567,8 +567,11 @@ public
self.calculate_event_states
- if self.requires_admin? && !self.is_external?
- RequestMailer.deliver_requires_admin(self, set_by)
+ if self.requires_admin?
+ # Check there is someone to send the message "from"
+ if !set_by.nil? || !self.user.nil?
+ RequestMailer.deliver_requires_admin(self, set_by)
+ end
end
end