X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41f85fb77dbd0c16f12e49091b14fcaa1264ad70..329b6faf91745b4b6760d975d8b5574c5ffdb181:/app/models/way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index da305f082..64b399133 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -251,9 +251,9 @@ class Way < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Way.transaction do
       check_consistency(self, new_way, user)
-      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
+      if RelationMember.find(:first, :joins => :relation,
                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
-        raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
+        raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id
         self.changeset = new_way.changeset