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 "Delete autoload.ide.php"
[lhc/web/wiklou.git]
/
includes
/
MediaWiki.php
diff --git
a/includes/MediaWiki.php
b/includes/MediaWiki.php
index
a67cb9b
..
3620047
100644
(file)
--- a/
includes/MediaWiki.php
+++ b/
includes/MediaWiki.php
@@
-66,8
+66,6
@@
class MediaWiki {
* @return Title Title object to be $wgTitle
*/
private function parseTitle() {
* @return Title Title object to be $wgTitle
*/
private function parseTitle() {
- global $wgContLang;
-
$request = $this->context->getRequest();
$curid = $request->getInt( 'curid' );
$title = $request->getVal( 'title' );
$request = $this->context->getRequest();
$curid = $request->getInt( 'curid' );
$title = $request->getVal( 'title' );
@@
-88,12
+86,13
@@
class MediaWiki {
if ( !is_null( $ret ) && $ret->getNamespace() == NS_MEDIA ) {
$ret = Title::makeTitle( NS_FILE, $ret->getDBkey() );
}
if ( !is_null( $ret ) && $ret->getNamespace() == NS_MEDIA ) {
$ret = Title::makeTitle( NS_FILE, $ret->getDBkey() );
}
+ $contLang = MediaWikiServices::getInstance()->getContentLanguage();
// Check variant links so that interwiki links don't have to worry
// about the possible different language variants
// Check variant links so that interwiki links don't have to worry
// about the possible different language variants
- if (
$wgContLang->hasVariants()
- && !is_null( $ret ) && $ret->getArticleID() == 0
+ if (
+
$contLang->hasVariants()
&& !is_null( $ret ) && $ret->getArticleID() == 0
) {
) {
- $
wgC
ontLang->findVariantLink( $title, $ret );
+ $
c
ontLang->findVariantLink( $title, $ret );
}
}
}
}