fix problematic merge
authorRichard Fairhurst <richard@systemed.net>
Sat, 7 Jul 2007 13:26:17 +0000 (13:26 +0000)
committerRichard Fairhurst <richard@systemed.net>
Sat, 7 Jul 2007 13:26:17 +0000 (13:26 +0000)
app/controllers/amf_controller.rb
public/potlatch/potlatch.swf

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