jenkins-bot has submitted this change and it was merged.
Change subject: Stop using depreacted base_convert
......................................................................
Stop using depreacted base_convert
Change-Id: I72df55ed64b592d039dcf256d49ff3d24b87fa34
---
M includes/session/SessionManager.php
M includes/session/SessionProvider.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/session/SessionManager.php
b/includes/session/SessionManager.php
index a364045..6c17de5 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -1074,7 +1074,7 @@
*/
public function generateSessionId() {
do {
- $id = wfBaseConvert( \MWCryptRand::generateHex( 40 ),
16, 32, 32 );
+ $id = \Wikimedia\base_convert(
\MWCryptRand::generateHex( 40 ), 16, 32, 32 );
$key = wfMemcKey( 'MWSession', $id );
} while ( isset( $this->allSessionIds[$id] ) || is_array(
$this->store->get( $key ) ) );
return $id;
diff --git a/includes/session/SessionProvider.php
b/includes/session/SessionProvider.php
index 8ee1272..3cd065d 100644
--- a/includes/session/SessionProvider.php
+++ b/includes/session/SessionProvider.php
@@ -484,7 +484,7 @@
// @codeCoverageIgnoreEnd
}
if ( strlen( $hash ) >= 40 ) {
- $hash = wfBaseConvert( $hash, 16, 32, 32 );
+ $hash = \Wikimedia\base_convert( $hash, 16, 32, 32 );
}
return substr( $hash, -32 );
}
--
To view, visit https://gerrit.wikimedia.org/r/287404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72df55ed64b592d039dcf256d49ff3d24b87fa34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
