Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

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