Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / controllers / api / user_preferences_controller.rb

diff --git a/app/controllers/api/user_preferences_controller.rb b/app/controllers/api/user_preferences_controller.rb
index 40ccfccbbc4a222a841c67f312d6665a13998a10..d1bd6d6242bc5713ce28054630e26341f711bc28 100644 (file)
--- a/app/controllers/api/user_preferences_controller.rb
+++ b/app/controllers/api/user_preferences_controller.rb
@@ -1,12 +1,11 @@
-# Update and read user preferences, which are arbitrayr key/val pairs
+# Update and read user preferences, which are arbitrary key/val pairs

 module Api
   class UserPreferencesController < ApiController
 module Api
   class UserPreferencesController < ApiController

+    before_action :check_api_writable, :only => [:update_all, :update, :destroy]

     before_action :authorize
 
     authorize_resource
 
     before_action :authorize
 
     authorize_resource
 

-    around_action :api_call_handle_error
-

     before_action :set_request_formats
 
     ##
     before_action :set_request_formats
 
     ##


@@ -66,7 +65,7 @@ module Api
         pref.k = params[:preference_key]
       end
 
         pref.k = params[:preference_key]
       end
 

-      pref.v = request.raw_post.chomp
+      pref.v = request.raw_post.chomp.force_encoding("UTF-8")

       pref.save!
 
       render :plain => ""
       pref.save!
 
       render :plain => ""