Skip to content

SLOP-376: port legacy Revision class to RevisionStore (removed in MW 1.39) #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosfos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SLOP-376: port legacy Revision class to RevisionStore (removed in MW 1.39) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions includes/ReviewHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ public function getTemplate() {

// returns essentially the negative-oneth revision...the one before
// the wl_notificationtimestamp revision...or null/false if none exists?
$mostRecentReviewed = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
$revStore = MediaWikiServices::getInstance()->getRevisionStore();
$mostRecentReviewed = $item->newRevisions[0] !== null
? $revStore->getPreviousRevision( $revStore->newRevisionFromRow( $item->newRevisions[0] ) )
: null;
} else {
$mostRecentReviewed = false; // no previous revision, the user has not reviewed the first!
}
Expand All @@ -164,8 +167,9 @@ public function getTemplate() {

} else {

$latest = Revision::newFromTitle( $item->title );
$lastSeenId = $latest->getId();
$revStore = MediaWikiServices::getInstance()->getRevisionStore();
$latest = $revStore->getKnownCurrentRevision( $item->title );
$lastSeenId = $latest ? $latest->getId() : null;

}

Expand Down
13 changes: 8 additions & 5 deletions specials/SpecialPendingReviews.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,8 @@ public function getStandardChangeRow( PendingReview $item, $rowCount ) {
} else {

if ( count( $item->newRevisions ) ) {
$previousViewedChange = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
$revStore = MediaWikiServices::getInstance()->getRevisionStore();
$previousViewedChange = $revStore->getPreviousRevision( $revStore->newRevisionFromRow( $item->newRevisions[0] ) );
if ( $previousViewedChange ) {
$prevId = $previousViewedChange->getId();
$context = new DerivativeContext( RequestContext::getMain() );
Expand Down Expand Up @@ -473,7 +474,8 @@ public function getReviewButton( $item ) {

// returns essentially the negative-oneth revision...the one before
// the wl_notificationtimestamp revision...or null/false if none exists?
$mostRecentReviewed = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
$revStore = MediaWikiServices::getInstance()->getRevisionStore();
$mostRecentReviewed = $revStore->getPreviousRevision( $revStore->newRevisionFromRow( $item->newRevisions[0] ) );
} else {
$mostRecentReviewed = false; // no previous revision, the user has not reviewed the first!
}
Expand All @@ -494,8 +496,9 @@ public function getReviewButton( $item ) {
);
} else {

$latest = Revision::newFromTitle( $item->title );
$diffURL = $item->title->getLocalURL( [ 'oldid' => $latest->getId() ] );
$revStore = MediaWikiServices::getInstance()->getRevisionStore();
$latest = $revStore->getKnownCurrentRevision( $item->title );
$diffURL = $item->title->getLocalURL( [ 'oldid' => $latest ? $latest->getId() : 0 ] );

$diffLink = Xml::element( 'a',
[ 'href' => $diffURL, 'class' => 'pendingreviews-green-button', 'target' => "_blank" ],
Expand Down Expand Up @@ -912,7 +915,7 @@ public function getPendingReviewChangesList( $combinedList ) {
$changeTs = $change->log_timestamp;
$changeText = $this->getLogChangeMessage( $change );
} else {
$rev = Revision::newFromRow( $change );
$rev = MediaWikiServices::getInstance()->getRevisionStore()->newRevisionFromRow( $change );
$changeTs = $change->rev_timestamp;
$userPage = Title::makeTitle( NS_USER, $change->rev_user_text )->getFullText();

Expand Down