dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Hard deprecate new SearchResult() and introduce RevisionSearchResult"
[lhc/web/wiklou.git]
/
includes
/
mail
/
EmailNotification.php
diff --git
a/includes/mail/EmailNotification.php
b/includes/mail/EmailNotification.php
index
0b77651
..
cba68ef
100644
(file)
--- a/
includes/mail/EmailNotification.php
+++ b/
includes/mail/EmailNotification.php
@@
-173,13
+173,23
@@
class EmailNotification {
* @param string $pageStatus
* @throws MWException
*/
* @param string $pageStatus
* @throws MWException
*/
- public function actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit,
- $oldid, $watchers, $pageStatus = 'changed' ) {
+ public function actuallyNotifyOnPageChange(
+ $editor,
+ $title,
+ $timestamp,
+ $summary,
+ $minorEdit,
+ $oldid,
+ $watchers,
+ $pageStatus = 'changed'
+ ) {
# we use $wgPasswordSender as sender's address
global $wgUsersNotifiedOnAllChanges;
global $wgEnotifWatchlist, $wgBlockDisablesLogin;
global $wgEnotifMinorEdits, $wgEnotifUserTalk;
# we use $wgPasswordSender as sender's address
global $wgUsersNotifiedOnAllChanges;
global $wgEnotifWatchlist, $wgBlockDisablesLogin;
global $wgEnotifMinorEdits, $wgEnotifUserTalk;
+ $messageCache = MediaWikiServices::getInstance()->getMessageCache();
+
# The following code is only run, if several conditions are met:
# 1. EmailNotification for pages (other than user_talk pages) must be enabled
# 2. minor edits (changes) are only regarded if the global flag indicates so
# The following code is only run, if several conditions are met:
# 1. EmailNotification for pages (other than user_talk pages) must be enabled
# 2. minor edits (changes) are only regarded if the global flag indicates so
@@
-210,7
+220,7
@@
class EmailNotification {
&& $this->canSendUserTalkEmail( $editor, $title, $minorEdit )
) {
$targetUser = User::newFromName( $title->getText() );
&& $this->canSendUserTalkEmail( $editor, $title, $minorEdit )
) {
$targetUser = User::newFromName( $title->getText() );
- $this->compose( $targetUser, self::USER_TALK );
+ $this->compose( $targetUser, self::USER_TALK
, $messageCache
);
$userTalkId = $targetUser->getId();
}
$userTalkId = $targetUser->getId();
}
@@
-229,7
+239,7
@@
class EmailNotification {
&& !( $wgBlockDisablesLogin && $watchingUser->getBlock() )
&& Hooks::run( 'SendWatchlistEmailNotification', [ $watchingUser, $title, $this ] )
) {
&& !( $wgBlockDisablesLogin && $watchingUser->getBlock() )
&& Hooks::run( 'SendWatchlistEmailNotification', [ $watchingUser, $title, $this ] )
) {
- $this->compose( $watchingUser, self::WATCHLIST );
+ $this->compose( $watchingUser, self::WATCHLIST
, $messageCache
);
}
}
}
}
}
}
@@
-241,7
+251,7
@@
class EmailNotification {
continue;
}
$user = User::newFromName( $name );
continue;
}
$user = User::newFromName( $name );
- $this->compose( $user, self::ALL_CHANGES );
+ $this->compose( $user, self::ALL_CHANGES
, $messageCache
);
}
$this->sendMails();
}
$this->sendMails();
@@
-288,8
+298,9
@@
class EmailNotification {
/**
* Generate the generic "this page has been changed" e-mail text.
/**
* Generate the generic "this page has been changed" e-mail text.
+ * @param MessageCache $messageCache
*/
*/
- private function composeCommonMailtext() {
+ private function composeCommonMailtext(
MessageCache $messageCache
) {
global $wgPasswordSender, $wgNoReplyAddress;
global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
global $wgEnotifImpersonal, $wgEnotifUseRealName;
global $wgPasswordSender, $wgNoReplyAddress;
global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
global $wgEnotifImpersonal, $wgEnotifUseRealName;
@@
-374,7
+385,7
@@
class EmailNotification {
$body = wfMessage( 'enotif_body' )->inContentLanguage()->plain();
$body = strtr( $body, $keys );
$body = wfMessage( 'enotif_body' )->inContentLanguage()->plain();
$body = strtr( $body, $keys );
- $body =
MessageCache::singleton()
->transform( $body, false, null, $this->title );
+ $body =
$messageCache
->transform( $body, false, null, $this->title );
$this->body = wordwrap( strtr( $body, $postTransformKeys ), 72 );
# Reveal the page editor's address as REPLY-TO address only if
$this->body = wordwrap( strtr( $body, $postTransformKeys ), 72 );
# Reveal the page editor's address as REPLY-TO address only if
@@
-406,12
+417,13
@@
class EmailNotification {
* Call sendMails() to send any mails that were queued.
* @param User $user
* @param string $source
* Call sendMails() to send any mails that were queued.
* @param User $user
* @param string $source
+ * @param MessageCache $messageCache
*/
*/
-
function compose( $user, $sourc
e ) {
+
private function compose( $user, $source, MessageCache $messageCach
e ) {
global $wgEnotifImpersonal;
if ( !$this->composed_common ) {
global $wgEnotifImpersonal;
if ( !$this->composed_common ) {
- $this->composeCommonMailtext();
+ $this->composeCommonMailtext(
$messageCache
);
}
if ( $wgEnotifImpersonal ) {
}
if ( $wgEnotifImpersonal ) {
@@
-424,7
+436,7
@@
class EmailNotification {
/**
* Send any queued mails
*/
/**
* Send any queued mails
*/
- function sendMails() {
+
private
function sendMails() {
global $wgEnotifImpersonal;
if ( $wgEnotifImpersonal ) {
$this->sendImpersonal( $this->mailTargets );
global $wgEnotifImpersonal;
if ( $wgEnotifImpersonal ) {
$this->sendImpersonal( $this->mailTargets );
@@
-440,9
+452,8
@@
class EmailNotification {
* @param User $watchingUser
* @param string $source
* @return Status
* @param User $watchingUser
* @param string $source
* @return Status
- * @private
*/
*/
- function sendPersonalised( $watchingUser, $source ) {
+
private
function sendPersonalised( $watchingUser, $source ) {
global $wgEnotifUseRealName;
// From the PHP manual:
// Note: The to parameter cannot be an address in the form of
global $wgEnotifUseRealName;
// From the PHP manual:
// Note: The to parameter cannot be an address in the form of
@@
-481,7
+492,7
@@
class EmailNotification {
* @param MailAddress[] $addresses
* @return Status|null
*/
* @param MailAddress[] $addresses
* @return Status|null
*/
- function sendImpersonal( $addresses ) {
+
private
function sendImpersonal( $addresses ) {
if ( empty( $addresses ) ) {
return null;
}
if ( empty( $addresses ) ) {
return null;
}