Stop using depreacted base_convert
authoraddshore <addshorewiki@gmail.com>
Sat, 7 May 2016 11:59:31 +0000 (12:59 +0100)
committeraddshore <addshorewiki@gmail.com>
Sat, 7 May 2016 11:59:31 +0000 (12:59 +0100)
Change-Id: I72df55ed64b592d039dcf256d49ff3d24b87fa34

includes/session/SessionManager.php
includes/session/SessionProvider.php

index a364045..6c17de5 100644 (file)
@@ -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;
index 8ee1272..3cd065d 100644 (file)
@@ -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 );
        }