From: Richard Fairhurst <richard@systemed.net>
Date: Fri, 24 Apr 2009 20:12:43 +0000 (+0000)
Subject: a couple of minor revert fixes
X-Git-Tag: live~7532
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2acdfd71322fd29b4ce58efd1810b496469ef5cb?hp=82a54db3d9672c5752b8a9d659cdf46afcaaecd8;ds=sidebyside

a couple of minor revert fixes
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 6354949da..9d9a91f53 100644
--- 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 459f0bdde..a768b9992 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ