a couple of minor revert fixes

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 6354949dac5cd9e245d4902adf83c55b776a4ea4..9d9a91f5398195d9fb7b2df5f2108191b0820d49 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -713,17 +713,17 @@ class AmfController < ApplicationController
   # Read POI from database
   # (only called on revert: POIs are usually read by whichways).
   #
-  # Returns array of id, long, lat, hash of tags, version.
+  # Returns array of id, long, lat, hash of tags, (current) version.
 
   def getpoi(id,timestamp) #:doc:
-    if timestamp == '' then
-      n = Node.find(id)
-    else
+    n = Node.find(id)
+    v = n.version
+    unless timestamp == ''
       n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])
     end
 
     if n
-      return [n.id, n.lon, n.lat, n.tags, n.version]
+      return [n.id, n.lon, n.lat, n.tags, v]
     else
       return [nil, nil, nil, {}, nil]
     end

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 459f0bdde926400109793667806152d51d199bda..a768b9992c04db80d8ee149c08c13ec29f871454 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ