kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fix some accidental nils

Browse source
This commit is contained in:
Aaron Patterson 2012-06-22 16:21:58 -07:00
parent 3726080ece
commit 03e9a6417d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_view/lookup_context.rb
View file

@ -24,7 +24,7 @@ module ActionView
Accessors.send :define_method, :"default_#{name}", &block
Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
def #{name}
@details[:#{name}]
@details.fetch(:#{name}, [])
end
def #{name}=(value)

4
actionpack/lib/action_view/renderer/template_renderer.rb
View file

@ -18,10 +18,10 @@ module ActionView
# Determine the template to be rendered using the given options.
def determine_template(options) #:nodoc:
keys = options[:locals].try(:keys) || []
keys = options.fetch(:locals, {}).keys
if options.key?(:text)
Template::Text.new(options[:text], formats.try(:first))
Template::Text.new(options[:text], formats.first)
elsif options.key?(:file)
with_fallbacks { find_template(options[:file], nil, false, keys, @details) }
elsif options.key?(:inline)