@@ -70,7 +70,7 @@ TaggingMethods = Proc.new do end def self.tagged_with_any(*tag_list) - options = tag_list.last.is_a?(Hash) ? tag_list.pop : {} + options = tag_list.extract_options! tag_list = parse_tags(tag_list) scope = scope(:find) @@ -80,7 +80,7 @@ TaggingMethods = Proc.new do sql = "SELECT #{(scope && scope[:select]) || options[:select]} " sql << "FROM #{(scope && scope[:from]) || options[:from]} " - add_joins!(sql, options, scope) + add_joins!(sql, options[:joins], scope) sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id " sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' " lib/tagging_methods.rb 81c1f1b74fc75c797418dbd703b0a2a692583029 Benny Degezelle jomz benny@gorilla-webdesign.be http://github.com/jomz/radiant-tags-extension/commit/6531af595f069328a8b9ec9f1ccce9c269d53f3a 6531af595f069328a8b9ec9f1ccce9c269d53f3a 2009-07-17T06:23:45-07:00 2009-07-17T06:23:45-07:00 --amend; same for tagged_with_any 2abc692fda5c236f861c6a67543dbc9abc7abfab Benny Degezelle jomz benny@gorilla-webdesign.be