X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiExpandTemplates.php;h=562bcdf9da6ed227d938aa3cf58e6f4dca162927;hb=a9033efb28ca6e0e2e4ccb7bf9e9103b8d474b26;hp=7c86e09d3d31e6ba6526740c93c03e38cff801d9;hpb=949dc920ee61e838320186565cb6dc146a013b25;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php
index 7c86e09d3d..562bcdf9da 100644
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on Oct 05, 2007
- *
  * Copyright © 2007 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * API module that functions as a shortcut to the wikitext preprocessor. Expands
  * any templates in a provided string, and returns the result of this expansion
@@ -52,7 +50,7 @@ class ApiExpandTemplates extends ApiBase {
 
 		if ( $params['prop'] === null ) {
 			$this->addDeprecation(
-				'apiwarn-deprecation-expandtemplates-prop', 'action=expandtemplates&!prop'
+				[ 'apiwarn-deprecation-missingparam', 'prop' ], 'action=expandtemplates&!prop'
 			);
 			$prop = [];
 		} else {
@@ -67,12 +65,12 @@ class ApiExpandTemplates extends ApiBase {
 		// Get title and revision ID for parser
 		$revid = $params['revid'];
 		if ( $revid !== null ) {
-			$rev = Revision::newFromId( $revid );
+			$rev = MediaWikiServices::getInstance()->getRevisionStore()->getRevisionById( $revid );
 			if ( !$rev ) {
 				$this->dieWithError( [ 'apierror-nosuchrevid', $revid ] );
 			}
 			$pTitleObj = $titleObj;
-			$titleObj = $rev->getTitle();
+			$titleObj = Title::newFromLinkTarget( $rev->getPageAsLinkTarget() );
 			if ( $titleProvided ) {
 				if ( !$titleObj->equals( $pTitleObj ) ) {
 					$this->addWarning( [ 'apierror-revwrongpage', $rev->getId(),