Merge remote-tracking branch 'upstream/pull/2778'

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 98e00d3328bdbab946a0e07f33f529b9182cc4ea..6907637a67d532623482883f1bb5c93fbf836e0d 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -20,12 +20,13 @@ else
   exit 0
 end
 
+exit 0 unless from.active?
 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 
-message.update(:message_read => true) if message
+message&.update(:message_read => true)
 
-mail = Mail.new(STDIN.read
+mail = Mail.new($stdin.read
                      .encode(:universal_newline => true)
                      .encode(:crlf_newline => true))