Index: app/models/query.rb =================================================================== --- app/models/query.rb (revision 3826) +++ app/models/query.rb (working copy) @@ -496,8 +496,7 @@ # Returns the versions # Valid options are :conditions def versions(options={}) - Version.find :all, :include => :project, - :conditions => Query.merge_conditions(project_statement, options[:conditions]) + @project.shared_versions.all :conditions => options[:conditions] rescue ::ActiveRecord::StatementInvalid => e raise StatementInvalid.new(e.message) end