nicer fix I think for nil / [] issue
authorSteve Coast <steve@asklater.com>
Fri, 21 Mar 2008 20:30:16 +0000 (20:30 +0000)
committerSteve Coast <steve@asklater.com>
Fri, 21 Mar 2008 20:30:16 +0000 (20:30 +0000)
app/models/relation.rb

index 93e9379b68694901152881b1ba0c5e1d541d0e66..61344bdfb62021fad69b67c72cf4e97d0b59219f 100644 (file)
@@ -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