From: Richard Fairhurst Date: Wed, 30 Apr 2008 22:59:30 +0000 (+0000) Subject: Potlatch 0.8c X-Git-Tag: live~7828 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/111b8651168b539cc8bb79055d99f181c2db78b4?ds=sidebyside Potlatch 0.8c --- diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 4afba1484..421444869 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -594,8 +594,8 @@ class AmfController < ApplicationController # the delete_with_relations_and_nodes_and_history method should do this, # but at present it just throws a 'precondition failed' way=way.to_i - db_now='@now'+(rand*100).to_i.to_s+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s - db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s + db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s + db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") createuniquenodes(way,db_uqn,[]) deleteuniquenoderelations(db_uqn,uid,db_now) diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index fab50c40a..ee6f67b70 100755 Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ