X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Finterwiki%2FClassicInterwikiLookup.php;h=d5103da97705c4535a6ddfe1a26c5319fcf9c6fa;hb=236488d398046838059f758b0915341648b64c7b;hp=883b5fac46aca4766749e68bc2f411994d66b40c;hpb=b170b4a14a94fb509c4b15ca4c5717c6976a32cc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php
index 883b5fac46..d5103da977 100644
--- a/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@ -1,6 +1,4 @@
 <?php
-namespace MediaWiki\Interwiki;
-
 /**
  * InterwikiLookup implementing the "classic" interwiki storage (hardcoded up to MW 1.26).
  *
@@ -21,14 +19,17 @@ namespace MediaWiki\Interwiki;
  *
  * @file
  */
-use \Cdb\Exception as CdbException;
-use \Cdb\Reader as CdbReader;
-use Database;
+
+namespace MediaWiki\Interwiki;
+
+use Cdb\Exception as CdbException;
+use Cdb\Reader as CdbReader;
 use Hooks;
 use Interwiki;
 use Language;
 use MapCacheLRU;
 use WANObjectCache;
+use Wikimedia\Rdbms\Database;
 
 /**
  * InterwikiLookup implementing the "classic" interwiki storage (hardcoded up to MW 1.26).
@@ -221,7 +222,7 @@ class ClassicInterwikiLookup implements InterwikiLookup {
 				}
 			}
 
-			$value = $this->getCacheValue( wfMemcKey( $prefix ) );
+			$value = $this->getCacheValue( wfWikiID() . ':' . $prefix );
 			// Site level
 			if ( $value == '' && $this->interwikiScopes >= 3 ) {
 				$value = $this->getCacheValue( "_{$this->thisSite}:{$prefix}" );
@@ -383,8 +384,6 @@ class ClassicInterwikiLookup implements InterwikiLookup {
 				. $e->getMessage() );
 		}
 
-		ksort( $data );
-
 		return array_values( $data );
 	}