From: addshore <addshorewiki@gmail.com>
Date: Sat, 7 May 2016 11:59:31 +0000 (+0100)
Subject: Stop using depreacted base_convert
X-Git-Tag: 1.31.0-rc.0~7051^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=86d95f938f3d7d3bd2b7fa5c38c2b9d3bfd14a0a;hp=07e23b39a45ea1257e6ee4c58c5ddb30804d9a0b;p=lhc%2Fweb%2Fwiklou.git

Stop using depreacted base_convert

Change-Id: I72df55ed64b592d039dcf256d49ff3d24b87fa34
---

diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php
index a364045aae..6c17de5ef2 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -1074,7 +1074,7 @@ final class SessionManager implements SessionManagerInterface {
 	 */
 	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 8ee1272294..3cd065d837 100644
--- a/includes/session/SessionProvider.php
+++ b/includes/session/SessionProvider.php
@@ -484,7 +484,7 @@ abstract class SessionProvider implements SessionProviderInterface, LoggerAwareI
 			// @codeCoverageIgnoreEnd
 		}
 		if ( strlen( $hash ) >= 40 ) {
-			$hash = wfBaseConvert( $hash, 16, 32, 32 );
+			$hash = \Wikimedia\base_convert( $hash, 16, 32, 32 );
 		}
 		return substr( $hash, -32 );
 	}