jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364616 )
Change subject: Restore unsubscribe tag replacement
......................................................................
Restore unsubscribe tag replacement
Bug: T170302
Change-Id: If4eab0a9ab95980445b606a5f7b47a7980ea0596
---
M sites/all/modules/thank_you/generators/ThankYou.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/generators/ThankYou.php
b/sites/all/modules/thank_you/generators/ThankYou.php
index fa6fc89..9eb26cd 100644
--- a/sites/all/modules/thank_you/generators/ThankYou.php
+++ b/sites/all/modules/thank_you/generators/ThankYou.php
@@ -28,6 +28,7 @@
'/\[endifRecurringProblem\]<\/p>/' => "</p>\n{% endif
%}",
'/(<p>)?\[ifRecurring\]\s*/' => "{% if recurring
%}\n\\1",
'/\s*\[endifRecurring\]\s*(<\/p>)?/' => "\\1\n{% endif
%}",
+ '/\[#?unsubscribe ((?:(?!\]).)*)\]/' => '<a href="{{
unsubscribe_link | raw }}">$1</a>',
// All of the thank you letter's if...endif blocks
should be outside p tags, not inside
'/<p>\s*({%\s*if [^}]+})\s*/i' => "\\1\n<p>",
'/\s*{%\s*endif\s*%}\s*<\/p>/i' => "</p>\n{% endif %}",
--
To view, visit https://gerrit.wikimedia.org/r/364616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4eab0a9ab95980445b606a5f7b47a7980ea0596
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Mepps <me...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
