Merge pull request ryanb#618 from spatil/master

Check for defined ActionController::Base instead ActionController
brynary · Jun 19, 2012 · 33e33c5 · 33e33c5
2 parents 7bf683d + 51702e0
commit 33e33c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/cancan/controller_additions.rb b/lib/cancan/controller_additions.rb
@@ -385,7 +385,7 @@ def cannot?(*args)
   end
 end
 
-if defined? ActionController
+if defined? ActionController::Base
   ActionController::Base.class_eval do
     include CanCan::ControllerAdditions
   end