X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/644220884100abdac9be5afdfeea7d94cb774c97..0d5be22cb517ebaaab5eb7af13150bf61e41df56:/app/controllers/user_preference_controller.rb

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index b07f4ecc5..d02313497 100644
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,6 +1,8 @@
 # Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
   before_filter :authorize
+  before_filter :require_allow_read_prefs, :only => [:read_one, :read]
+  before_filter :require_allow_write_prefs, :except => [:read_one, :read]
 
   def read_one
     pref = UserPreference.find(@user.id, params[:preference_key])
@@ -52,7 +54,7 @@ class UserPreferenceController < ApplicationController
 
   # update the entire set of preferences
   def update
-    do
+    begin
       p = XML::Parser.string(request.raw_post)
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("preferences", xml, ex.message)