X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FBlock.php;h=2c935df8ec5d58e18be8e1d64f89bd63acb2714d;hb=4fad94948359ab67e312355534977138754c123b;hp=b6b3ae05f1c8ce461a9619b528ce7565b46efd92;hpb=132c1ad73ffda918bbd1e011487765b80ddd2c9c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Block.php b/includes/Block.php
index b6b3ae05f1..2c935df8ec 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
 use MediaWiki\MediaWikiServices;
 
@@ -709,7 +710,7 @@ class Block {
 		// than getting the msg raw and explode()'ing it.
 		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		$lines = $cache->getWithSetCallback(
-			wfMemcKey( 'ipb', 'autoblock', 'whitelist' ),
+			$cache->makeKey( 'ipb', 'autoblock', 'whitelist' ),
 			$cache::TTL_DAY,
 			function ( $curValue, &$ttl, array &$setOpts ) {
 				$setOpts += Database::getCacheSetOptions( wfGetDB( DB_REPLICA ) );
@@ -828,7 +829,6 @@ class Block {
 	 * @return bool
 	 */
 	public function deleteIfExpired() {
-
 		if ( $this->isExpired() ) {
 			wfDebug( "Block::deleteIfExpired() -- deleting\n" );
 			$this->delete();
@@ -1110,7 +1110,6 @@ class Block {
 	 *     not be the same as the target you gave if you used $vagueTarget!
 	 */
 	public static function newFromTarget( $specificTarget, $vagueTarget = null, $fromMaster = false ) {
-
 		list( $target, $type ) = self::parseTarget( $specificTarget );
 		if ( $type == Block::TYPE_ID || $type == Block::TYPE_AUTO ) {
 			return Block::newFromID( $target );