aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/lookup_context.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-12-27 09:14:13 +0100
committerJosé Valim <jose.valim@gmail.com>2010-12-27 09:14:13 +0100
commit51a7d9acdd4a01fb23e21be7a89e6440e51715e8 (patch)
treedb5d6af054b2a73b353b4412851ccd92393bb750 /actionpack/lib/action_view/lookup_context.rb
parente03e1fdbc85bc05536a2770817c31b08d4f6be51 (diff)
downloadrails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.tar.gz
rails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.tar.bz2
rails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.zip
Final tidy up on templates inheritance.
Diffstat (limited to 'actionpack/lib/action_view/lookup_context.rb')
-rw-r--r--actionpack/lib/action_view/lookup_context.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 0d7f15e564..1365048724 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -119,13 +119,14 @@ module ActionView
name = name.to_s.gsub(handlers_regexp, '')
parts = name.split('/')
name = parts.pop
- prx = if prefixes.blank?
- [parts.compact.join('/')]
- else
- prefixes.map {|prefix| [prefix, *parts].compact.join('/') }
- end
- return name, prx
+ prefixes = if prefixes.blank?
+ [parts.join('/')]
+ else
+ prefixes.map { |prefix| [prefix, *parts].compact.join('/') }
+ end
+
+ return name, prefixes
end
def default_handlers #:nodoc: