Removed invoke_if and allow hook_for to accept boolean options.

2 files changed, 2 insertions, 4 deletions

diff --git a/railties/lib/generators/rails/controller/controller_generator.rb b/railties/lib/generators/rails/controller/controller_generator.rb
index 3fed058c00..91470be833 100644
--- a/railties/lib/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/generators/rails/controller/controller_generator.rb
@@ -8,8 +8,7 @@ module Rails
         template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
       end
 
-      hook_for :template_engine, :test_framework
-      invoke_if :helper
+      hook_for :template_engine, :test_framework, :helper
     end
   end
 end
diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index c7c777014e..972be5a33b 100644
--- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -18,8 +18,7 @@ module Rails
       hook_for :template_engine, :test_framework, :as => :scaffold
 
       # Invoke the helper using the controller (pluralized) name.
-      #
-      invoke_if :helper do |base, invoked|
+      hook_for :helper, :as => :scaffold do |base, invoked|
         base.invoke invoked, [ base.controller_name ]
       end
     end