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

Merge "Use ParserCache for local file description renders"

Browse source
This commit is contained in:
jenkins-bot 2021-11-11 16:40:54 +00:00 committed by Gerrit Code Review
commit d4c92c6fd4
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/filerepo/file/LocalFile.php
View file

@ -25,7 +25,6 @@ use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Permissions\Authority;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\RevisionStore;
use MediaWiki\Storage\BlobStore;
use MediaWiki\User\UserIdentity;
use MediaWiki\User\UserIdentityValue;
@ -2539,28 +2538,29 @@ class LocalFile extends File {
return false; // Avoid hard failure when the file does not exist. T221812
}
$store = MediaWikiServices::getInstance()->getRevisionStore();
$revision = $store->getRevisionByTitle( $this->title, 0, RevisionStore::READ_NORMAL );
if ( !$revision ) {
$services = MediaWikiServices::getInstance();
$page = $services->getPageStore()->getPageByReference( $this->getTitle() );
if ( !$page ) {
return false;
}
$renderer = MediaWikiServices::getInstance()->getRevisionRenderer();
$rendered = $renderer->getRenderedRevision(
$revision,
ParserOptions::newFromUserAndLang(
if ( $lang ) {
$parserOptions = ParserOptions::newFromUserAndLang(
RequestContext::getMain()->getUser(),
$lang
)
);
if ( !$rendered ) {
// audience check failed
return false;
);
} else {
$parserOptions = ParserOptions::newFromContext( RequestContext::getMain() );
}
$pout = $rendered->getRevisionParserOutput();
return $pout->getText();
$parseStatus = $services->getParserOutputAccess()
->getParserOutput( $page, $parserOptions );
if ( !$parseStatus->isGood() ) {
// Rendering failed.
return false;
}
return $parseStatus->getValue()->getText();
}
/**

18
tests/phpunit/includes/filerepo/file/LocalFileTest.php
View file

@ -498,13 +498,27 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers File::getDescriptionText
* @covers LocalFile::getDescriptionText
*/
public function testDescriptionTextForNonExistingFile() {
public function testDescriptionText_NonExisting() {
$file = ( new LocalRepo( self::getDefaultInfo() ) )->newFile( 'test!' );
$this->assertFalse( $file->getDescriptionText() );
}
/**
* @covers LocalFile::getDescriptionText
*/
public function testDescriptionText_Existing() {
$this->assertTrue( $this->editPage(
__METHOD__,
'TEST CONTENT',
'',
NS_FILE
)->isOK() );
$file = ( new LocalRepo( self::getDefaultInfo() ) )->newFile( __METHOD__ );
$this->assertStringContainsString( 'TEST CONTENT', $file->getDescriptionText() );
}
public function provideLoadFromDBAndCache() {
return [
'legacy' => [