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 "registration: Avoid redundant LBYL check in ExtensionRegistry::queue()"
[lhc/web/wiklou.git]
/
includes
/
revisiondelete
/
RevDelArchivedFileItem.php
diff --git
a/includes/revisiondelete/RevDelArchivedFileItem.php
b/includes/revisiondelete/RevDelArchivedFileItem.php
index
00e40a0
..
5b03ad0
100644
(file)
--- a/
includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/
includes/revisiondelete/RevDelArchivedFileItem.php
@@
-19,12
+19,15
@@
* @ingroup RevisionDelete
*/
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Item class for a filearchive table row
/**
* Item class for a filearchive table row
+ *
+ * @property ArchivedFile $file
+ * @property RevDelArchivedFileList $list
*/
class RevDelArchivedFileItem extends RevDelFileItem {
*/
class RevDelArchivedFileItem extends RevDelFileItem {
- /** @var RevDelArchivedFileList $list */
- /** @var ArchivedFile $file */
/** @var LocalFile */
protected $lockFile;
/** @var LocalFile */
protected $lockFile;
@@
-109,8
+112,8
@@
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 ),
+ 'userhidden' => (bool)$file->isDeleted( Revision
Record
::DELETED_USER ),
+ 'commenthidden' => (bool)$file->isDeleted( Revision
Record
::DELETED_COMMENT ),
'contenthidden' => (bool)$this->isDeleted(),
];
if ( $this->canViewContent() ) {
'contenthidden' => (bool)$this->isDeleted(),
];
if ( $this->canViewContent() ) {
@@
-124,13
+127,13
@@
class RevDelArchivedFileItem extends RevDelFileItem {
),
];
}
),
];
}
- if ( $file->userCan( Revision::DELETED_USER, $user ) ) {
+ if ( $file->userCan( Revision
Record
::DELETED_USER, $user ) ) {
$ret += [
'userid' => $file->getUser( 'id' ),
'user' => $file->getUser( 'text' ),
];
}
$ret += [
'userid' => $file->getUser( 'id' ),
'user' => $file->getUser( 'text' ),
];
}
- if ( $file->userCan( Revision::DELETED_COMMENT, $user ) ) {
+ if ( $file->userCan( Revision
Record
::DELETED_COMMENT, $user ) ) {
$ret += [
'comment' => $file->getRawDescription(),
];
$ret += [
'comment' => $file->getRawDescription(),
];