Merge branch 'master' into notes

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 72fe3b241a374e4c514fdd5ce3b76ccd46254245..1ea3f7cb0ac6f8fb4adb34d044a2841f2d9656d0 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -5,6 +5,7 @@ class SiteController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
+  before_filter :require_oauth, :only => [:index]
 
   def index
     unless STATUS == :database_readonly or STATUS == :database_offline
@@ -51,7 +52,7 @@ class SiteController < ApplicationController
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     elsif params[:gpx]
-      trace = Trace.find(params[:gpx])
+      trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude
     end