jenkins-bot has submitted this change and it was merged.
Change subject: Changed Variables
......................................................................
Changed Variables
*changed variables given to the send function from the UserMailer class
what they supposed to be
*the test-settings were for my testing purpose and was not supposed to be
commited
*added a version switch for mw 1.25 and below
*removed brackets that were added accidently
Change-Id: I1f2b00fd5544be63c737a4327058f1336df318ff
---
M includes/Mailer.class.php
1 file changed, 16 insertions(+), 4 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index da3f025..1c212c9 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -171,16 +171,28 @@
);
wfDebugLog( 'BS::Mailer', $sLog );
} else {
- $oStatus = UserMailer::send(
+ if( version_compare( $wgVersion, "1.25", '<=')){
+ $oStatus = UserMailer::send(
+ $aReceiver['mail'],
+ $oFromAddress,
+ $sCombinedSubject,
+ $sLocalCombinedMsg,
+ $oReplyToAddress,
+ $sHeaders
+ );
+ } else {
+ $oStatus = UserMailer::send(
$aReceiver['mail'],
$oFromAddress,
$sCombinedSubject,
$sLocalCombinedMsg,
- array ( 'replyTo' => $oReplyToAddress,
'headers' => $sHeaders )
- );
+ array(
+ 'replyTo' => $oReplyToAddress,
+ 'headers' => $sHeaders
+ ));
+ }
}
}
-
wfProfileOut( 'BS::'.__METHOD__ );
return $oStatus;
}
--
To view, visit https://gerrit.wikimedia.org/r/281436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f2b00fd5544be63c737a4327058f1336df318ff
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Jgoettlich <[email protected]>
Gerrit-Reviewer: Dvogel hallowelt <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
