jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405686 )
Change subject: Replace deprecated wfSuppress- and wfRestoreWarnings functions
......................................................................
Replace deprecated wfSuppress- and wfRestoreWarnings functions
Change-Id: I38b1cf6ada62f575ca625c69a4c4d6e7788f1067
---
M includes/specials/SpecialMergeAccount.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialMergeAccount.php
b/includes/specials/SpecialMergeAccount.php
index 4b87a58..513974c 100644
--- a/includes/specials/SpecialMergeAccount.php
+++ b/includes/specials/SpecialMergeAccount.php
@@ -146,14 +146,14 @@
* @return array|mixed
*/
private function getWorkingPasswords() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$data =
RequestContext::getMain()->getRequest()->getSessionData(
'wsCentralAuthMigration' );
$passwords = unserialize(
gzinflate(
$this->xorString(
$data[$this->mSessionToken],
$this->mSessionKey ) ) );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( is_array( $passwords ) ) {
return $passwords;
}
--
To view, visit https://gerrit.wikimedia.org/r/405686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38b1cf6ada62f575ca625c69a4c4d6e7788f1067
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
