Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: We were tring to delete the mail string, not the mail itself.

This commit is contained in:
Robin Ward 2014-03-07 11:28:55 -05:00
parent 18e9d319fd
commit 78889163bf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/jobs/scheduled/poll_mailbox.rb
View File

@ -20,10 +20,11 @@ module Jobs
def handle_mail(mail) def handle_mail(mail)
begin begin
Email::Receiver.new(mail).process mail_string = mail.pop
Email::Receiver.new(mail_string).process
rescue Email::Receiver::UserNotSufficientTrustLevelError => e rescue Email::Receiver::UserNotSufficientTrustLevelError => e
# inform the user about the rejection # inform the user about the rejection
@message = Mail::Message.new(mail) @message = Mail::Message.new(mail_string)
clientMessage = RejectionMailer.send_trust_level(@message.from, @message.body) clientMessage = RejectionMailer.send_trust_level(@message.from, @message.body)
email_sender = Email::Sender.new(clientMessage, :email_reject_trust_level) email_sender = Email::Sender.new(clientMessage, :email_reject_trust_level)
email_sender.send email_sender.send
@ -46,7 +47,7 @@ module Jobs
SiteSetting.pop3s_polling_password) do |pop| SiteSetting.pop3s_polling_password) do |pop|
unless pop.mails.empty? unless pop.mails.empty?
pop.each do |mail| pop.each do |mail|
handle_mail mail.pop handle_mail(mail)
end end
end end
end end