jenkins-bot has submitted this change and it was merged.
Change subject: Remove deprecated calling style of UserMailer::send()
......................................................................
Remove deprecated calling style of UserMailer::send()
Depends-On: I513639f706ce16334180908f55638eebf8a4de80
Depends-On: I3fce6c666e2c878a221e2e4c6acacfd0254d173a
Change-Id: I475932f37a579dd86bfd98e6b14509d6ba86f128
---
M RELEASE-NOTES-1.27
M includes/mail/UserMailer.php
2 files changed, 3 insertions(+), 12 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index b6161da..0aebf38 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -398,9 +398,11 @@
* Skin::getUsableSkins() was removed (deprecated since 1.23).
* LoadBalancer::pickRandom() was removed (deprecated in 1.21).
* Article::getUndoText() and WikiPage::getUndoText were removed (deprecated
since
- 1.21).
+ 1.21).
* DifferenceEngine::setText() was removed (deprecated in 1.21).
* Title::newFromRedirectArray() was removed (deprecated in 1.21).
+* UserMailer::send() no longer accepts $replyto as the 5th argument and
$contentType
+ as the 6th. These must be passed in the options array now.
== Compatibility ==
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 1c7fb98..1059d7b 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -107,9 +107,6 @@
* 'contentType' string default 'text/plain; charset=UTF-8'
* 'headers' array Extra headers to set
*
- * Previous versions of this function had $replyto as the 5th argument
and $contentType
- * as the 6th. These are still supported for backwards compatability,
but deprecated.
- *
* @throws MWException
* @throws Exception
* @return Status
@@ -117,14 +114,6 @@
public static function send( $to, $from, $subject, $body, $options = []
) {
global $wgAllowHTMLEmail;
- if ( !is_array( $options ) ) {
- // Old calling style
- wfDeprecated( __METHOD__ . ' with $replyto as 5th
parameter', '1.26' );
- $options = [ 'replyTo' => $options ];
- if ( func_num_args() === 6 ) {
- $options['contentType'] = func_get_arg( 5 );
- }
- }
if ( !isset( $options['contentType'] ) ) {
$options['contentType'] = 'text/plain; charset=UTF-8';
}
--
To view, visit https://gerrit.wikimedia.org/r/265435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I475932f37a579dd86bfd98e6b14509d6ba86f128
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
