Commit 2b5f20ef authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge pull request #6784 from cmrd-senya/deletion-redirect-fixup 

Redirect to "/users/sign_in" after AccountDeletion
parents d6171e53 77bd220e

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ Contributions are very welcome, the hard work is done! 
* Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788)

* Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782)

* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)

* Redirect to the sign-in page instead of the stream on account deletion [#6784](https://github.com/diaspora/diaspora/pull/6784)



## Bug fixes

* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/controllers/users_controller.rb

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class UsersController < ApplicationController 
    if params[:user] && params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password])

      current_user.close_account!

      sign_out current_user

      redirect_to(stream_path, :notice => I18n.t('users.destroy.success'))

      redirect_to(new_user_session_path(format: request[:format]), notice: I18n.t("users.destroy.success"))

    else

      if params[:user].present? && params[:user][:current_password].present?

        flash[:error] = t 'users.destroy.wrong_password'