dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add a hook into LanguageConverter#getPreferredVariant() to allow extensions...
[lhc/web/wiklou.git]
/
includes
/
interwiki
/
ClassicInterwikiLookup.php
diff --git
a/includes/interwiki/ClassicInterwikiLookup.php
b/includes/interwiki/ClassicInterwikiLookup.php
index
883b5fa
..
d5103da
100644
(file)
--- a/
includes/interwiki/ClassicInterwikiLookup.php
+++ b/
includes/interwiki/ClassicInterwikiLookup.php
@@
-1,6
+1,4
@@
<?php
<?php
-namespace MediaWiki\Interwiki;
-
/**
* InterwikiLookup implementing the "classic" interwiki storage (hardcoded up to MW 1.26).
*
/**
* InterwikiLookup implementing the "classic" interwiki storage (hardcoded up to MW 1.26).
*
@@
-21,14
+19,17
@@
namespace MediaWiki\Interwiki;
*
* @file
*/
*
* @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 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).
/**
* InterwikiLookup implementing the "classic" interwiki storage (hardcoded up to MW 1.26).
@@
-221,7
+222,7
@@
class ClassicInterwikiLookup implements InterwikiLookup {
}
}
}
}
- $value = $this->getCacheValue( wf
MemcKey( $prefix )
);
+ $value = $this->getCacheValue( wf
WikiID() . ':' . $prefix
);
// Site level
if ( $value == '' && $this->interwikiScopes >= 3 ) {
$value = $this->getCacheValue( "_{$this->thisSite}:{$prefix}" );
// Site level
if ( $value == '' && $this->interwikiScopes >= 3 ) {
$value = $this->getCacheValue( "_{$this->thisSite}:{$prefix}" );
@@
-383,8
+384,6
@@
class ClassicInterwikiLookup implements InterwikiLookup {
. $e->getMessage() );
}
. $e->getMessage() );
}
- ksort( $data );
-
return array_values( $data );
}
return array_values( $data );
}