OSDN Git Service
(root)
/
redminele
/
redmine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
569d13b
)
Fixes delimiters regexp.
author
Jean-Philippe Lang
<jp_lang@yahoo.fr>
Wed, 23 Dec 2009 19:52:48 +0000
(19:52 +0000)
committer
Jean-Philippe Lang
<jp_lang@yahoo.fr>
Wed, 23 Dec 2009 19:52:48 +0000
(19:52 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229
e93f8b46
-1217-0410-a6f0-
8f06a7374b81
app/models/mail_handler.rb
patch
|
blob
|
history
diff --git
a/app/models/mail_handler.rb
b/app/models/mail_handler.rb
index
1880575
..
98536a8
100644
(file)
--- a/
app/models/mail_handler.rb
+++ b/
app/models/mail_handler.rb
@@
-309,7
+309,7
@@
class MailHandler < ActionMailer::Base
def cleanup_body(body)
delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
unless delimiters.empty?
- regex = Regexp.new("^(#{ delimiters.join('|') })\s*
$
.*", Regexp::MULTILINE)
+ regex = Regexp.new("^(#{ delimiters.join('|') })\s*
[\r\n]
.*", Regexp::MULTILINE)
body = body.gsub(regex, '')
end
body.strip