From 2acdfd71322fd29b4ce58efd1810b496469ef5cb Mon Sep 17 00:00:00 2001
From: Richard Fairhurst <richard@systemed.net>
Date: Fri, 24 Apr 2009 20:12:43 +0000
Subject: [PATCH] a couple of minor revert fixes

---
 app/controllers/amf_controller.rb |  10 +++++-----
 public/potlatch/potlatch.swf      | Bin 175143 -> 175159 bytes
 2 files changed, 5 insertions(+), 5 deletions(-)

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 459f0bdde926400109793667806152d51d199bda..a768b9992c04db80d8ee149c08c13ec29f871454 100755
GIT binary patch
delta 121
zcmV-<0EYjk*b2AU3I#@2QwTS)1s*m5=Yu3Rw<I<J_Lc$!1(zJn0Vx8T1eY+N0Y$fr
z%>gO_2&)2?1^@}^0hb}l0Ts8?&H*q10r{5%&;dvRgO^Rv0eA}q0vwhF00~F|1pt@8
b&;gMNCjFKJ00{*G9G8L10Ts7z(E+&HPogIk

delta 109
zcmV-z0FwW=*b1lE3I#@2QwS%q1s*m5*MlTBw<I<J_Lc(l1eYAm0Vx8D1eY+N0Y$fr
z%>gO_2%7?y1^@}^0hb}l0Ts8?&H*q10qK_n&;dvRbC*rf0eF|y&;g7IHvN_Z00{*G
P9G8L10Ts7@(E+&H6KW>3

-- 
2.43.2