diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
| commit | 0fa0836e63674104cea5095c5336bab8587d8634 (patch) | |
| tree | bcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /app/views/user_mailer/email_changed.html.haml | |
| parent | c074b226b68d81b0503f935dc81b74cd11b11d67 (diff) | |
| parent | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/views/user_mailer/email_changed.html.haml')
| -rw-r--r-- | app/views/user_mailer/email_changed.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml index 7e82f23e4..0802aaf96 100644 --- a/app/views/user_mailer/email_changed.html.haml +++ b/app/views/user_mailer/email_changed.html.haml @@ -38,7 +38,7 @@ %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 } %tbody %tr - %td= @resource.unconfirmed_email + %td= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody |