repair bad merge, recover missing code commmit

This commit is contained in:
Matt Farnsworth 2015-11-26 18:57:16 +02:00
parent 1b8c5b50b2
commit e409cde9b4

View file

@ -515,9 +515,8 @@ class Epp::Domain < Domain
statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
statuses.delete(DomainStatus::PENDING_DELETE)
DomainMailer.delete_confirmation(id, deliver_emails).deliver
# TODO: confirm that this actually makes sense
clean_pendings! if valid? && set_pending_delete!
clean_pendings!
set_pending_delete!
true
end