Download as
Browse Code »

Commit 2808937d71744112577f31ecae7efbf46275bc66

Authored by Rodrigo Souto
1 parent 08b30ebf
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

change-password: rescue any exception

Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @2808937
@@ -130,12 +130,12 @@ class AccountController < ApplicationController @@ -130,12 +130,12 @@ class AccountController < ApplicationController
130 if request.post? 130 if request.post?
131 @user = current_user 131 @user = current_user
132 begin 132 begin
133 - @user.change_password!(params[:current_password],  
134 - params[:new_password],  
135 - params[:new_password_confirmation])  
136 - session[:notice] = _('Your password has been changed successfully!')  
137 - redirect_to :action => 'index'  
138 - rescue 133 + @user.change_password!(params[:current_password],
  134 + params[:new_password],
  135 + params[:new_password_confirmation])
  136 + session[:notice] = _('Your password has been changed successfully!')
  137 + redirect_to :action => 'index'
  138 + rescue Exception
139 end 139 end
140 end 140 end
141 end 141 end