diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
| commit | c01c8967a02537f132d437d5ae15332982119651 (patch) | |
| tree | 76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /actionpack/lib/action_view/template/resolver.rb | |
| parent | 770fca10fba68fa14308f33e923493e6f63bfa35 (diff) | |
| parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
| download | rails-c01c8967a02537f132d437d5ae15332982119651.tar.gz rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2 rails-c01c8967a02537f132d437d5ae15332982119651.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'actionpack/lib/action_view/template/resolver.rb')
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 10f664736f..fe657166d5 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -42,7 +42,7 @@ module ActionView def handler_glob @handler_glob ||= begin - e = TemplateHandlers.extensions.map{|h| ".#{h},"}.join + e = TemplateHandlers.extensions.map{|h| ".#{h}"}.join(",") "{#{e}}" end end |