Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Reverted Use of real name commit
......................................................................
BsMailer: Reverted Use of real name commit
* I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
* Must be username, cause it is needed for GENDER destinction
* However realname is $2
Change-Id: Iad357f51d1a616b53a17a186158b232df6730c68
---
M includes/Mailer.class.php
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 1c69e62..e419aff 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -77,8 +77,8 @@
if ( $vReceiver instanceof User ) {
if ( $vReceiver->getEmail() ) {
$aEmailTo[] = array(
- 'mail' => new
MailAddress($vReceiver),
- 'greeting' =>
BsCore::getUserDisplayName( $vReceiver ),
+ 'mail' => new
MailAddress($vReceiver),
+ 'greeting' =>
$vReceiver->getName(),
);
}
} elseif ( strpos( $vReceiver, '@' ) !== false ) {
@@ -97,7 +97,7 @@
if ( $oUser->getEmail() ) {
$aEmailTo[] = array(
'mail' => new MailAddress(
$oUser ),
- 'greeting' =>
BsCore::getUserDisplayName( $vReceiver ),
+ 'greeting' =>
$vReceiver->getName(),
);
}
}
@@ -129,10 +129,7 @@
//Prepare message
if ( $aReceiver['greeting'] ) {
$oUser = User::newFromName(
$aReceiver['greeting'] );
- $sRealname = $oUser->getRealName();
- if ( empty( $sRealname ) ) {
- $sRealname = $aReceiver['greeting'];
- }
+ $sRealname = BsCore::getUserDisplayName( $oUser
);
$sGreeting = wfMessage(
'bs-email-greeting-receiver', $aReceiver['greeting'], $sRealname )
->inLanguage( $oUser->getOption(
'language' ) )
->text();
--
To view, visit https://gerrit.wikimedia.org/r/195512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad357f51d1a616b53a17a186158b232df6730c68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
