wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-23 10:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid using ContentHandler::getContentText()"

Browse source
This commit is contained in:
jenkins-bot 2021-07-12 14:22:05 +00:00 committed by Gerrit Code Review
parent fb853419ec bba113d92e
commit 98d7428837
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/DiscussionParser.php
View file

@ -517,13 +517,15 @@ abstract class EchoDiscussionParser {
$store = MediaWikiServices::getInstance()->getRevisionStore(); $store = MediaWikiServices::getInstance()->getRevisionStore();
$prevRevision = $store->getRevisionById( $revision->getParentId() ); $prevRevision = $store->getRevisionById( $revision->getParentId() );
if ( $prevRevision ) { if ( $prevRevision ) {
$prevText = ContentHandler::getContentText( $prevRevision->getContent( SlotRecord::MAIN ) ) ?: ''; $prevContent = $prevRevision->getContent( SlotRecord::MAIN );
$prevText = ( $prevContent instanceof TextContent ) ? $prevContent->getText() : '';
} }
} }
$content = $revision->getContent( SlotRecord::MAIN );
$changes = self::getMachineReadableDiff( $changes = self::getMachineReadableDiff(
$prevText, $prevText,
ContentHandler::getContentText( $revision->getContent( SlotRecord::MAIN ) ) ( $content instanceof TextContent ) ? $content->getText() : null
); );
$output = self::interpretDiff( $output = self::interpretDiff(
$changes, $changes,

4
includes/EchoOnWikiList.php
View file

@ -34,7 +34,9 @@ class EchoOnWikiList implements EchoContainmentList {
if ( $article === null || !$article->exists() ) { if ( $article === null || !$article->exists() ) {
return []; return [];
} }
$text = ContentHandler::getContentText( $article->getContent() );
$content = $article->getContent();
$text = ( $content instanceof TextContent ) ? $content->getText() : null;
if ( $text === null ) { if ( $text === null ) {
return []; return [];
} }