github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 07:08:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Save email without confirmation when podmail is disabled.

Browse Source 
fixes #7195

closes #7455
This commit is contained in:
Mahonri Gibson
2017-05-15 23:41:23 +00:00
committed by Benjamin Neff
parent a6869197d8
commit 5739f67605
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/users_controller.rb
View File

@@ -220,15 +220,23 @@ class UsersController < ApplicationController
end
def change_email(user_data)
@user.unconfirmed_email = user_data[:email]
if @user.save
@user.send_confirm_email
if @user.unconfirmed_email
if AppConfig.mail.enable?
@user.unconfirmed_email = user_data[:email]
if @user.save
@user.send_confirm_email
flash.now[:notice] = t("users.update.unconfirmed_email_changed")
else
@user.reload # match user object with the database
flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
end
else
@user.reload # match user object with the database
flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
@user.email = user_data[:email]
if @user.save
flash.now[:notice] = t("users.update.settings_updated")
else
@user.reload
flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
end
end
end