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
Mass conversion of $wgContLang to service
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
AllMessagesTablePager.php
diff --git
a/includes/specials/pagers/AllMessagesTablePager.php
b/includes/specials/pagers/AllMessagesTablePager.php
index
e6a0f0b
..
2e451ec
100644
(file)
--- a/
includes/specials/pagers/AllMessagesTablePager.php
+++ b/
includes/specials/pagers/AllMessagesTablePager.php
@@
-19,6
+19,7
@@
* @ingroup Pager
*/
* @ingroup Pager
*/
+use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\FakeResultWrapper;
/**
use Wikimedia\Rdbms\FakeResultWrapper;
/**
@@
-27,8
+28,6
@@
use Wikimedia\Rdbms\FakeResultWrapper;
*
* @ingroup Pager
*/
*
* @ingroup Pager
*/
-use MediaWiki\MediaWikiServices;
-
class AllMessagesTablePager extends TablePager {
protected $filter, $prefix, $langcode, $displayPrefix;
class AllMessagesTablePager extends TablePager {
protected $filter, $prefix, $langcode, $displayPrefix;
@@
-54,13
+53,12
@@
class AllMessagesTablePager extends TablePager {
$this->mDefaultDirection = IndexPager::DIR_DESCENDING;
$this->mLimitsShown = [ 20, 50, 100, 250, 500, 5000 ];
$this->mDefaultDirection = IndexPager::DIR_DESCENDING;
$this->mLimitsShown = [ 20, 50, 100, 250, 500, 5000 ];
- global $wgContLang;
-
$this->talk = $this->msg( 'talkpagelinktext' )->escaped();
$this->talk = $this->msg( 'talkpagelinktext' )->escaped();
- $this->lang = ( $langObj ? $langObj : $wgContLang );
+ $contLang = MediaWikiServices::getInstance()->getContentLanguage();
+ $this->lang = $langObj ?: $contLang;
$this->langcode = $this->lang->getCode();
$this->langcode = $this->lang->getCode();
- $this->foreign = !$this->lang->equals( $
wgC
ontLang );
+ $this->foreign = !$this->lang->equals( $
c
ontLang );
$request = $this->getRequest();
$request = $this->getRequest();
@@
-357,7
+355,7
@@
class AllMessagesTablePager extends TablePager {
$formatted = strval( $this->formatValue( 'am_actual', $row->am_actual ) );
if ( $formatted === '' ) {
$formatted = strval( $this->formatValue( 'am_actual', $row->am_actual ) );
if ( $formatted === '' ) {
- $formatted =
' '
;
+ $formatted =
"\u{00A0}"
;
}
$s .= Xml::tags( 'td', $this->getCellAttrs( 'am_actual', $row->am_actual ), $formatted )
}
$s .= Xml::tags( 'td', $this->getCellAttrs( 'am_actual', $row->am_actual ), $formatted )