Permalink
Browse files

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

  • Loading branch information...
2 parents bf547bb + 73c4ccc commit 847ff8e533411a44ec845b369c5d4b8ab71c0741 @binarylogic binarylogic committed Aug 26, 2009
Showing with 2 additions and 1 deletion.
  1. +2 −1 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

0 comments on commit 847ff8e

Please sign in to comment.