wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-12-11 15:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove use of Revision::newFromTitle"

Browse source
This commit is contained in:
jenkins-bot 2020-04-07 02:11:52 +00:00 committed by Gerrit Code Review
parent e1509b9190 f0e26d680b
commit a048941208
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SimpleCaptcha/SimpleCaptcha.php
View file

@ -2,6 +2,9 @@
use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthenticationRequest;
use MediaWiki\MediaWikiServices; use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionAccessException;
use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\SlotRecord;
use Wikimedia\IPUtils; use Wikimedia\IPUtils;
/** /**
@ -1092,13 +1095,21 @@ class SimpleCaptcha {
* @return string * @return string
* @private * @private
*/ */
private function loadText( $title, $section, $flags = Revision::READ_LATEST ) { private function loadText( $title, $section, $flags = RevisionLookup::READ_LATEST ) {
$rev = Revision::newFromTitle( $title, 0, $flags ); $revRecord = MediaWikiServices::getInstance()
if ( $rev === null ) { ->getRevisionLookup()
->getRevisionByTitle( $title, 0, $flags );
if ( $revRecord === null ) {
return ""; return "";
} }
$content = $rev->getContent(); try {
$content = $revRecord->getContent( SlotRecord::MAIN );
} catch ( RevisionAccessException $e ) {
return '';
}
$text = ContentHandler::getContentText( $content ); $text = ContentHandler::getContentText( $content );
if ( $section !== '' ) { if ( $section !== '' ) {
return MediaWikiServices::getInstance()->getParser() return MediaWikiServices::getInstance()->getParser()