jenkins-bot has submitted this change and it was merged.

Change subject: Add custom label text setting to be used for email output
......................................................................


Add custom label text setting to be used for email output

label-raw is likely to contain HTML which we don't want

Bug: T96087
Change-Id: Ia3ee1e9f56bec9129afb13e2af845717744a5c43
---
M ContactPage_body.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ContactPage_body.php b/ContactPage_body.php
index adfdb7d..29e1ea3 100644
--- a/ContactPage_body.php
+++ b/ContactPage_body.php
@@ -350,7 +350,9 @@
                                continue;
                        }
 
-                       if ( isset( $field['label-message'] ) ) {
+                       if ( isset( $field['contactpage-email-label'] ) ) {
+                               $name = $field['contactpage-email-label'];
+                       } elseif ( isset( $field['label-message'] ) ) {
                                $name = wfMessage( $field['label-message'] 
)->inContentLanguage()->text();
                        } else {
                                $name = $field['label'];

-- 
To view, visit https://gerrit.wikimedia.org/r/204188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3ee1e9f56bec9129afb13e2af845717744a5c43
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ContactPage
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to