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 "Sanity check "stashedtexthash" param before checking memcached"
[lhc/web/wiklou.git]
/
includes
/
revisiondelete
/
RevDelArchivedFileItem.php
diff --git
a/includes/revisiondelete/RevDelArchivedFileItem.php
b/includes/revisiondelete/RevDelArchivedFileItem.php
index
52df2e3
..
b098422
100644
(file)
--- a/
includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/
includes/revisiondelete/RevDelArchivedFileItem.php
@@
-23,8
+23,8
@@
* Item class for a filearchive table row
*/
class RevDelArchivedFileItem extends RevDelFileItem {
* Item class for a filearchive table row
*/
class RevDelArchivedFileItem extends RevDelFileItem {
- /** @var
$list RevDelArchivedFileL
ist */
- /** @var
$file ArchivedF
ile */
+ /** @var
RevDelArchivedFileList $l
ist */
+ /** @var
ArchivedFile $f
ile */
/** @var LocalFile */
protected $lockFile;
/** @var LocalFile */
protected $lockFile;
@@
-69,16
+69,16
@@
class RevDelArchivedFileItem extends RevDelFileItem {
}
protected function getLink() {
}
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() );
# Hidden files...
if ( !$this->canViewContent() ) {
# Hidden files...
if ( !$this->canViewContent() ) {
- $link =
$date
;
+ $link =
htmlspecialchars( $date )
;
} else {
$undelete = SpecialPage::getTitleFor( 'Undelete' );
$key = $this->file->getKey();
} else {
$undelete = SpecialPage::getTitleFor( 'Undelete' );
$key = $this->file->getKey();
- $link =
Linker::l
ink( $undelete, $date, [],
+ $link =
$this->getLinkRenderer()->makeL
ink( $undelete, $date, [],
[
'target' => $this->list->title->getPrefixedText(),
'file' => $key,
[
'target' => $this->list->title->getPrefixedText(),
'file' => $key,
@@
-102,10
+102,10
@@
class RevDelArchivedFileItem extends RevDelFileItem {
'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->canViewContent() ) {
$ret += [
'url' => SpecialPage::getTitleFor( 'Revisiondelete' )->getLinkURL(
if ( $this->canViewContent() ) {
$ret += [
'url' => SpecialPage::getTitleFor( 'Revisiondelete' )->getLinkURL(