From 84b67e00a07262139f2cc9e9460f4afd35e91349 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Sat, 7 Jul 2007 13:26:17 +0000 Subject: [PATCH] fix problematic merge --- app/controllers/amf_controller.rb | 2 +- public/potlatch/potlatch.swf | Bin 55315 -> 55330 bytes 2 files changed, 1 insertion(+), 1 deletion(-) 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 ad3c2180af8740f40b9b6a3a6518dcfb42b6066a..06db9e2f8e2e31cdecf4660c33574e4a2a46d37d 100755 GIT binary patch delta 1906 zcmbtVeN0adDpe9tm1Ua))vHK}DA>e}iX-JOkx+qyh-DD_J%3DTZzPLedoc@>;?H!-ol zoy4JgljkPk+wJ+J7kYhZn+(L{^zxkMPbXV>0y;eUINT|^)#!$WCW}sX;J$FBaE|9Z zFtFn+F+i5hhPKK!!iOp$JxBjahgykIK}faR$r9|bH}5tOC1>_(IPHT(&EZcR3#(&1 zN+&*0Amt{nic=HZQEFyy72u}bfQQFs+aiygcScH^^^azXf^7g!X_b zlD35T0Nt8DA4`G|F1koUbhNlM?he$czWg8(kCbJR5WG|MIEvtxs(7X7N{7~JHO8gY zJVVG5?LDxlQHk6@N5B|KDg+x2Jx7ditKp}AU!|TyUlTp$))H5V#8?Q_HoA!!<{LAK znT8s_BazoUJS9Lvb39oAHhOlamKHTzc-&Rn`ZEzj(!k}uL6*UvE6}F)D~kWEoL9S| zm2#hz;#em@VtZ%^G)z@sh@dR8Ek>edh~a5_*2i996Qk|XQ{A*avE3a&2) z?Mr?4p`8)O*Za2O_?~{|FX?CgqvCj^KNH6b{ac7ADZQMNBq@%=0-UCq#~lW;2ingc zVIj@cC#uNrvmAyU<$39zy%{m{plfOlAfhP6x+!pq&$KNVI7_<|+3T z@B)E~OUbOiVSv~NWl{KiMr<)(__FdoAZsjP8~YEftH@s%C9ISFZBf3D{q|ilF{}5p z*I>`!5d)|5Nm(7zI~_VkkM+)09faaQdV+jT&?)Y^TO%oh!9WGs3^xM%HA(nkh~=~? z;2cju1`dy(#7_9fxK(RpZ4_5bkT#LQ@8uxJog|j28J?fesqiIO?WZSBVL_XyWtHek znjb3$B7-F+_{438S^9v5xx^eeybYJ;M5I?FQUP?6P04bU)JNrZLeETw6~stSOy%(; y3udMZ$s%2z{+?_MNp1I2lUMxQ{BY^De^wv~!&|fFi2k%{+=(}@&>v@WQ~n0{02#ml delta 1952 zcmbtVZ%kWN6o2=%rLRPUmC`@Z78)oFXrT@kL7YZi#43ARU~_X2V@Ep~FgpHpxDO_S zsqupw87G1hXJpJpwo#yW(>Wo|#19%b=S<8%-HczHQK!qg!m^p@x$m`5EPgP)59ghC z?mhROKfm93MBM_X4X*VyXw zv~e9iZ-=Lw>-4qy8oRj7o;?t-&L#zRwfa3?SeN}2J(~TshD2z0p-3`5=LQsptSv9_G2z@NH4Ku$LQ9aT*hW=ce>pTr?50IKXqlU6Jjn0Z*wxwyDtuUmdZg$2Q?R zgVY)h@mvQSD1L*OpupikxzRDIn5#9wWV3}t!0L38Fw{6(DosSmSq217^B_@k_(-}j zs^ckIDMllyF=Iq(f;*}$ELAmzfn@HWM0rWYJ|E{JCB7JekTXMcNkJ)d15iKl>*nz? z+^IA(Ss@N+IN>%8x{mSuB@R~9Wk5?=ep*Cisj=jx4!jJ*WjTU3t^-+dm;PgO0kpeJ z%M||rwU=K=#!81DdY{bE;}2Kgvsiwrt=Wbkz`m^{bMW@2ClC$8M}>5KKh30USIec21C&4Fh7^TZ5yygx0!Lff}rCg~w=F?E%Mo?Fn+y<)t^ZIGeW1n0lbKeAF-Y<`D@<#u(7>9c3}cAqhXEdHdW(zDj^k zLKb*!Xf2t6OGDfEfEwC6bLp11o=gJUNP#{a5BF%#MSGOcu2)~6NbJwGhqD0?=~rL z+4zl;RZUOiFE&}&C)kea)Uyg!Sp&?Rv=IZ`Ik^g@b8HRDmN7fZgJUL?C&r3VUY4XH z$n;W4)(0ylGgL8z(dWhos7-BGIjMJ@UbKAaTZbv|zu%*QgiHOpcf14+6I6kp~WWwEvX9PX| zFp@b<7Boy|B7wUnUnQ3QkX>VDqZJn{P!h^D*2dAlLd4s399v}Ux4esrh{k7cv1*ooUJ0)srsWUX}-LQn7SM_= M=r~VrPP;Py1_8kvkpKVy -- 2.43.2