Merge pull request #618 from spatil/master

Check for defined ActionController::Base instead ActionController
2012-06-19 10:41:14 -07:00
parent 7bf683d8f4 51702e0f7b
commit 33e33c584e
1 changed files with 1 additions and 1 deletions
--- a/lib/cancan/controller_additions.rb
+++ b/lib/cancan/controller_additions.rb
@@ -385,7 +385,7 @@ module CanCan
  end
 end

-if defined? ActionController
+if defined? ActionController::Base
  ActionController::Base.class_eval do
    include CanCan::ControllerAdditions
  end