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 "Show protection log on creation-protected pages"
[lhc/web/wiklou.git]
/
includes
/
changes
/
EnhancedChangesList.php
diff --git
a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index
03f63f6
..
55cb9ed
100644
(file)
--- a/
includes/changes/EnhancedChangesList.php
+++ b/
includes/changes/EnhancedChangesList.php
@@
-98,20
+98,21
@@
class EnhancedChangesList extends ChangesList {
* @return string
*/
public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
* @return string
*/
public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
-
$date = $this->getLanguage()->userDate(
$rc->mAttribs['rc_timestamp'],
$this->getUser()
);
$date = $this->getLanguage()->userDate(
$rc->mAttribs['rc_timestamp'],
$this->getUser()
);
+ if ( $this->lastdate === '' ) {
+ $this->lastdate = $date;
+ }
$ret = '';
$ret = '';
- # If it's a new day,
add the headline and flush the cach
e
- if ( $date != $this->lastdate ) {
- # Process current cache
+ # If it's a new day,
flush the cache and update $this->lastdat
e
+ if ( $date !=
=
$this->lastdate ) {
+ # Process current cache
(uses $this->lastdate to generate a heading)
$ret = $this->recentChangesBlock();
$this->rc_cache = [];
$ret = $this->recentChangesBlock();
$this->rc_cache = [];
- $ret .= Xml::element( 'h4', null, $date ) . "\n";
$this->lastdate = $date;
}
$this->lastdate = $date;
}
@@
-243,8
+244,7
@@
class EnhancedChangesList extends ChangesList {
$text = $userlink;
$text .= $this->getLanguage()->getDirMark();
if ( $count > 1 ) {
$text = $userlink;
$text .= $this->getLanguage()->getDirMark();
if ( $count > 1 ) {
- // @todo FIXME: Hardcoded '×'. Should be a message.
- $formattedCount = $this->getLanguage()->formatNum( $count ) . '×';
+ $formattedCount = $this->msg( 'ntimes' )->numParams( $count )->escaped();
$text .= ' ' . $this->msg( 'parentheses' )->rawParams( $formattedCount )->escaped();
}
array_push( $users, $text );
$text .= ' ' . $this->msg( 'parentheses' )->rawParams( $formattedCount )->escaped();
}
array_push( $users, $text );
@@
-686,7
+686,9
@@
class EnhancedChangesList extends ChangesList {
}
$attribs = $data['attribs'];
unset( $data['attribs'] );
}
$attribs = $data['attribs'];
unset( $data['attribs'] );
- $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 'isReservedDataAttribute' ] );
+ $attribs = wfArrayFilterByKey( $attribs, function ( $key ) {
+ return $key === 'class' || Sanitizer::isReservedDataAttribute( $key );
+ } );
$line = Html::openElement( 'table', $attribs ) . Html::openElement( 'tr' );
$line .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow-space"></span>';
$line = Html::openElement( 'table', $attribs ) . Html::openElement( 'tr' );
$line .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow-space"></span>';
@@
-763,7
+765,11
@@
class EnhancedChangesList extends ChangesList {
}
}
}
}
- return '<div>' . $blockOut . '</div>';
+ if ( $blockOut === '' ) {
+ return '';
+ }
+ // $this->lastdate is kept up to date by recentChangesLine()
+ return Xml::element( 'h4', null, $this->lastdate ) . "\n<div>" . $blockOut . '</div>';
}
/**
}
/**