Merge pull request #1124 from amatsuda/fix_railties_warnings

Fix railties warnings

3 files changed, 5 insertions, 4 deletions

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 6a125685d0..e26f73ed8d 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -522,9 +522,9 @@ module Rails
     end
 
     initializer :append_assets_path do |app|
-      app.config.assets.paths.unshift *paths["vendor/assets"].existent
-      app.config.assets.paths.unshift *paths["lib/assets"].existent
-      app.config.assets.paths.unshift *paths["app/assets"].existent
+      app.config.assets.paths.unshift(*paths["vendor/assets"].existent)
+      app.config.assets.paths.unshift(*paths["lib/assets"].existent)
+      app.config.assets.paths.unshift(*paths["app/assets"].existent)
     end
 
     initializer :prepend_helpers_path do |app|
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index c323df3e95..d31a3262e3 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -278,7 +278,7 @@ module Rails
             say args.first.to_s unless options.quiet?
           else
             args << (self.behavior == :invoke ? :green : :red)
-            say_status *args
+            say_status(*args)
           end
         end
 
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index cf317eb21f..7e7f8d2d08 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -13,6 +13,7 @@ module Rails
                                     :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
 
       def initialize(args, *options) #:nodoc:
+        @inside_template = nil
         # Unfreeze name in case it's given as a frozen string
         args[0] = args[0].dup if args[0].is_a?(String) && args[0].frozen?
         super