Arseny1992 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319403
Change subject: 1.29wmf1 deployment blocker - Revert "Parser functions now
format numbers according to page language"
......................................................................
1.29wmf1 deployment blocker - Revert "Parser functions now format numbers
according to page language"
This reverts commit 4290f686c07265d40718fc3358f196de41bbde57.
Bug: T149840
Change-Id: I9e90f2284c96875c8e4807c9dedcd4922d11581f
---
M RELEASE-NOTES-1.28
M includes/parser/CoreParserFunctions.php
2 files changed, 16 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/319403/1
diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index a2a986f..4e445a5 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -223,8 +223,6 @@
Instead of --keep-uploads, use the same option to parserTests.php, but you
must specify a directory with --upload-dir.
* The 'jquery.arrowSteps' ResourceLoader module is now deprecated.
-* (T62604) Core parser functions returning a number now format the number
according
- to the page content language, not wiki content language.
* IP::isConfiguredProxy() and IP::isTrustedProxy() were removed. Callers should
migrate to using the same functions on a ProxyLookup instance, obtainable
from
MediaWikiServices.
diff --git a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index ef26db6..01cce02 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -487,58 +487,40 @@
return $mwObject->matchStartToEnd( $value );
}
- public static function formatRaw( $num, $raw, Language $language ) {
+ public static function formatRaw( $num, $raw ) {
if ( self::matchAgainstMagicword( 'rawsuffix', $raw ) ) {
return $num;
} else {
- return $language->formatNum( $num );
+ global $wgContLang;
+ return $wgContLang->formatNum( $num );
}
}
-
public static function numberofpages( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::pages(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::pages(), $raw );
}
-
public static function numberofusers( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::users(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::users(), $raw );
}
public static function numberofactiveusers( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::activeUsers(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::activeUsers(), $raw );
}
-
public static function numberofarticles( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::articles(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::articles(), $raw );
}
-
public static function numberoffiles( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::images(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::images(), $raw );
}
-
public static function numberofadmins( $parser, $raw = null ) {
- return self::formatRaw(
- SiteStats::numberingroup( 'sysop' ),
- $raw,
- $parser->getFunctionLang()
- );
+ return self::formatRaw( SiteStats::numberingroup( 'sysop' ),
$raw );
}
-
public static function numberofedits( $parser, $raw = null ) {
- return self::formatRaw( SiteStats::edits(), $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( SiteStats::edits(), $raw );
}
-
public static function pagesinnamespace( $parser, $namespace = 0, $raw
= null ) {
- return self::formatRaw(
- SiteStats::pagesInNs( intval( $namespace ) ),
- $raw,
- $parser->getFunctionLang()
- );
+ return self::formatRaw( SiteStats::pagesInNs( intval(
$namespace ) ), $raw );
}
public static function numberingroup( $parser, $name = '', $raw = null
) {
- return self::formatRaw(
- SiteStats::numberingroup( strtolower( $name ) ),
- $raw,
- $parser->getFunctionLang()
- );
+ return self::formatRaw( SiteStats::numberingroup( strtolower(
$name ) ), $raw );
}
/**
@@ -745,7 +727,7 @@
$title = Title::makeTitleSafe( NS_CATEGORY, $name );
if ( !$title ) { # invalid title
- return self::formatRaw( 0, $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( 0, $raw );
}
$wgContLang->findVariantLink( $name, $title, true );
@@ -771,7 +753,7 @@
}
$count = $cache[$name][$type];
- return self::formatRaw( $count, $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( $count, $raw );
}
/**
@@ -787,7 +769,7 @@
$title = Title::newFromText( $page );
if ( !is_object( $title ) ) {
- return self::formatRaw( 0, $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( 0, $raw );
}
// fetch revision from cache/database and return the value
@@ -797,7 +779,7 @@
// We've had bugs where rev_len was not being recorded
for empty pages, see T135414
$length = 0;
}
- return self::formatRaw( $length, $raw,
$parser->getFunctionLang() );
+ return self::formatRaw( $length, $raw );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/319403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e90f2284c96875c8e4807c9dedcd4922d11581f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arseny1992 <arsen...@windowslive.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
