From 95274b28d95ad85ada25eb0c697ce5650ae488a9 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sat, 26 Dec 2009 03:50:57 +0530 Subject: Rename Model.conditions and relation.conditions to .where --- activerecord/lib/active_record/relation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/relation.rb') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 28f04e5d85..6cc2befdf3 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -100,7 +100,7 @@ module ActiveRecord end end - def conditions(conditions) + def where(conditions) if conditions.blank? self else -- cgit v1.2.3