From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 25 May 2017 19:26:19 +0000 (-0700)
Subject: wfIsBadImage: Avoid deprecated wfMemcKey()
X-Git-Tag: 1.31.0-rc.0~3117^2
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=ee8eb0fc942da07116d4098e994b9b08c2abe4f9;p=lhc%2Fweb%2Fwiklou.git

wfIsBadImage: Avoid deprecated wfMemcKey()

Change-Id: I92133ed6a94902bdac2e9723f19a653a9962b757
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1859c02e43..e1d0520f62 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3515,7 +3515,9 @@ function wfIsBadImage( $name, $contextTitle = false, $blacklist = null ) {
 	}
 
 	$cache = ObjectCache::getLocalServerInstance( 'hash' );
-	$key = wfMemcKey( 'bad-image-list', ( $blacklist === null ) ? 'default' : md5( $blacklist ) );
+	$key = $cache->makeKey(
+		'bad-image-list', ( $blacklist === null ) ? 'default' : md5( $blacklist )
+	);
 	$badImages = $cache->get( $key );
 
 	if ( $badImages === false ) { // cache miss