From: Derick Alangi Date: Sun, 21 Jul 2019 14:54:52 +0000 (+0100) Subject: Avoid usage of deprecated Revision::* constants X-Git-Tag: 1.34.0-rc.0~926 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=434d740d90ee41fdefc8944629946c304fd235f0;p=lhc%2Fweb%2Fwiklou.git Avoid usage of deprecated Revision::* constants Change-Id: I2d06bbacef88573f286da25994a3ad434ed90e9c --- diff --git a/includes/EditPage.php b/includes/EditPage.php index 4f102aa93a..f288327831 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1372,7 +1372,7 @@ class EditPage { $handler = ContentHandler::getForModelID( $this->contentModel ); return $handler->makeEmptyContent(); } - $content = $revision->getContent( Revision::FOR_THIS_USER, $user ); + $content = $revision->getContent( RevisionRecord::FOR_THIS_USER, $user ); return $content; } diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 59efc98b1c..8efae4f7d6 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -21,6 +21,8 @@ * @ingroup Feed */ +use MediaWiki\Storage\RevisionRecord; + /** * Helper functions for feeds * @@ -68,7 +70,7 @@ class FeedUtils { return self::formatDiffRow( $titleObj, $row->rc_last_oldid, $row->rc_this_oldid, $timestamp, - $row->rc_deleted & Revision::DELETED_COMMENT + $row->rc_deleted & RevisionRecord::DELETED_COMMENT ? wfMessage( 'rev-deleted-comment' )->escaped() : CommentStore::getStore()->getComment( 'rc_comment', $row )->text, $actiontext diff --git a/includes/Linker.php b/includes/Linker.php index 5b5337a7b8..db3e2f5f03 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -2108,7 +2108,7 @@ class Linker { return ''; } - if ( !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) { + if ( !$rev->userCan( RevisionRecord::DELETED_RESTRICTED, $user ) ) { return self::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops } $prefixedDbKey = MediaWikiServices::getInstance()->getTitleFormatter()-> @@ -2131,7 +2131,7 @@ class Linker { ]; } return self::revDeleteLink( $query, - $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide ); + $rev->isDeleted( RevisionRecord::DELETED_RESTRICTED ), $canHide ); } /** diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index 221359da27..680ae8e52f 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -20,6 +20,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Storage\RevisionRecord; /** * Abstract base class for a list of deletable items. The list class @@ -195,7 +196,7 @@ abstract class RevDelList extends RevisionListBase { $status->failCount++; continue; // Cannot just "hide from Sysops" without hiding any fields - } elseif ( $newBits == Revision::DELETED_RESTRICTED ) { + } elseif ( $newBits == RevisionRecord::DELETED_RESTRICTED ) { $itemStatus->warning( 'revdelete-only-restricted', $item->formatDate(), $item->formatTime() ); $status->failCount++; diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php index 54a715d2bc..edb86da98f 100644 --- a/includes/revisiondelete/RevDelLogItem.php +++ b/includes/revisiondelete/RevDelLogItem.php @@ -19,6 +19,8 @@ * @ingroup RevisionDelete */ +use MediaWiki\Storage\RevisionRecord; + /** * Item class for a logging table row */ @@ -44,7 +46,9 @@ class RevDelLogItem extends RevDelItem { } public function canView() { - return LogEventsList::userCan( $this->row, Revision::DELETED_RESTRICTED, $this->list->getUser() ); + return LogEventsList::userCan( + $this->row, RevisionRecord::DELETED_RESTRICTED, $this->list->getUser() + ); } public function canViewContent() { diff --git a/includes/revisiondelete/RevDelLogList.php b/includes/revisiondelete/RevDelLogList.php index b26fffd1e0..fcdcb9a592 100644 --- a/includes/revisiondelete/RevDelLogList.php +++ b/includes/revisiondelete/RevDelLogList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Storage\RevisionRecord; use Wikimedia\Rdbms\IDatabase; /** @@ -91,7 +92,7 @@ class RevDelLogList extends RevDelList { } public function getSuppressBit() { - return Revision::DELETED_RESTRICTED; + return RevisionRecord::DELETED_RESTRICTED; } public function getLogAction() { diff --git a/includes/revisiondelete/RevDelRevisionList.php b/includes/revisiondelete/RevDelRevisionList.php index 6bf9df265b..0705503e9b 100644 --- a/includes/revisiondelete/RevDelRevisionList.php +++ b/includes/revisiondelete/RevDelRevisionList.php @@ -168,7 +168,7 @@ class RevDelRevisionList extends RevDelList { } public function getSuppressBit() { - return Revision::DELETED_RESTRICTED; + return RevisionRecord::DELETED_RESTRICTED; } public function doPreCommitUpdates() { diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php index 0bddb09a0a..5644b95814 100644 --- a/includes/revisiondelete/RevisionDeleteUser.php +++ b/includes/revisiondelete/RevisionDeleteUser.php @@ -53,9 +53,9 @@ class RevisionDeleteUser { $dbw = wfGetDB( DB_MASTER ); } - # To suppress, we OR the current bitfields with Revision::DELETED_USER + # To suppress, we OR the current bitfields with RevisionRecord::DELETED_USER # to put a 1 in the username *_deleted bit. To unsuppress we AND the - # current bitfields with the inverse of Revision::DELETED_USER. The + # current bitfields with the inverse of RevisionRecord::DELETED_USER. The # username bit is made to 0 (x & 0 = 0), while others are unchanged (x & 1 = x). # The same goes for the sysop-restricted *_deleted bit. $delUser = RevisionRecord::DELETED_USER | RevisionRecord::DELETED_RESTRICTED; diff --git a/includes/specials/SpecialRevisionDelete.php b/includes/specials/SpecialRevisionDelete.php index 98c1f82a1c..7444225360 100644 --- a/includes/specials/SpecialRevisionDelete.php +++ b/includes/specials/SpecialRevisionDelete.php @@ -532,7 +532,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { $bitfield & $field ); - if ( $field == Revision::DELETED_RESTRICTED ) { + if ( $field == RevisionRecord::DELETED_RESTRICTED ) { $innerHTML = "$innerHTML"; } @@ -563,7 +563,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { $line .= '' . Xml::radio( $name, 0, $selected == 0 ) . ''; $line .= '' . Xml::radio( $name, 1, $selected == 1 ) . ''; $label = $this->msg( $message )->escaped(); - if ( $field == Revision::DELETED_RESTRICTED ) { + if ( $field == RevisionRecord::DELETED_RESTRICTED ) { $label = "$label"; } $line .= "$label"; @@ -601,7 +601,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { . $this->otherReason; } # Can the user set this field? - if ( $bitParams[Revision::DELETED_RESTRICTED] == 1 + if ( $bitParams[RevisionRecord::DELETED_RESTRICTED] == 1 && !$this->getUser()->isAllowed( 'suppressrevision' ) ) { throw new PermissionsError( 'suppressrevision' ); @@ -664,8 +664,8 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { } $bitfield[$field] = $val; } - if ( !isset( $bitfield[Revision::DELETED_RESTRICTED] ) ) { - $bitfield[Revision::DELETED_RESTRICTED] = 0; + if ( !isset( $bitfield[RevisionRecord::DELETED_RESTRICTED] ) ) { + $bitfield[RevisionRecord::DELETED_RESTRICTED] = 0; } return $bitfield;