aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-06-30 06:51:22 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-06-30 06:51:22 +0000
commitfaba7e93723da428076b0676afd8340b47670da4 (patch)
treeda02ef3e3792790a2525d9ea2f04602a936fdd8c /actionmailer
parentd0526ede40c1ebe4b1bcd9d5efbc04254f4c8cbf (diff)
downloadrails-faba7e93723da428076b0676afd8340b47670da4.tar.gz
rails-faba7e93723da428076b0676afd8340b47670da4.tar.bz2
rails-faba7e93723da428076b0676afd8340b47670da4.zip
fix regexp typo
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4526 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a67072a953..d667ef1f4b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -348,7 +348,7 @@ module ActionMailer #:nodoc:
templates.each do |path|
# TODO: don't hardcode rhtml|rxml
basename = File.basename(path)
- next unless md = /^([^\.]+)\.([^\.]+\.[^\+]+)\.(rhtml|rxml)$/.match(basename)
+ next unless md = /^([^\.]+)\.([^\.]+\.[^\.]+)\.(rhtml|rxml)$/.match(basename)
template_name = basename
content_type = md.captures[1].gsub('.', '/')
@parts << Part.new(:content_type => content_type,