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
Have TitleParser::parseTitle() default to NS_MAIN to match Title
[lhc/web/wiklou.git]
/
includes
/
parser
/
CoreParserFunctions.php
diff --git
a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index
3c47de3
..
ae7ca6d
100644
(file)
--- a/
includes/parser/CoreParserFunctions.php
+++ b/
includes/parser/CoreParserFunctions.php
@@
-135,14
+135,13
@@
class CoreParserFunctions {
}
public static function ns( $parser, $part1 = '' ) {
}
public static function ns( $parser, $part1 = '' ) {
- global $wgContLang;
if ( intval( $part1 ) || $part1 == "0" ) {
$index = intval( $part1 );
} else {
if ( intval( $part1 ) || $part1 == "0" ) {
$index = intval( $part1 );
} else {
- $index = $
wgContLang
->getNsIndex( str_replace( ' ', '_', $part1 ) );
+ $index = $
parser->getContentLanguage()
->getNsIndex( str_replace( ' ', '_', $part1 ) );
}
if ( $index !== false ) {
}
if ( $index !== false ) {
- return $
wgContLang
->getFormattedNsText( $index );
+ return $
parser->getContentLanguage()
->getFormattedNsText( $index );
} else {
return [ 'found' => false ];
}
} else {
return [ 'found' => false ];
}
@@
-197,13
+196,11
@@
class CoreParserFunctions {
}
public static function lcfirst( $parser, $s = '' ) {
}
public static function lcfirst( $parser, $s = '' ) {
- global $wgContLang;
- return $wgContLang->lcfirst( $s );
+ return $parser->getContentLanguage()->lcfirst( $s );
}
public static function ucfirst( $parser, $s = '' ) {
}
public static function ucfirst( $parser, $s = '' ) {
- global $wgContLang;
- return $wgContLang->ucfirst( $s );
+ return $parser->getContentLanguage()->ucfirst( $s );
}
/**
}
/**
@@
-212,8
+209,7
@@
class CoreParserFunctions {
* @return string
*/
public static function lc( $parser, $s = '' ) {
* @return string
*/
public static function lc( $parser, $s = '' ) {
- global $wgContLang;
- return $parser->markerSkipCallback( $s, [ $wgContLang, 'lc' ] );
+ return $parser->markerSkipCallback( $s, [ $parser->getContentLanguage(), 'lc' ] );
}
/**
}
/**
@@
-222,8
+218,7
@@
class CoreParserFunctions {
* @return string
*/
public static function uc( $parser, $s = '' ) {
* @return string
*/
public static function uc( $parser, $s = '' ) {
- global $wgContLang;
- return $parser->markerSkipCallback( $s, [ $wgContLang, 'uc' ] );
+ return $parser->markerSkipCallback( $s, [ $parser->getContentLanguage(), 'uc' ] );
}
public static function localurl( $parser, $s = '', $arg = null ) {
}
public static function localurl( $parser, $s = '', $arg = null ) {
@@
-742,7
+737,6
@@
class CoreParserFunctions {
* @return string
*/
public static function pagesincategory( $parser, $name = '', $arg1 = null, $arg2 = null ) {
* @return string
*/
public static function pagesincategory( $parser, $name = '', $arg1 = null, $arg2 = null ) {
- global $wgContLang;
static $magicWords = null;
if ( is_null( $magicWords ) ) {
$magicWords = $parser->getMagicWordFactory()->newArray( [
static $magicWords = null;
if ( is_null( $magicWords ) ) {
$magicWords = $parser->getMagicWordFactory()->newArray( [
@@
-772,7
+766,7
@@
class CoreParserFunctions {
if ( !$title ) { # invalid title
return self::formatRaw( 0, $raw, $parser->getFunctionLang() );
}
if ( !$title ) { # invalid title
return self::formatRaw( 0, $raw, $parser->getFunctionLang() );
}
- $
wgContLang
->findVariantLink( $name, $title, true );
+ $
parser->getContentLanguage()
->findVariantLink( $name, $title, true );
// Normalize name for cache
$name = $title->getDBkey();
// Normalize name for cache
$name = $title->getDBkey();