@@ -134,12 +134,11 @@ module Randomba # returns false. When given as an array will try to find any of the # records and return those that can be found. def find_using_friendly_id(*args) - kind = args.shift - case kind + case args.first when String - slugs = Slug.find_by_name_and_sluggable_type(kind, self.to_s, args.first) + slugs = Slug.find_by_name_and_sluggable_type(args.first, self.to_s) when Array - slugs = Slug.find_all_by_name_and_sluggable_type(kind, self.to_s, args.first) + slugs = Slug.find_all_by_name_and_sluggable_type(args.first, self.to_s) else return false end lib/friendly_id.rb @@ -179,11 +179,4 @@ class SluggableTest < Test::Unit::TestCase end end - def test_should_not_find_post_using_slugs_with_invalid_conditions - assert !Post.find_using_friendly_id(slugs(:one).name, :conditions => "1 = 2") - end - - def test_should_find_post_using_slugs_with_conditions - assert_equal posts(:with_one_slug), Post.find_using_friendly_id(slugs(:one).name, :conditions => "1 = 1") - end end \ No newline at end of file test/sluggable_test.rb d917a682f57c62816807325a2b18998f12cd5cb3 Norman Clarke norman@addthree.com http://github.com/norman/friendly_id/commit/38f23b8d6507cdd5892fece9787953a5093868d6 38f23b8d6507cdd5892fece9787953a5093868d6 2008-06-23T16:39:26-07:00 2008-06-23T16:39:26-07:00 Revert "Allow friendly_id to accept conditions when using slugs." This reverts commit 09382b50e388a0b6c06915382977ddfe98dc3c79. 1c9cd06ce83589590372325f979fa0a2c1458043 Norman Clarke norman@addthree.com