github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: timing issue with edits and cook post processing

Browse Source
This commit is contained in:
Régis Hanol
2015-09-29 18:51:26 +02:00
parent 3aaa9a8722
commit 54d6d24cbf
9 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/components/email/receiver_spec.rb
View File

@ -460,12 +460,8 @@ This is a link http://example.com"
def fill_email(mail, from, to, body = nil, subject = nil)
result = mail.gsub("FROM", from).gsub("TO", to)
if body
result.gsub!(/Hey.*/m, body)
end
if subject
result.sub!(/We .*/, subject)
end
result.gsub!(/Hey.*/m, body) if body
result.sub!(/We .*/, subject) if subject
result
end