Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3use-with-alaveteli-0.11rails-3

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb
index 11b5722..9959f86 100644
--- a/lib/controller_patches.rb
+++ b/lib/controller_patches.rb
@@ -4,12 +4,15 @@
 # classes are reloaded, but initialization is not run each time.
 # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode
 #
-require 'dispatcher'
-Dispatcher.to_prepare do
+Rails.configuration.to_prepare do
     # Example adding an instance variable to the frontpage controller
     GeneralController.class_eval do
         def mycontroller
             @say_something = "Greetings friend"
         end
     end
+    HelpController.class_eval do
+        def help_out
+        end
+    end
 end