Merge branch 'master' into Wikidata

[lhc/web/wiklou.git] / includes / api / ApiComparePages.php

diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 3c987aa..1fac996 100644 (file)
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -32,8 +32,8 @@ class ApiComparePages extends ApiBase {
        public function execute() {
                $params = $this->extractRequestParams();
 
-               $rev1 = $this->revisionOrTitle( $params['fromrev'], $params['fromtitle'] );
-               $rev2 = $this->revisionOrTitle( $params['torev'], $params['totitle'] );
+               $rev1 = $this->revisionOrTitleOrId( $params['fromrev'], $params['fromtitle'], $params['fromid'] );
+               $rev2 = $this->revisionOrTitleOrId( $params['torev'], $params['totitle'], $params['toid'] );
 
         $contentHandler = ContentHandler::getForModelName( $rev1->getContentModelName() );
         $de = $contentHandler->getDifferenceEngine( $this->getContext(),
@@ -47,10 +47,16 @@ class ApiComparePages extends ApiBase {
                if ( isset( $params['fromtitle'] ) ) {
                        $vals['fromtitle'] = $params['fromtitle'];
                }
+               if ( isset( $params['fromid'] ) ) {
+                       $vals['fromid'] = $params['fromid'];
+               }
                $vals['fromrevid'] = $rev1;
                if ( isset( $params['totitle'] ) ) {
                        $vals['totitle'] = $params['totitle'];
                }
+               if ( isset( $params['toid'] ) ) {
+                       $vals['toid'] = $params['toid'];
+               }
                $vals['torevid'] = $rev2;
 
                $difftext = $de->getDiffBody();
@@ -68,9 +74,10 @@ class ApiComparePages extends ApiBase {
        /**
         * @param $revision int
         * @param $titleText string
+        * @param $titleId int
         * @return int
         */
-       private function revisionOrTitle( $revision, $titleText ) {
+       private function revisionOrTitleOrId( $revision, $titleText, $titleId ) {
                if( $revision ){
                        return $revision;
                } elseif( $titleText ) {
@@ -79,17 +86,29 @@ class ApiComparePages extends ApiBase {
                                $this->dieUsageMsg( array( 'invalidtitle', $titleText ) );
                        }
                        return $title->getLatestRevID();
+               } elseif ( $titleId ) {
+                       $title = Title::newFromID( $titleId );
+                       if( !$title ) {
+                               $this->dieUsageMsg( array( 'nosuchpageid', $titleId ) );
+                       }
+                       return $title->getLatestRevID();
                }
-               $this->dieUsage( 'inputneeded', 'A title or a revision number is needed for both the from and the to parameters' );
+               $this->dieUsage( 'inputneeded', 'A title, a page ID, or a revision number is needed for both the from and the to parameters' );
        }
 
        public function getAllowedParams() {
                return array(
                        'fromtitle' => null,
+                       'fromid' => array(
+                               ApiBase::PARAM_TYPE => 'integer'
+                       ),
                        'fromrev' => array(
                                ApiBase::PARAM_TYPE => 'integer'
                        ),
                        'totitle' => null,
+                       'toid' => array(
+                               ApiBase::PARAM_TYPE => 'integer'
+                       ),
                        'torev' => array(
                                ApiBase::PARAM_TYPE => 'integer'
                        ),
@@ -99,15 +118,17 @@ class ApiComparePages extends ApiBase {
        public function getParamDescription() {
                return array(
                        'fromtitle' => 'First title to compare',
+                       'fromid' => 'First page ID to compare',
                        'fromrev' => 'First revision to compare',
                        'totitle' => 'Second title to compare',
+                       'toid' => 'Second page ID to compare',
                        'torev' => 'Second revision to compare',
                );
        }
        public function getDescription() {
                return array(
                        'Get the difference between 2 pages',
-                       'You must pass a revision number or a page title for each part (1 and 2)'
+                       'You must pass a revision number or a page title or a page ID id for each part (1 and 2)'
                );
        }
 
@@ -115,6 +136,7 @@ class ApiComparePages extends ApiBase {
                return array_merge( parent::getPossibleErrors(), array(
                        array( 'code' => 'inputneeded', 'info' => 'A title or a revision is needed' ),
                        array( 'invalidtitle', 'title' ),
+                       array( 'nosuchpageid', 'pageid' ),
                        array( 'code' => 'baddiff', 'info' => 'The diff cannot be retrieved. Maybe one or both revisions do not exist or you do not have permission to view them.' ),
                ) );
        }