load will_paginate view helpers even if ActiveRecord is not loaded

saizai · May 9, 2009 · fce2e9e · fce2e9e
1 parent 8888651
commit fce2e9e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/will_paginate.rb b/lib/will_paginate.rb
@@ -73,6 +73,7 @@ def self.warn(message, callstack = caller)
   end
 end
 
-if defined?(Rails) and defined?(ActiveRecord) and defined?(ActionController)
-  WillPaginate.enable
+if defined? Rails
+  WillPaginate.enable_activerecord if defined? ActiveRecord
+  WillPaginate.enable_actionpack if defined? ActionController
 end