jenkins-bot has submitted this change and it was merged.
Change subject: Remove footer from email notification excerpt
......................................................................
Remove footer from email notification excerpt
Bug: T127098
Change-Id: I7de634ddcde65cb006afc18e95d83229ecbda6c1
---
M Hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 8e2f61e..e4a2d0f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1082,7 +1082,9 @@
$autoSubject = wfMessage( 'defemailsubject', $from->name
)->inContentLanguage()->text();
if ( $subject === $autoSubject ) {
- $preview = $wgContLang->truncate( $text, 125 );
+ $autoFooter = "\n\n-- \n" . wfMessage(
'emailuserfooter', $from->name, $address->name )->inContentLanguage()->text();
+ $textWithoutFooter = preg_replace( '/' . preg_quote(
$autoFooter, '/' ) . '$/', '', $text );
+ $preview = $wgContLang->truncate( $textWithoutFooter,
125 );
} else {
$preview = $subject;
}
--
To view, visit https://gerrit.wikimedia.org/r/272836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7de634ddcde65cb006afc18e95d83229ecbda6c1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
