Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove duplicate add_unsubscribe_link hash key (#13467) 

This double key was introduced in
f0c10edd28
This commit is contained in:
Martin Brennan 2021-06-22 11:25:39 +10:00 committed by GitHub
parent f9a1d2bb81
commit 1fdef0dc5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/mailers/user_notifications.rb
View File

@ -692,7 +692,7 @@ class UserNotifications < ActionMailer::Base
context: context, context: context,
username: username, username: username,
group_name: group_name, group_name: group_name,
add_unsubscribe_link: !user.staged, add_unsubscribe_link: !user.staged && !using_group_smtp,
mailing_list_mode: user.user_option.mailing_list_mode, mailing_list_mode: user.user_option.mailing_list_mode,
unsubscribe_url: post.unsubscribe_url(user), unsubscribe_url: post.unsubscribe_url(user),
allow_reply_by_email: allow_reply_by_email, allow_reply_by_email: allow_reply_by_email,
@ -713,8 +713,7 @@ class UserNotifications < ActionMailer::Base
locale: locale, locale: locale,
delivery_method_options: delivery_method_options, delivery_method_options: delivery_method_options,
use_from_address_for_reply_to: use_from_address_for_reply_to, use_from_address_for_reply_to: use_from_address_for_reply_to,
from: from_address, from: from_address
add_unsubscribe_link: !using_group_smtp
} }
unless translation_override_exists unless translation_override_exists