Merge branch 'mw-1.26'

1 files changed, 17 insertions, 4 deletions

diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index 02fbb080..33e50668 100644
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -115,6 +115,17 @@ class Interwiki {
 	}
 
 	/**
+	 * Purge the cache for an interwiki prefix
+	 * @param string $prefix
+	 * @since 1.26
+	 */
+	public static function invalidateCache( $prefix ) {
+		$cache = ObjectCache::getMainWANInstance();
+		$key = wfMemcKey( 'interwiki', $prefix );
+		$cache->delete( $key );
+	}
+
+	/**
 	 * Fetch interwiki prefix data from local cache in constant database.
 	 *
 	 * @note More logic is explained in DefaultSettings.
@@ -191,16 +202,18 @@ class Interwiki {
 	 * @return Interwiki|bool Interwiki if $prefix is valid, otherwise false
 	 */
 	protected static function load( $prefix ) {
-		global $wgMemc, $wgInterwikiExpiry;
+		global $wgInterwikiExpiry;
 
 		$iwData = array();
 		if ( !Hooks::run( 'InterwikiLoadPrefix', array( $prefix, &$iwData ) ) ) {
 			return Interwiki::loadFromArray( $iwData );
 		}
 
+		$cache = ObjectCache::getMainWANInstance();
+
 		if ( !$iwData ) {
 			$key = wfMemcKey( 'interwiki', $prefix );
-			$iwData = $wgMemc->get( $key );
+			$iwData = $cache->get( $key );
 			if ( $iwData === '!NONEXISTENT' ) {
 				// negative cache hit
 				return false;
@@ -232,13 +245,13 @@ class Interwiki {
 				'iw_local' => $iw->mLocal,
 				'iw_trans' => $iw->mTrans
 			);
-			$wgMemc->add( $key, $mc, $wgInterwikiExpiry );
+			$cache->set( $key, $mc, $wgInterwikiExpiry );
 
 			return $iw;
 		}
 
 		// negative cache hit
-		$wgMemc->add( $key, '!NONEXISTENT', $wgInterwikiExpiry );
+		$cache->set( $key, '!NONEXISTENT', $wgInterwikiExpiry );
 
 		return false;
 	}