fix problematic merge

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 1049b51b61d0735cb28d31986815df51c1d1005c..5fe9b45cba54338eb7f6142a079b964747d23f31 100644 (file)
--- 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 ad3c2180af8740f40b9b6a3a6518dcfb42b6066a..06db9e2f8e2e31cdecf4660c33574e4a2a46d37d 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ