aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-09 10:13:02 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-09 10:13:02 -0700
commit14a8fd146a64f7ed8399339fa5bc0200b54838ea (patch)
treed5519a792a8ffcfc05fbbc9639e23e4b73099dba
parent1fbc4704df96a8a7e526a3ce4c8110c8e5e26a18 (diff)
downloadrails-14a8fd146a64f7ed8399339fa5bc0200b54838ea.tar.gz
rails-14a8fd146a64f7ed8399339fa5bc0200b54838ea.tar.bz2
rails-14a8fd146a64f7ed8399339fa5bc0200b54838ea.zip
Just remove the sort_locals method
-rw-r--r--actionpack/lib/action_view/template/resolver.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 896baef83c..7abaa07bc7 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -69,7 +69,7 @@ module ActionView
# before returning it.
def cached(key, path_info, details, locals) #:nodoc:
name, prefix, partial = path_info
- locals = sort_locals(locals)
+ locals = locals.map { |x| x.to_s }.sort!
if key && caching?
@cached[key][name][prefix][partial][locals] ||= decorate(yield, path_info, details, locals)
@@ -98,17 +98,6 @@ module ActionView
t.virtual_path ||= (cached ||= build_path(*path_info))
end
end
-
- if :symbol.respond_to?("<=>")
- def sort_locals(locals) #:nodoc:
- locals.sort
- end
- else
- def sort_locals(locals) #:nodoc:
- locals = locals.map{ |l| l.to_s }
- locals.sort!
- end
- end
end
# An abstract class that implements a Resolver with path semantics.