From ec264a935e728d47e8167a3f7e43ea4c4e66875a Mon Sep 17 00:00:00 2001 From: Steve Coast Date: Fri, 21 Mar 2008 20:30:16 +0000 Subject: [PATCH] nicer fix I think for nil / [] issue --- app/models/relation.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/relation.rb b/app/models/relation.rb index 93e9379b6..61344bdfb 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -108,8 +108,8 @@ class Relation < ActiveRecord::Base # relationships, i.e. deliver referenced objects like we do with ways... # FIXME: rip out the fucking SQL def self.find_for_nodes_and_ways(node_ids, way_ids) - return [] if node_ids.empty? and node_ids.empty? - relations = Array.new + relations = [] + if node_ids.length > 0 relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + "e.visible=1 and " + @@ -120,6 +120,8 @@ class Relation < ActiveRecord::Base "e.visible=1 and " + "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})") end + + relations # if you don't do this then it returns nil and not [] end -- 2.43.2