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 "resourceloader: Use Date.now() for mw.now() instead of '+new Date'"
[lhc/web/wiklou.git]
/
includes
/
revisiondelete
/
RevDelFileItem.php
diff --git
a/includes/revisiondelete/RevDelFileItem.php
b/includes/revisiondelete/RevDelFileItem.php
index
ff01cee
..
62bafe9
100644
(file)
--- a/
includes/revisiondelete/RevDelFileItem.php
+++ b/
includes/revisiondelete/RevDelFileItem.php
@@
-19,6
+19,8
@@
* @ingroup RevisionDelete
*/
* @ingroup RevisionDelete
*/
+use Wikimedia\Rdbms\IDatabase;
+
/**
* Item class for an oldimage table row
*/
/**
* Item class for an oldimage table row
*/
@@
-116,19
+118,19
@@
class RevDelFileItem extends RevDelItem {
* @return string
*/
protected function getLink() {
* @return string
*/
protected function getLink() {
- $date =
htmlspecialchars(
$this->list->getLanguage()->userTimeAndDate(
- $this->file->getTimestamp(), $this->list->getUser() )
)
;
+ $date = $this->list->getLanguage()->userTimeAndDate(
+ $this->file->getTimestamp(), $this->list->getUser() );
if ( !$this->isDeleted() ) {
# Regular files...
if ( !$this->isDeleted() ) {
# Regular files...
- return Html::
rawE
lement( 'a', [ 'href' => $this->file->getUrl() ], $date );
+ return Html::
e
lement( 'a', [ 'href' => $this->file->getUrl() ], $date );
}
# Hidden files...
if ( !$this->canViewContent() ) {
}
# Hidden files...
if ( !$this->canViewContent() ) {
- $link =
$date
;
+ $link =
htmlspecialchars( $date )
;
} else {
} else {
- $link =
Linker::l
ink(
+ $link =
$this->getLinkRenderer()->makeL
ink(
SpecialPage::getTitleFor( 'Revisiondelete' ),
$date,
[],
SpecialPage::getTitleFor( 'Revisiondelete' ),
$date,
[],
@@
-202,10
+204,10
@@
class RevDelFileItem extends RevDelItem {
'width' => $file->getWidth(),
'height' => $file->getHeight(),
'size' => $file->getSize(),
'width' => $file->getWidth(),
'height' => $file->getHeight(),
'size' => $file->getSize(),
+ 'userhidden' => (bool)$file->isDeleted( Revision::DELETED_USER ),
+ 'commenthidden' => (bool)$file->isDeleted( Revision::DELETED_COMMENT ),
+ 'contenthidden' => (bool)$this->isDeleted(),
];
];
- $ret += $file->isDeleted( Revision::DELETED_USER ) ? [ 'userhidden' => '' ] : [];
- $ret += $file->isDeleted( Revision::DELETED_COMMENT ) ? [ 'commenthidden' => '' ] : [];
- $ret += $this->isDeleted() ? [ 'contenthidden' => '' ] : [];
if ( !$this->isDeleted() ) {
$ret += [
'url' => $file->getUrl(),
if ( !$this->isDeleted() ) {
$ret += [
'url' => $file->getUrl(),