Update xid_to_int4 to use postgres version 1 calling convention

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 0a63d525373aa33892c08a243895aa90e3b57598..56fab0fc49cb60df161badc50c4384c8e1ce0d2b 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -507,7 +507,7 @@ class ChangesetController < ApplicationController
   # restrict changes to those closed during a particular time period
   def conditions_time(changesets, time)
     if time.nil?
   # restrict changes to those closed during a particular time period
   def conditions_time(changesets, time)
     if time.nil?

-      return changesets
+      changesets

     elsif time.count(",") == 1
       # if there is a range, i.e: comma separated, then the first is
       # low, second is high - same as with bounding boxes.
     elsif time.count(",") == 1
       # if there is a range, i.e: comma separated, then the first is
       # low, second is high - same as with bounding boxes.


@@ -517,10 +517,10 @@ class ChangesetController < ApplicationController
       raise OSM::APIBadUserInput, "bad time range" if times.size != 2
 
       from, to = times.collect { |t| Time.parse(t) }
       raise OSM::APIBadUserInput, "bad time range" if times.size != 2
 
       from, to = times.collect { |t| Time.parse(t) }

-      return changesets.where("closed_at >= ? and created_at <= ?", from, to)
+      changesets.where("closed_at >= ? and created_at <= ?", from, to)

     else
       # if there is no comma, assume its a lower limit on time
     else
       # if there is no comma, assume its a lower limit on time

-      return changesets.where("closed_at >= ?", Time.parse(time))
+      changesets.where("closed_at >= ?", Time.parse(time))

     end
     # stupid Time seems to throw both of these for bad parsing, so
     # we have to catch both and ensure the correct code path is taken.
     end
     # stupid Time seems to throw both of these for bad parsing, so
     # we have to catch both and ensure the correct code path is taken.