Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FeedUtils: Remove use of Revision objects

Browse source 
Bug: T250981
Bug: T249021
Change-Id: I0251865f6f1f5ab0627d5eac92d0e210284bc291
This commit is contained in:
DannyS712 2020-04-27 18:20:58 +00:00
parent 5e732f662c
commit 24de2ebf71
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
includes/FeedUtils.php
View file

@ -23,6 +23,7 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\SlotRecord;
/**
* Helper functions for feeds
@ -105,7 +106,8 @@ class FeedUtils {
// No "privileged" version should end up in the cache.
// Most feed readers will not log in anyway.
$anon = new User();
$permManager = MediaWikiServices::getInstance()->getPermissionManager();
$services = MediaWikiServices::getInstance();
$permManager = $services->getPermissionManager();
$accErrors = $permManager->getPermissionErrors(
'read',
$anon,
@ -118,19 +120,25 @@ class FeedUtils {
return $completeText;
}
$revLookup = $services->getRevisionLookup();
$contentHandlerFactory = $services->getContentHandlerFactory();
if ( $oldid ) {
$diffText = '';
// Don't bother generating the diff if we won't be able to show it
if ( $wgFeedDiffCutoff > 0 ) {
$rev = Revision::newFromId( $oldid );
$revRecord = $revLookup->getRevisionById( $oldid );
if ( !$rev ) {
if ( !$revRecord ) {
$diffText = false;
} else {
$context = clone RequestContext::getMain();
$context->setTitle( $title );
$contentHandler = $rev->getContentHandler();
$model = $revRecord->getSlot(
SlotRecord::MAIN,
RevisionRecord::RAW
)->getModel();
$contentHandler = $contentHandlerFactory->getContentHandler( $model );
$de = $contentHandler->createDifferenceEngine( $context, $oldid, $newid );
$diffText = $de->getDiff(
wfMessage( 'previousrevision' )->text(), // hack
@ -153,14 +161,13 @@ class FeedUtils {
$diffText = self::applyDiffStyle( $diffText );
}
} else {
$rev = Revision::newFromId( $newid );
if ( $wgFeedDiffCutoff <= 0 || $rev === null ) {
$newContent = MediaWikiServices::getInstance()
->getContentHandlerFactory()
$revRecord = $revLookup->getRevisionById( $newid );
if ( $wgFeedDiffCutoff <= 0 || $revRecord === null ) {
$newContent = $contentHandlerFactory
->getContentHandler( $title->getContentModel() )
->makeEmptyContent();
} else {
$newContent = $rev->getContent();
$newContent = $revRecord->getContent( SlotRecord::MAIN );
}
if ( $newContent instanceof TextContent ) {