X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02fbcf5f06917d7dea546b90932da82b8ed29d2a..5ff5bf60e56b2762ad08fa947af8e458e5974b6c:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 4143291c1..be6531def 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -113,7 +113,7 @@ class Way < ActiveRecord::Base end else # otherwise, manually go to the db to check things - if nd.node.visible? and nd.node.visible? + if nd.node and nd.node.visible? ordered_nodes[nd.sequence_id] = nd.node_id.to_s end end @@ -274,7 +274,7 @@ class Way < ActiveRecord::Base check_consistency(self, new_way, user) if self.visible if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", - :conditions => [ "visible = 1 AND member_type='way' and member_id=? ", self.id]) + :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id]) raise OSM::APIPreconditionFailedError else self.changeset_id = new_way.changeset_id