jenkins-bot has submitted this change and it was merged.
Change subject: Removed User::editToken() (deprecated since 1.19)
......................................................................
Removed User::editToken() (deprecated since 1.19)
Change-Id: I734e9637317c0737e96e963bafb10ef966d6d172
---
M RELEASE-NOTES-1.27
M includes/user/User.php
2 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0e44e71..fa36eb5 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -188,6 +188,7 @@
* OutputPage::appendSubtitle() was removed (deprecated since 1.19).
* OutputPage::loginToUse() was removed (deprecated since 1.19).
* Article::loadContent() was removed (deprecated since 1.19).
+* User::editToken() was removed (deprecated since 1.19).
== Compatibility ==
diff --git a/includes/user/User.php b/includes/user/User.php
index 2ac0f2c..fed9664 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4116,19 +4116,6 @@
}
/**
- * Alias for getEditToken.
- * @deprecated since 1.19, use getEditToken instead.
- *
- * @param string|array $salt Array of Strings Optional
function-specific data for hashing
- * @param WebRequest|null $request WebRequest object to use or null to
use $wgRequest
- * @return string The new edit token
- */
- public function editToken( $salt = '', $request = null ) {
- wfDeprecated( __METHOD__, '1.19' );
- return $this->getEditToken( $salt, $request );
- }
-
- /**
* Internal implementation for self::getEditToken() and
* self::matchEditToken().
*
--
To view, visit https://gerrit.wikimedia.org/r/259415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I734e9637317c0737e96e963bafb10ef966d6d172
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
