Make sure all pages using the map layout call require_oauth

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 6a0ad40a7c02643a4cb096de6a24dc14ffd63d30..e0facfa932fc234580b17aba5fa16594639dbe9d 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -269,6 +269,7 @@ class ChangesetController < ApplicationController
     end
 
     if request.format == :html and !params[:bbox]
+      require_oauth
       render :action => :history, :layout => map_layout
     else
       changesets = conditions_nonempty(Changeset.all)
@@ -279,20 +280,14 @@ class ChangesetController < ApplicationController
         else
           changesets = changesets.where("false")
         end
-      end
-
-      if params[:friends] && @user
+      elsif params[:bbox]
+        changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
+      elsif params[:friends] && @user
         changesets = changesets.where(:user_id => @user.friend_users.public)
-      end
-
-      if params[:nearby] && @user
+      elsif params[:nearby] && @user
         changesets = changesets.where(:user_id => @user.nearby)
       end
 
-      if params[:bbox]
-        changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
-      end
-
       if params[:max_id]
         changesets = changesets.where("changesets.id <= ?", params[:max_id])
       end