fix problematic merge

2007-07-07 13:26:17 +00:00 · 2007-07-07 13:26:17 +00:00 · 84b67e00a0
commit 84b67e00a0
parent 55d8bc5256
2 changed files with 1 additions and 1 deletions
--- 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
--- a/public/potlatch/potlatch.swf
+++ b/public/potlatch/potlatch.swf