aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-07-07 11:57:53 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-07-09 10:42:29 -0700
commit4354aa36fb0b94f3750256441054d42db9900bf5 (patch)
tree5005e70a1c2d2dd138c13bfd960f06baa2fe0894 /actionpack/lib
parent350faf14e80740a440ab16c7130c5262d603d283 (diff)
downloadrails-4354aa36fb0b94f3750256441054d42db9900bf5.tar.gz
rails-4354aa36fb0b94f3750256441054d42db9900bf5.tar.bz2
rails-4354aa36fb0b94f3750256441054d42db9900bf5.zip
Rendering default template for missing actions works with non-word characters in action name
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/template_file.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template_file.rb b/actionpack/lib/action_view/template_file.rb
index c38e8ed122..0aa16b5e70 100644
--- a/actionpack/lib/action_view/template_file.rb
+++ b/actionpack/lib/action_view/template_file.rb
@@ -74,7 +74,7 @@ module ActionView #:nodoc:
# Returns file split into an array
# [base_path, name, format, extension]
def split(file)
- if m = file.match(/^(.*\/)?(\w+)\.?(\w+)?\.?(\w+)?\.?(\w+)?$/)
+ if m = file.match(/^(.*\/)?([^\.]+)\.?(\w+)?\.?(\w+)?\.?(\w+)?$/)
if m[5] # Mulipart formats
[m[1], m[2], "#{m[3]}.#{m[4]}", m[5]]
elsif m[4] # Single format