Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129940
Change subject: $wgEnotifUseRealName: Check, if realname is non-empty
......................................................................
$wgEnotifUseRealName: Check, if realname is non-empty
When $wgEnotifUseRealName is true and no realname is given, the email
notification will contain a empty string, so checking the realname first
Change-Id: I1b76d9eae8ada8ca2eee8fa93d7119fbff44269d
---
M includes/UserMailer.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/129940/1
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 2094b62..d33a75b 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -58,7 +58,7 @@
if ( $this->address ) {
if ( $this->name != '' && !wfIsWindows() ) {
global $wgEnotifUseRealName;
- $name = ( $wgEnotifUseRealName &&
$this->realName ) ? $this->realName : $this->name;
+ $name = ( $wgEnotifUseRealName &&
$this->realName !== '' ) ? $this->realName : $this->name;
$quoted = UserMailer::quotedPrintable( $name );
if ( strpos( $quoted, '.' ) !== false ||
strpos( $quoted, ',' ) !== false ) {
$quoted = '"' . $quoted . '"';
@@ -761,7 +761,8 @@
$keys['$PAGEEDITOR_EMAIL'] = wfMessage( 'noemailtitle'
)->inContentLanguage()->text();
} else {
- $keys['$PAGEEDITOR'] = $wgEnotifUseRealName ?
$this->editor->getRealName() : $this->editor->getName();
+ $keys['$PAGEEDITOR'] = $wgEnotifUseRealName &&
$this->editor->getRealName() !== ''
+ ? $this->editor->getRealName() :
$this->editor->getName();
$emailPage = SpecialPage::getSafeTitleFor( 'Emailuser',
$this->editor->getName() );
$keys['$PAGEEDITOR_EMAIL'] =
$emailPage->getCanonicalURL();
}
@@ -867,7 +868,8 @@
array( '$WATCHINGUSERNAME',
'$PAGEEDITDATE',
'$PAGEEDITTIME' ),
- array( $wgEnotifUseRealName ?
$watchingUser->getRealName() : $watchingUser->getName(),
+ array( $wgEnotifUseRealName &&
$watchingUser->getRealName() !== ''
+ ? $watchingUser->getRealName() :
$watchingUser->getName(),
$wgContLang->userDate( $this->timestamp,
$watchingUser ),
$wgContLang->userTime( $this->timestamp,
$watchingUser ) ),
$this->body );
--
To view, visit https://gerrit.wikimedia.org/r/129940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b76d9eae8ada8ca2eee8fa93d7119fbff44269d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
