X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b01261760893de04dda650a427ceb59beea80004..e1d873cde99eaa6eafaca6659c221ec2b98de36e:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index d7b73c14e..a086c9f69 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -151,7 +151,11 @@ class UserController < ApplicationController @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] end - @user.description = params[:user][:description] + if params[:user][:description] != @user.description + @user.description = params[:user][:description] + @user.description_format = "markdown" + end + @user.languages = params[:user][:languages].split(",") case params[:image_action] @@ -718,7 +722,7 @@ private # Choose the layout to use. See # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts def choose_layout - oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true) + oauth_url = url_for(:controller => :oauth, :action => :authorize, :only_path => true) if [ 'api_details' ].include? action_name nil