From: Umherirrender Date: Thu, 6 Jun 2019 20:10:57 +0000 (+0200) Subject: Add missing Title::newFromLinkTarget to api module compare X-Git-Tag: 1.34.0-rc.0~1494^2 X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=e4c494fd08721954d36cdab4a0856b7dd98fa38f;p=lhc%2Fweb%2Fwiklou.git Add missing Title::newFromLinkTarget to api module compare The function getArticleID is not implemented by a LinkTarget as returned by getPageAsLinkTarget, so this needs a wrapper to create a Title object. ApiQueryBase::addTitleInfo also needs a Title object to call getPrefixedText Change-Id: I8d1b4a77da8b3ce4eaf9e7e5100a3243669f2d3e --- diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index 1eb5e8da5e..e09691558c 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -562,7 +562,7 @@ class ApiComparePages extends ApiBase { */ private function setVals( &$vals, $prefix, $rev ) { if ( $rev ) { - $title = $rev->getPageAsLinkTarget(); + $title = Title::newFromLinkTarget( $rev->getPageAsLinkTarget() ); if ( isset( $this->props['ids'] ) ) { $vals["{$prefix}id"] = $title->getArticleID(); $vals["{$prefix}revid"] = $rev->getId(); @@ -603,7 +603,7 @@ class ApiComparePages extends ApiBase { $vals["{$prefix}comment"] = $comment->text; } $vals["{$prefix}parsedcomment"] = Linker::formatComment( - $comment->text, Title::newFromLinkTarget( $title ) + $comment->text, $title ); } }