Use Array.wrap() instead of Array() and handle action_view.cache_template_loading being false
This commit is contained in:
parent
2686286a70
commit
5029210914
|
@ -188,7 +188,7 @@ module ActionView #:nodoc:
|
|||
cattr_accessor :cache_template_loading
|
||||
|
||||
def self.cache_template_loading?
|
||||
ActionController::Base.allow_concurrency || cache_template_loading || !ActiveSupport::Dependencies.load?
|
||||
ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
|
||||
end
|
||||
|
||||
attr_internal :request
|
||||
|
|
|
@ -111,7 +111,7 @@ module Rails
|
|||
"#{match}\n " << data
|
||||
end
|
||||
else
|
||||
Array(options[:env]).each do|env|
|
||||
Array.wrap(options[:env]).each do|env|
|
||||
append_file "config/environments/#{env}.rb", "\n#{data}"
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue