Merge branch 'master' of github.com:binarylogic/authlogic

tardate · Aug 26, 2009 · 847ff8e · 847ff8e
2 parents bf547bb + 73c4ccc
commit 847ff8e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/authlogic/session/active_record_trickery.rb b/lib/authlogic/session/active_record_trickery.rb
@@ -40,7 +40,8 @@ def self_and_descendants_from_active_record
 
         # For rails >3.0
         def model_name
-          ActiveModel::Name.new(self.to_s)
+          clazz = defined?(ActiveModel) ? ActiveModel::Name : ActiveSupport::ModelName
+          clazz.new(self.to_s)
         end
       end