Use Array.wrap() instead of Array() and handle action_view.cache_template_loading being false

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index c373afeac0..fe6053e574 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -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
diff --git a/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
index a92747dd77..efed030de0 100644
--- a/railties/lib/rails_generator/generators/applications/app/template_runner.rb
+++ b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
@@ -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