From: Richard Fairhurst <richard@systemed.net>
Date: Sat, 7 Jul 2007 13:26:17 +0000 (+0000)
Subject: fix problematic merge
X-Git-Tag: live~8270
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/84b67e00a07262139f2cc9e9460f4afd35e91349?hp=55d8bc5256606d3922116cc5ae64330378533301

fix problematic merge
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 1049b51b6..5fe9b45cb 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -400,7 +400,7 @@ EOF
     insertsql =''
     currentsql=''
     attributes.each do |k,v|
-      if v=='' then next end
+      if v=='' or v.nil? then next end
       if v[0,6]=='(type ' then next end
       if insertsql !='' then insertsql +=',' end
       if currentsql!='' then currentsql+=',' end
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index ad3c2180a..06db9e2f8 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ