use MediaWiki\EditPage\TextConflictHelper;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\ScopedCallback;
/**
# the revisions exist and they were not deleted.
# Otherwise, $content will be left as-is.
if ( !is_null( $undorev ) && !is_null( $oldrev ) &&
- !$undorev->isDeleted( Revision::DELETED_TEXT ) &&
- !$oldrev->isDeleted( Revision::DELETED_TEXT )
+ !$undorev->isDeleted( RevisionRecord::DELETED_TEXT ) &&
+ !$oldrev->isDeleted( RevisionRecord::DELETED_TEXT )
) {
if ( WikiPage::hasDifferencesOutsideMainSlot( $undorev, $oldrev )
|| !$this->isSupportedContentModel( $oldrev->getContentModel() )
}
if ( $undoMsg === null ) {
- $oldContent = $this->page->getContent( Revision::RAW );
+ $oldContent = $this->page->getContent( RevisionRecord::RAW );
$popts = ParserOptions::newFromUserAndLang(
$user, MediaWikiServices::getInstance()->getContentLanguage() );
$newContent = $content->preSaveTransform( $this->mTitle, $user, $popts );
*/
protected function getCurrentContent() {
$rev = $this->page->getRevision();
- $content = $rev ? $rev->getContent( Revision::RAW ) : null;
+ $content = $rev ? $rev->getContent( RevisionRecord::RAW ) : null;
if ( $content === false || $content === null ) {
$handler = ContentHandler::getForModelID( $this->contentModel );
}
$parserOptions = ParserOptions::newFromUser( $user );
- $content = $page->getContent( Revision::RAW );
+ $content = $page->getContent( RevisionRecord::RAW );
if ( !$content ) {
// TODO: somehow show a warning to the user!
if ( $revision ) {
// Let sysop know that this will make private content public if saved
- if ( !$revision->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$revision->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$out->wrapWikiMsg(
"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
'rev-deleted-text-permission'
);
- } elseif ( $revision->isDeleted( Revision::DELETED_TEXT ) ) {
+ } elseif ( $revision->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$out->wrapWikiMsg(
"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
'rev-deleted-text-view'
*/
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
/**
* Some internal bits split of from Skin.php. These functions are used
* @return string HTML fragment
*/
public static function revUserLink( $rev, $isPublic = false ) {
- if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) && $isPublic ) {
$link = wfMessage( 'rev-deleted-user' )->escaped();
- } elseif ( $rev->userCan( Revision::DELETED_USER ) ) {
- $link = self::userLink( $rev->getUser( Revision::FOR_THIS_USER ),
- $rev->getUserText( Revision::FOR_THIS_USER ) );
+ } elseif ( $rev->userCan( RevisionRecord::DELETED_USER ) ) {
+ $link = self::userLink( $rev->getUser( RevisionRecord::FOR_THIS_USER ),
+ $rev->getUserText( RevisionRecord::FOR_THIS_USER ) );
} else {
$link = wfMessage( 'rev-deleted-user' )->escaped();
}
- if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) ) {
return '<span class="history-deleted">' . $link . '</span>';
}
return $link;
* @return string HTML
*/
public static function revUserTools( $rev, $isPublic = false, $useParentheses = true ) {
- if ( $rev->userCan( Revision::DELETED_USER ) &&
- ( !$rev->isDeleted( Revision::DELETED_USER ) || !$isPublic )
+ if ( $rev->userCan( RevisionRecord::DELETED_USER ) &&
+ ( !$rev->isDeleted( RevisionRecord::DELETED_USER ) || !$isPublic )
) {
- $userId = $rev->getUser( Revision::FOR_THIS_USER );
- $userText = $rev->getUserText( Revision::FOR_THIS_USER );
+ $userId = $rev->getUser( RevisionRecord::FOR_THIS_USER );
+ $userText = $rev->getUserText( RevisionRecord::FOR_THIS_USER );
if ( $userId || (string)$userText !== '' ) {
$link = self::userLink( $userId, $userText )
. self::userToolLinks( $userId, $userText, false, 0, null,
$link = wfMessage( 'rev-deleted-user' )->escaped();
}
- if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) ) {
return ' <span class="history-deleted mw-userlink">' . $link . '</span>';
}
return $link;
public static function revComment( Revision $rev, $local = false, $isPublic = false,
$useParentheses = true
) {
- if ( $rev->getComment( Revision::RAW ) == "" ) {
+ if ( $rev->getComment( RevisionRecord::RAW ) == "" ) {
return "";
}
- if ( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_COMMENT ) && $isPublic ) {
$block = " <span class=\"comment\">" . wfMessage( 'rev-deleted-comment' )->escaped() . "</span>";
- } elseif ( $rev->userCan( Revision::DELETED_COMMENT ) ) {
- $block = self::commentBlock( $rev->getComment( Revision::FOR_THIS_USER ),
+ } elseif ( $rev->userCan( RevisionRecord::DELETED_COMMENT ) ) {
+ $block = self::commentBlock( $rev->getComment( RevisionRecord::FOR_THIS_USER ),
$rev->getTitle(), $local, null, $useParentheses );
} else {
$block = " <span class=\"comment\">" . wfMessage( 'rev-deleted-comment' )->escaped() . "</span>";
}
- if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_COMMENT ) ) {
return " <span class=\"history-deleted comment\">$block</span>";
}
return $block;
$editCount = 0;
$moreRevs = false;
foreach ( $res as $row ) {
- if ( $rev->getUserText( Revision::RAW ) != $row->rev_user_text ) {
+ if ( $rev->getUserText( RevisionRecord::RAW ) != $row->rev_user_text ) {
if ( $verify &&
- ( $row->rev_deleted & Revision::DELETED_TEXT
- || $row->rev_deleted & Revision::DELETED_USER
+ ( $row->rev_deleted & RevisionRecord::DELETED_TEXT
+ || $row->rev_deleted & RevisionRecord::DELETED_USER
) ) {
// If the user or the text of the revision we might rollback
// to is deleted in some way we can't rollback. Similar to
*/
use MediaWiki\Permissions\PermissionManager;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IDatabase;
if ( $old->getId() === $new->getId() ) {
return ( $old_cmp === '>' && $new_cmp === '<' ) ?
[] :
- [ $old->getUserText( Revision::RAW ) ];
+ [ $old->getUserText( RevisionRecord::RAW ) ];
} elseif ( $old->getId() === $new->getParentId() ) {
if ( $old_cmp === '>=' && $new_cmp === '<=' ) {
- $authors[] = $old->getUserText( Revision::RAW );
- if ( $old->getUserText( Revision::RAW ) != $new->getUserText( Revision::RAW ) ) {
- $authors[] = $new->getUserText( Revision::RAW );
+ $authors[] = $oldUserText = $old->getUserText( RevisionRecord::RAW );
+ $newUserText = $new->getUserText( RevisionRecord::RAW );
+ if ( $oldUserText != $newUserText ) {
+ $authors[] = $newUserText;
}
} elseif ( $old_cmp === '>=' ) {
- $authors[] = $old->getUserText( Revision::RAW );
+ $authors[] = $old->getUserText( RevisionRecord::RAW );
} elseif ( $new_cmp === '<=' ) {
- $authors[] = $new->getUserText( Revision::RAW );
+ $authors[] = $new->getUserText( RevisionRecord::RAW );
}
return $authors;
}
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Revision\RevisionRecord;
/**
* @ingroup Pager
}
}
- if ( !$rev->isDeleted( Revision::DELETED_TEXT )
- && !$prevRev->isDeleted( Revision::DELETED_TEXT )
+ if ( !$rev->isDeleted( RevisionRecord::DELETED_TEXT )
+ && !$prevRev->isDeleted( RevisionRecord::DELETED_TEXT )
) {
# Create undo tooltip for the first (=latest) line only
$undoTooltip = $latest
function curLink( $rev ) {
$cur = $this->historyPage->message['cur'];
$latest = $this->getWikiPage()->getLatest();
- if ( $latest === $rev->getId() || !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ if ( $latest === $rev->getId()
+ || !$rev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() )
+ ) {
return $cur;
} else {
return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$nextRev = new Revision( $next, 0, $this->getTitle() );
- if ( !$prevRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
- || !$nextRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
+ if ( !$prevRev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() )
+ || !$nextRev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() )
) {
return $last;
}
$checkmark = [ 'checked' => 'checked' ];
} else {
# Check visibility of old revisions
- if ( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() ) ) {
$radio['disabled'] = 'disabled';
$checkmark = []; // We will check the next possible one
} elseif ( !$this->oldIdChecked ) {
* @file
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* A module that allows for editing and creating pages.
*
$undoafterRev = Revision::newFromId( $params['undoafter'] );
}
$undoRev = Revision::newFromId( $params['undo'] );
- if ( is_null( $undoRev ) || $undoRev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( is_null( $undoRev ) || $undoRev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['undo'] ] );
}
if ( $params['undoafter'] == 0 ) {
$undoafterRev = $undoRev->getPrevious();
}
- if ( is_null( $undoafterRev ) || $undoafterRev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( is_null( $undoafterRev ) || $undoafterRev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['undoafter'] ] );
}
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
/**
* @ingroup API
}
$this->checkTitleUserPermissions( $rev->getTitle(), 'read' );
- if ( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() ) ) {
$this->dieWithError(
[ 'apierror-permissiondenied', $this->msg( 'action-deletedtext' ) ]
);
WikiPage $page, $popts, $suppressCache, $pageId, $rev, $getContent
) {
$revId = $rev ? $rev->getId() : null;
- $isDeleted = $rev && $rev->isDeleted( Revision::DELETED_TEXT );
+ $isDeleted = $rev && $rev->isDeleted( RevisionRecord::DELETED_TEXT );
if ( $getContent || $this->section !== false || $isDeleted ) {
if ( $rev ) {
- $this->content = $rev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
+ $this->content = $rev->getContent( RevisionRecord::FOR_THIS_USER, $this->getUser() );
if ( !$this->content ) {
$this->dieWithError( [ 'apierror-missingcontent-revid', $revId ] );
}
} else {
- $this->content = $page->getContent( Revision::FOR_THIS_USER, $this->getUser() );
+ $this->content = $page->getContent( RevisionRecord::FOR_THIS_USER, $this->getUser() );
if ( !$this->content ) {
$this->dieWithError( [ 'apierror-missingcontent-pageid', $page->getId() ] );
}
}
$this->contentIsDeleted = $isDeleted;
$this->contentIsSuppressed = $rev &&
- $rev->isDeleted( Revision::DELETED_TEXT | Revision::DELETED_RESTRICTED );
+ $rev->isDeleted( RevisionRecord::DELETED_TEXT | RevisionRecord::DELETED_RESTRICTED );
}
if ( $this->section !== false ) {
use MediaWiki\MediaWikiServices;
use MediaWiki\Storage\NameTableAccessException;
+use MediaWiki\Storage\RevisionRecord;
/**
* Query module to enumerate all deleted revisions.
// (shouldn't be able to get here without 'deletedhistory', but
// check it again just in case)
if ( !$user->isAllowed( 'deletedhistory' ) ) {
- $bitmask = Revision::DELETED_USER;
+ $bitmask = RevisionRecord::DELETED_USER;
} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
- $bitmask = Revision::DELETED_USER | Revision::DELETED_RESTRICTED;
+ $bitmask = RevisionRecord::DELETED_USER | RevisionRecord::DELETED_RESTRICTED;
} else {
$bitmask = 0;
}
$rev['parentid'] = (int)$row->ar_parent_id;
}
if ( $fld_user || $fld_userid ) {
- if ( $row->ar_deleted & Revision::DELETED_USER ) {
+ if ( $row->ar_deleted & RevisionRecord::DELETED_USER ) {
$rev['userhidden'] = true;
$anyHidden = true;
}
- if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_USER, $user ) ) {
+ if ( Revision::userCanBitfield( $row->ar_deleted, RevisionRecord::DELETED_USER, $user ) ) {
if ( $fld_user ) {
$rev['user'] = $row->ar_user_text;
}
}
if ( $fld_comment || $fld_parsedcomment ) {
- if ( $row->ar_deleted & Revision::DELETED_COMMENT ) {
+ if ( $row->ar_deleted & RevisionRecord::DELETED_COMMENT ) {
$rev['commenthidden'] = true;
$anyHidden = true;
}
- if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_COMMENT, $user ) ) {
+ if ( Revision::userCanBitfield( $row->ar_deleted, RevisionRecord::DELETED_COMMENT, $user ) ) {
$comment = $commentStore->getComment( 'ar_comment', $row )->text;
if ( $fld_comment ) {
$rev['comment'] = $comment;
$rev['len'] = $row->ar_len;
}
if ( $fld_sha1 ) {
- if ( $row->ar_deleted & Revision::DELETED_TEXT ) {
+ if ( $row->ar_deleted & RevisionRecord::DELETED_TEXT ) {
$rev['sha1hidden'] = true;
$anyHidden = true;
}
- if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_TEXT, $user ) ) {
+ if ( Revision::userCanBitfield( $row->ar_deleted, RevisionRecord::DELETED_TEXT, $user ) ) {
if ( $row->ar_sha1 != '' ) {
$rev['sha1'] = Wikimedia\base_convert( $row->ar_sha1, 36, 16, 40 );
} else {
}
}
if ( $fld_content ) {
- if ( $row->ar_deleted & Revision::DELETED_TEXT ) {
+ if ( $row->ar_deleted & RevisionRecord::DELETED_TEXT ) {
$rev['texthidden'] = true;
$anyHidden = true;
}
- if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_TEXT, $user ) ) {
+ if ( Revision::userCanBitfield( $row->ar_deleted, RevisionRecord::DELETED_TEXT, $user ) ) {
ApiResult::setContentValue( $rev, 'text', Revision::getRevisionText( $row, 'ar_' ) );
}
}
}
}
- if ( $anyHidden && ( $row->ar_deleted & Revision::DELETED_RESTRICTED ) ) {
+ if ( $anyHidden && ( $row->ar_deleted & RevisionRecord::DELETED_RESTRICTED ) ) {
$rev['suppressed'] = true;
}
<?php
+
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Helper class for category membership changes
*
$revision,
$added
) {
- $deleted = $revision ? $revision->getVisibility() & Revision::SUPPRESSED_USER : 0;
+ $deleted = $revision ? $revision->getVisibility() & RevisionRecord::SUPPRESSED_USER : 0;
$newRevId = $revision ? $revision->getId() : 0;
/**
*/
private function getUser() {
if ( $this->revision ) {
- $userId = $this->revision->getUser( Revision::RAW );
+ $userId = $this->revision->getUser( RevisionRecord::RAW );
if ( $userId === 0 ) {
- return User::newFromName( $this->revision->getUserText( Revision::RAW ), false );
+ return User::newFromName( $this->revision->getUserText( RevisionRecord::RAW ), false );
} else {
return User::newFromId( $userId );
}
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
/**
* Feed to Special:RecentChanges and Special:RecentChangesLinked.
FeedUtils::formatDiff( $obj ),
$url,
$obj->rc_timestamp,
- ( $obj->rc_deleted & Revision::DELETED_USER )
+ ( $obj->rc_deleted & RevisionRecord::DELETED_USER )
? wfMessage( 'rev-deleted-user' )->escaped() : $obj->rc_user_text,
$talkpage
);
*/
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\IResultWrapper;
class ChangesList extends ContextSource {
public static function revDateLink( Revision $rev, User $user, Language $lang, $title = null ) {
$ts = $rev->getTimestamp();
$date = $lang->userTimeAndDate( $ts, $user );
- if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$link = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$title ?? $rev->getTitle(),
$date,
} else {
$link = htmlspecialchars( $date );
}
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$link = "<span class=\"history-deleted mw-changeslist-date\">$link</span>";
}
return $link;
$rc->mAttribs['rc_type'] == RC_CATEGORIZE
) {
$diffLink = $this->message['diff'];
- } elseif ( !self::userCan( $rc, Revision::DELETED_TEXT, $this->getUser() ) ) {
+ } elseif ( !self::userCan( $rc, RevisionRecord::DELETED_TEXT, $this->getUser() ) ) {
$diffLink = $this->message['diff'];
} else {
$query = [
[ 'class' => 'mw-changeslist-title' ],
$params
);
- if ( $this->isDeleted( $rc, Revision::DELETED_TEXT ) ) {
+ if ( $this->isDeleted( $rc, RevisionRecord::DELETED_TEXT ) ) {
$articlelink = '<span class="history-deleted">' . $articlelink . '</span>';
}
# To allow for boldening pages watched by this user
* @param RecentChange &$rc
*/
public function insertUserRelatedLinks( &$s, &$rc ) {
- if ( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
+ if ( $this->isDeleted( $rc, RevisionRecord::DELETED_USER ) ) {
$s .= ' <span class="history-deleted">' .
$this->msg( 'rev-deleted-user' )->escaped() . '</span>';
} else {
<?php
+
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Generates a list of changes using an Enhanced system (uses javascript).
*
if ( $type == RC_LOG ) {
$link = htmlspecialchars( $rcObj->timestamp );
# Revision link
- } elseif ( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() ) ) {
+ } elseif ( !ChangesList::userCan( $rcObj, RevisionRecord::DELETED_TEXT, $this->getUser() ) ) {
$link = Html::element( 'span', [ 'class' => 'history-deleted' ], $rcObj->timestamp );
} else {
$link = $this->linkRenderer->makeKnownLink(
[],
$params
);
- if ( static::isDeleted( $rcObj, Revision::DELETED_TEXT ) ) {
+ if ( static::isDeleted( $rcObj, RevisionRecord::DELETED_TEXT ) ) {
$link = '<span class="history-deleted">' . $link . '</span> ';
}
}
if (
$isnew ||
$rcObj->mAttribs['rc_type'] == RC_CATEGORIZE ||
- !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() )
+ !ChangesList::userCan( $rcObj, RevisionRecord::DELETED_TEXT, $this->getUser() )
) {
$links['total-changes'] = Html::rawElement( 'span', [], $nchanges[$n] );
} else {
* @file
*/
use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Storage\RevisionRecord;
class RCCacheEntryFactory {
// Make user links
$cacheEntry->userlink = $this->getUserLink( $cacheEntry );
- if ( !ChangesList::isDeleted( $cacheEntry, Revision::DELETED_USER ) ) {
+ if ( !ChangesList::isDeleted( $cacheEntry, RevisionRecord::DELETED_USER ) ) {
$cacheEntry->usertalklink = Linker::userToolLinks(
$cacheEntry->mAttribs['rc_user'],
$cacheEntry->mAttribs['rc_user_text'],
* @return bool
*/
private function showDiffLinks( RecentChange $cacheEntry, User $user ) {
- return ChangesList::userCan( $cacheEntry, Revision::DELETED_TEXT, $user );
+ return ChangesList::userCan( $cacheEntry, RevisionRecord::DELETED_TEXT, $user );
}
/**
* @return string
*/
private function getUserLink( RecentChange $cacheEntry ) {
- if ( ChangesList::isDeleted( $cacheEntry, Revision::DELETED_USER ) ) {
+ if ( ChangesList::isDeleted( $cacheEntry, RevisionRecord::DELETED_USER ) ) {
$userLink = ' <span class="history-deleted">' .
$this->context->msg( 'rev-deleted-user' )->escaped() . '</span>';
} else {
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
/**
* Item class for a logging table row with its associated change tags.
}
public function canView() {
- return LogEventsList::userCan( $this->row, Revision::SUPPRESSED_ALL, $this->list->getUser() );
+ return LogEventsList::userCan(
+ $this->row, RevisionRecord::SUPPRESSED_ALL, $this->list->getUser()
+ );
}
public function canViewContent() {
* @author Daniel Kinzler
*/
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Assert\Assert;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
[ 'rev_user_text' => $revQuery['fields']['rev_user_text'] ],
[
'rev_page' => $title->getArticleID(),
- $dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0'
+ $dbr->bitAnd( 'rev_deleted', RevisionRecord::DELETED_USER ) . ' = 0'
],
__METHOD__,
[ 'LIMIT' => 20 ],
# Check if one of the revisions is deleted/suppressed
$deleted = $suppressed = false;
- $allowed = $this->mNewRev->userCan( Revision::DELETED_TEXT, $user );
+ $allowed = $this->mNewRev->userCan( RevisionRecord::DELETED_TEXT, $user );
$revisionTools = [];
}
}
- if ( !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) &&
- !$this->mNewRev->isDeleted( Revision::DELETED_TEXT )
+ if ( !$this->mOldRev->isDeleted( RevisionRecord::DELETED_TEXT ) &&
+ !$this->mNewRev->isDeleted( RevisionRecord::DELETED_TEXT )
) {
$undoLink = Html::element( 'a', [
'href' => $this->mNewPage->getLocalURL( [
Hooks::run( 'DifferenceEngineOldHeader', [ $this, &$oldHeader, $prevlink, $oldminor,
$diffOnly, $ldel, $this->unhide ] );
- if ( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $this->mOldRev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$deleted = true; // old revisions text is hidden
- if ( $this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ) ) {
+ if ( $this->mOldRev->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ) {
$suppressed = true; // also suppressed
}
}
# Check if this user can see the revisions
- if ( !$this->mOldRev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$this->mOldRev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$allowed = false;
}
}
Hooks::run( 'DifferenceEngineNewHeader', [ $this, &$newHeader, $formattedRevisionTools,
$nextlink, $rollback, $newminor, $diffOnly, $rdel, $this->unhide ] );
- if ( $this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $this->mNewRev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$deleted = true; // new revisions text is hidden
- if ( $this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ) ) {
+ if ( $this->mNewRev->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ) {
$suppressed = true; // also suppressed
}
}
if ( !$this->loadRevisionData() ) {
return false;
} elseif ( $this->mOldRev &&
- !$this->mOldRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
+ !$this->mOldRev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() )
) {
return false;
} elseif ( $this->mNewRev &&
- !$this->mNewRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
+ !$this->mNewRev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() )
) {
return false;
}
$users = $this->mNewPage->getAuthorsBetween( $oldRev, $newRev, $limit );
$numUsers = count( $users );
- if ( $numUsers == 1 && $users[0] == $newRev->getUserText( Revision::RAW ) ) {
+ if ( $numUsers == 1 && $users[0] == $newRev->getUserText( RevisionRecord::RAW ) ) {
$numUsers = 0; // special case to say "by the same user" instead of "by one other user"
}
$header = Linker::linkKnown( $title, $header, [],
[ 'oldid' => $rev->getId() ] );
- if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$editQuery = [ 'action' => 'edit' ];
if ( !$rev->isCurrent() ) {
$editQuery['oldid'] = $rev->getId();
[ 'class' => 'mw-diff-edit' ],
$editLink
);
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$header = Html::rawElement(
'span',
[ 'class' => 'history-deleted' ],
*/
use MediaWiki\MediaWikiServices as MediaWikiServicesAlias;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\Rdbms\IDatabase;
'rev_user' => $revQuery['fields']['rev_user'],
],
[
- $this->db->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0',
+ $this->db->bitAnd( 'rev_deleted', RevisionRecord::DELETED_USER ) . ' = 0',
$cond,
],
__METHOD__,
$out .= $this->writeTimestamp( $rev->getTimestamp() );
- if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) ) {
$out .= " " . Xml::element( 'contributor', [ 'deleted' => 'deleted' ] ) . "\n";
} else {
// empty values get written out as uid 0, see T224221
if ( $rev->isMinor() ) {
$out .= " <minor/>\n";
}
- if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_COMMENT ) ) {
$out .= " " . Xml::element( 'comment', [ 'deleted' => 'deleted' ] ) . "\n";
} else {
if ( $rev->getComment()->text != '' ) {
}
}
- $contentMode = $rev->isDeleted( Revision::DELETED_TEXT ) ? self::WRITE_STUB_DELETED
+ $contentMode = $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ? self::WRITE_STUB_DELETED
: $this->contentMode;
foreach ( $rev->getSlots()->getSlots() as $slot ) {
$out .= $this->writeSlot( $slot, $contentMode );
}
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$out .= " <sha1/>\n";
} else {
$out .= " " . Xml::element( 'sha1', null, strval( $rev->getSha1() ) ) . "\n";
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
/**
* Helper class for file deletion
// Bitfields to further suppress the content
if ( $this->suppress ) {
- $bitfield = Revision::SUPPRESSED_ALL;
+ $bitfield = RevisionRecord::SUPPRESSED_ALL;
} else {
$bitfield = 'oi_deleted';
}
* @since 1.22
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* This class formats delete log entries.
*
];
static $fields = [
- Revision::DELETED_TEXT => 'content',
- Revision::DELETED_COMMENT => 'comment',
- Revision::DELETED_USER => 'user',
- Revision::DELETED_RESTRICTED => 'restricted',
+ RevisionRecord::DELETED_TEXT => 'content',
+ RevisionRecord::DELETED_COMMENT => 'comment',
+ RevisionRecord::DELETED_USER => 'user',
+ RevisionRecord::DELETED_RESTRICTED => 'restricted',
];
if ( isset( $rawParams['6::ofield'] ) ) {
$this->mRevIdFetched = $this->mRevision->getId();
$this->fetchResult = Status::newGood( $this->mRevision );
- if ( !$this->mRevision->userCan( Revision::DELETED_TEXT, $this->getContext()->getUser() ) ) {
+ if (
+ !$this->mRevision->userCan( RevisionRecord::DELETED_TEXT, $this->getContext()->getUser() )
+ ) {
wfDebug( __METHOD__ . " failed to retrieve content of revision " .
$this->mRevision->getId() . "\n" );
if ( Hooks::isRegistered( 'ArticleAfterFetchContentObject' ) ) {
$contentObject = $this->mRevision->getContent(
- Revision::FOR_THIS_USER,
+ RevisionRecord::FOR_THIS_USER,
$this->getContext()->getUser()
);
// For B/C only
$this->mContentObject = $this->mRevision->getContent(
- Revision::FOR_THIS_USER,
+ RevisionRecord::FOR_THIS_USER,
$this->getContext()->getUser()
);
* @return bool True if the view is allowed, false if not.
*/
public function showDeletedRevisionHeader() {
- if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( !$this->mRevision->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
// Not deleted
return true;
}
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
// If the user is not allowed to see it...
- if ( !$this->mRevision->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$this->mRevision->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$outputPage->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
'rev-deleted-text-permission' );
# Give explanation and add a link to view the revision...
$oldid = intval( $this->getOldID() );
$link = $this->getTitle()->getFullURL( "oldid={$oldid}&unhide=1" );
- $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
+ $msg = $this->mRevision->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ?
'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide';
$outputPage->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
[ $msg, $link ] );
return false;
// We are allowed to see...
} else {
- $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
+ $msg = $this->mRevision->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ?
'rev-suppressed-text-view' : 'rev-deleted-text-view';
$outputPage->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", $msg );
$conds[] = 'NOT(' . $actorMigration->getWhere( $dbr, 'rev_user', $user )['conds'] . ')';
// Username hidden?
- $conds[] = "{$dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER )} = 0";
+ $conds[] = "{$dbr->bitAnd( 'rev_deleted', RevisionRecord::DELETED_USER )} = 0";
$jconds = [
'user' => [ 'LEFT JOIN', $actorQuery['fields']['rev_user'] . ' = user_id' ],
// we need to remember the old content so we can use it to generate all deletion updates.
$revision = $this->getRevision();
try {
- $content = $this->getContent( Revision::RAW );
+ $content = $this->getContent( RevisionRecord::RAW );
} catch ( Exception $ex ) {
wfLogWarning( __METHOD__ . ': failed to load content during deletion! '
. $ex->getMessage() );
// Bitfields to further suppress the content
if ( $suppress ) {
- $bitfield = Revision::SUPPRESSED_ALL;
+ $bitfield = RevisionRecord::SUPPRESSED_ALL;
$revQuery['fields'] = array_diff( $revQuery['fields'], [ 'rev_deleted' ] );
}
$slotContent = [ SlotRecord::MAIN => $rev ];
} else {
$slotContent = array_map( function ( SlotRecord $slot ) {
- return $slot->getContent( Revision::RAW );
+ return $slot->getContent( RevisionRecord::RAW );
}, $rev->getSlots()->getSlots() );
}
*/
use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IDatabase;
if ( !$revision ) {
return null;
}
- $content = $revision->getContent( Revision::RAW );
+ $content = $revision->getContent( RevisionRecord::RAW );
if ( !$content ) {
$this->getLogger()->error(
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Item class for a filearchive table row
*/
'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( RevisionRecord::DELETED_USER ),
+ 'commenthidden' => (bool)$file->isDeleted( RevisionRecord::DELETED_COMMENT ),
'contenthidden' => (bool)$this->isDeleted(),
];
if ( $this->canViewContent() ) {
),
];
}
- if ( $file->userCan( Revision::DELETED_USER, $user ) ) {
+ if ( $file->userCan( RevisionRecord::DELETED_USER, $user ) ) {
$ret += [
'userid' => $file->getUser( 'id' ),
'user' => $file->getUser( 'text' ),
];
}
- if ( $file->userCan( Revision::DELETED_COMMENT, $user ) ) {
+ if ( $file->userCan( RevisionRecord::DELETED_COMMENT, $user ) ) {
$ret += [
'comment' => $file->getRawDescription(),
];
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Item class for an oldimage table row
*/
* @return string HTML
*/
protected function getUserTools() {
- if ( $this->file->userCan( Revision::DELETED_USER, $this->list->getUser() ) ) {
+ if ( $this->file->userCan( RevisionRecord::DELETED_USER, $this->list->getUser() ) ) {
$uid = $this->file->getUser( 'id' );
$name = $this->file->getUser( 'text' );
$link = Linker::userLink( $uid, $name ) . Linker::userToolLinks( $uid, $name );
} else {
$link = $this->list->msg( 'rev-deleted-user' )->escaped();
}
- if ( $this->file->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $this->file->isDeleted( RevisionRecord::DELETED_USER ) ) {
return '<span class="history-deleted">' . $link . '</span>';
}
'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( RevisionRecord::DELETED_USER ),
+ 'commenthidden' => (bool)$file->isDeleted( RevisionRecord::DELETED_COMMENT ),
'contenthidden' => (bool)$this->isDeleted(),
];
if ( !$this->isDeleted() ) {
),
];
}
- if ( $file->userCan( Revision::DELETED_USER, $user ) ) {
+ if ( $file->userCan( RevisionRecord::DELETED_USER, $user ) ) {
$ret += [
'userid' => $file->user,
'user' => $file->user_text,
];
}
- if ( $file->userCan( Revision::DELETED_COMMENT, $user ) ) {
+ if ( $file->userCan( RevisionRecord::DELETED_COMMENT, $user ) ) {
$ret += [
'comment' => $file->description,
];
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Item class for a live revision table row
*/
}
public function canView() {
- return $this->revision->userCan( Revision::DELETED_RESTRICTED, $this->list->getUser() );
+ return $this->revision->userCan(
+ RevisionRecord::DELETED_RESTRICTED, $this->list->getUser()
+ );
}
public function canViewContent() {
- return $this->revision->userCan( Revision::DELETED_TEXT, $this->list->getUser() );
+ return $this->revision->userCan(
+ RevisionRecord::DELETED_TEXT, $this->list->getUser()
+ );
}
public function getBits() {
}
public function isDeleted() {
- return $this->revision->isDeleted( Revision::DELETED_TEXT );
+ return $this->revision->isDeleted( RevisionRecord::DELETED_TEXT );
}
public function isHideCurrentOp( $newBits ) {
- return ( $newBits & Revision::DELETED_TEXT )
+ return ( $newBits & RevisionRecord::DELETED_TEXT )
&& $this->list->getCurrent() == $this->getId();
}
$ret = [
'id' => $rev->getId(),
'timestamp' => wfTimestamp( TS_ISO_8601, $rev->getTimestamp() ),
- 'userhidden' => (bool)$rev->isDeleted( Revision::DELETED_USER ),
- 'commenthidden' => (bool)$rev->isDeleted( Revision::DELETED_COMMENT ),
- 'texthidden' => (bool)$rev->isDeleted( Revision::DELETED_TEXT ),
+ 'userhidden' => (bool)$rev->isDeleted( RevisionRecord::DELETED_USER ),
+ 'commenthidden' => (bool)$rev->isDeleted( RevisionRecord::DELETED_COMMENT ),
+ 'texthidden' => (bool)$rev->isDeleted( RevisionRecord::DELETED_TEXT ),
];
- if ( $rev->userCan( Revision::DELETED_USER, $user ) ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_USER, $user ) ) {
$ret += [
- 'userid' => $rev->getUser( Revision::FOR_THIS_USER ),
- 'user' => $rev->getUserText( Revision::FOR_THIS_USER ),
+ 'userid' => $rev->getUser( RevisionRecord::FOR_THIS_USER ),
+ 'user' => $rev->getUserText( RevisionRecord::FOR_THIS_USER ),
];
}
- if ( $rev->userCan( Revision::DELETED_COMMENT, $user ) ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_COMMENT, $user ) ) {
$ret += [
- 'comment' => $rev->getComment( Revision::FOR_THIS_USER ),
+ 'comment' => $rev->getComment( RevisionRecord::FOR_THIS_USER ),
];
}
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\FakeResultWrapper;
use Wikimedia\Rdbms\IDatabase;
}
public static function getRevdelConstant() {
- return Revision::DELETED_TEXT;
+ return RevisionRecord::DELETED_TEXT;
}
public static function suggestTarget( $target, array $ids ) {
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\IDatabase;
/**
# current bitfields with the inverse of Revision::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 = Revision::DELETED_USER | Revision::DELETED_RESTRICTED;
- $delAction = LogPage::DELETED_ACTION | Revision::DELETED_RESTRICTED;
+ $delUser = RevisionRecord::DELETED_USER | RevisionRecord::DELETED_RESTRICTED;
+ $delAction = LogPage::DELETED_ACTION | RevisionRecord::DELETED_RESTRICTED;
if ( $op === '&' ) {
$delUser = $dbw->bitNot( $delUser );
$delAction = $dbw->bitNot( $delAction );
* @ingroup RevisionDelete
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* General controller for RevDel, used by both SpecialRevisiondelete and
* ApiRevisionDelete.
$ret = [ 0 => [], 1 => [], 2 => [] ];
// Build bitfield changes in language
self::checkItem( 'revdelete-content',
- Revision::DELETED_TEXT, $diff, $n, $ret );
+ RevisionRecord::DELETED_TEXT, $diff, $n, $ret );
self::checkItem( 'revdelete-summary',
- Revision::DELETED_COMMENT, $diff, $n, $ret );
+ RevisionRecord::DELETED_COMMENT, $diff, $n, $ret );
self::checkItem( 'revdelete-uname',
- Revision::DELETED_USER, $diff, $n, $ret );
+ RevisionRecord::DELETED_USER, $diff, $n, $ret );
// Restriction application to sysops
- if ( $diff & Revision::DELETED_RESTRICTED ) {
- if ( $n & Revision::DELETED_RESTRICTED ) {
+ if ( $diff & RevisionRecord::DELETED_RESTRICTED ) {
+ if ( $n & RevisionRecord::DELETED_RESTRICTED ) {
$ret[2][] = 'revdelete-restricted';
} else {
$ret[2][] = 'revdelete-unrestricted';
* @file
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Item class for a live revision table row
*/
}
public function canView() {
- return $this->revision->userCan( Revision::DELETED_RESTRICTED, $this->context->getUser() );
+ return $this->revision->userCan(
+ RevisionRecord::DELETED_RESTRICTED, $this->context->getUser()
+ );
}
public function canViewContent() {
- return $this->revision->userCan( Revision::DELETED_TEXT, $this->context->getUser() );
+ return $this->revision->userCan(
+ RevisionRecord::DELETED_TEXT, $this->context->getUser()
+ );
}
public function isDeleted() {
- return $this->revision->isDeleted( Revision::DELETED_TEXT );
+ return $this->revision->isDeleted( RevisionRecord::DELETED_TEXT );
}
/**
* @ingroup SpecialPage
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Special page allowing users with the appropriate permissions to
* merge article histories, with some restrictions
[],
[ 'oldid' => $rev->getId() ]
);
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$pageLink = '<span class="history-deleted">' . $pageLink . '</span>';
}
# Last link
- if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$last = $this->msg( 'last' )->escaped();
} elseif ( isset( $this->prevId[$row->rev_id] ) ) {
$last = $linkRenderer->makeKnownLink(
* @ingroup SpecialPage
*/
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Special page allowing users with the appropriate permissions to view
* and hide revisions. Log items can also be hidden.
[ $this->typeLabels['check-label'], 'wpHidePrimary',
RevisionDeleter::getRevdelConstant( $this->typeName )
],
- [ 'revdelete-hide-comment', 'wpHideComment', Revision::DELETED_COMMENT ],
- [ 'revdelete-hide-user', 'wpHideUser', Revision::DELETED_USER ]
+ [ 'revdelete-hide-comment', 'wpHideComment', RevisionRecord::DELETED_COMMENT ],
+ [ 'revdelete-hide-user', 'wpHideUser', RevisionRecord::DELETED_USER ]
];
if ( $user->isAllowed( 'suppressrevision' ) ) {
$this->checks[] = [ 'revdelete-hide-restricted',
- 'wpHideRestricted', Revision::DELETED_RESTRICTED ];
+ 'wpHideRestricted', RevisionRecord::DELETED_RESTRICTED ];
}
# Either submit or create our form
return;
}
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
- if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$out->wrapWikiMsg(
"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
- $rev->isDeleted( Revision::DELETED_RESTRICTED ) ?
+ $rev->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ?
'rev-suppressed-text-permission' : 'rev-deleted-text-permission'
);
$out->wrapWikiMsg(
"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
- $rev->isDeleted( Revision::DELETED_RESTRICTED ) ?
+ $rev->isDeleted( RevisionRecord::DELETED_RESTRICTED ) ?
'rev-suppressed-text-view' : 'rev-deleted-text-view'
);
$out->addHTML( '<br />' );
if ( $this->mCanView ) {
$titleObj = $this->getPageTitle();
# Last link
- if ( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $this->getUser() ) ) {
$pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
$last = $this->msg( 'diff' )->escaped();
} elseif ( $remaining > 0 || ( $earliestLiveTime && $ts > $earliestLiveTime ) ) {
$user = $this->getUser();
$time = $this->getLanguage()->userTimeAndDate( $ts, $user );
- if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
return '<span class="history-deleted">' . $time . '</span>';
}
]
);
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$link = '<span class="history-deleted">' . $link . '</span>';
}
* @ingroup Pager
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\Rdbms\FakeResultWrapper;
use Wikimedia\Rdbms\IDatabase;
// Paranoia: avoid brute force searches (T19342)
if ( !$user->isAllowed( 'deletedhistory' ) ) {
- $queryInfo['conds'][] = $this->mDb->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0';
+ $queryInfo['conds'][] = $this->mDb->bitAnd(
+ 'rev_deleted', RevisionRecord::DELETED_USER
+ ) . ' = 0';
} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
- $queryInfo['conds'][] = $this->mDb->bitAnd( 'rev_deleted', Revision::SUPPRESSED_USER ) .
- ' != ' . Revision::SUPPRESSED_USER;
+ $queryInfo['conds'][] = $this->mDb->bitAnd(
+ 'rev_deleted', RevisionRecord::SUPPRESSED_USER
+ ) . ' != ' . RevisionRecord::SUPPRESSED_USER;
}
// $this->getIndexField() must be in the result rows, as reallyDoQuery() tries to access it.
}
}
# Is there a visible previous revision?
- if ( $rev->userCan( Revision::DELETED_TEXT, $user ) && $rev->getParentId() !== 0 ) {
+ if ( $rev->userCan( RevisionRecord::DELETED_TEXT, $user ) && $rev->getParentId() !== 0 ) {
$difftext = $linkRenderer->makeKnownLink(
$page,
new HtmlArmor( $this->messages['diff'] ),
# Note that only unprivileged users have rows with hidden user names excluded.
# When querying for an IP range, we want to always show user and user talk links.
$userlink = '';
- if ( ( $this->contribs == 'newbie' && !$rev->isDeleted( Revision::DELETED_USER ) )
+ if ( ( $this->contribs == 'newbie' && !$rev->isDeleted( RevisionRecord::DELETED_USER ) )
|| $this->isQueryableRange( $this->target ) ) {
$userlink = ' <span class="mw-changeslist-separator"></span> '
. $lang->getDirMark()
];
# Denote if username is redacted for this edit
- if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) ) {
$templateParams['rev-deleted-user-contribs'] =
$this->msg( 'rev-deleted-user-contribs' )->escaped();
}
* @ingroup Pager
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\Rdbms\FakeResultWrapper;
$user = $this->getUser();
// Paranoia: avoid brute force searches (T19792)
if ( !$user->isAllowed( 'deletedhistory' ) ) {
- $conds[] = $this->mDb->bitAnd( 'ar_deleted', Revision::DELETED_USER ) . ' = 0';
+ $conds[] = $this->mDb->bitAnd( 'ar_deleted', RevisionRecord::DELETED_USER ) . ' = 0';
} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
- $conds[] = $this->mDb->bitAnd( 'ar_deleted', Revision::SUPPRESSED_USER ) .
- ' != ' . Revision::SUPPRESSED_USER;
+ $conds[] = $this->mDb->bitAnd( 'ar_deleted', RevisionRecord::SUPPRESSED_USER ) .
+ ' != ' . RevisionRecord::SUPPRESSED_USER;
}
$commentQuery = CommentStore::getStore()->getJoin( 'ar_comment' );
$comment = Linker::revComment( $rev );
$date = $this->getLanguage()->userTimeAndDate( $rev->getTimestamp(), $user );
- if ( !$user->isAllowed( 'undelete' ) || !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+ if ( !$user->isAllowed( 'undelete' ) || !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
$link = htmlspecialchars( $date ); // unusable link
} else {
$link = $linkRenderer->makeKnownLink(
);
}
// Style deleted items
- if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
$link = '<span class="history-deleted">' . $link . '</span>';
}
$ret = "{$del}{$link} {$tools} {$separator} {$mflag} {$pagelink} {$comment}";
# Denote if username is redacted for this edit
- if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+ if ( $rev->isDeleted( RevisionRecord::DELETED_USER ) ) {
$ret .= " <strong>" . $this->msg( 'rev-deleted-user-contribs' )->escaped() . "</strong>";
}
<?php
use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Storage\RevisionRecord;
use MediaWiki\User\UserIdentity;
use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\IDatabase;
// Avoid brute force searches (T19342)
$bitmask = 0;
if ( !$user->isAllowed( 'deletedhistory' ) ) {
- $bitmask = Revision::DELETED_USER;
+ $bitmask = RevisionRecord::DELETED_USER;
} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
- $bitmask = Revision::DELETED_USER | Revision::DELETED_RESTRICTED;
+ $bitmask = RevisionRecord::DELETED_USER | RevisionRecord::DELETED_RESTRICTED;
}
if ( $bitmask ) {
$conds[] = $db->bitAnd( 'rc_deleted', $bitmask ) . " != $bitmask";
use MediaWiki\MediaWikiServices;
use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Storage\RevisionRecord;
/**
* Base class for language conversion.
$revision = Revision::newFromTitle( $title );
if ( $revision ) {
if ( $revision->getContentModel() == CONTENT_MODEL_WIKITEXT ) {
- $txt = $revision->getContent( Revision::RAW )->getText();
+ $txt = $revision->getContent( RevisionRecord::RAW )->getText();
}
// @todo in the future, use a specialized content model, perhaps based on json!