From cff7f53fbcce14f190cc2d993467ba77fe8fa03d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 4 Aug 2010 08:44:35 -0700
Subject: do not pass AR objects to ARel

---
 activerecord/lib/active_record/relation/finder_methods.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index bad9af250d..b34c11973b 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -286,6 +286,8 @@ module ActiveRecord
     end
 
     def find_one(id)
+      id = id.id if ActiveRecord::Base === id
+
       record = where(primary_key.eq(id)).first
 
       unless record
-- 
cgit v1.2.3