Merge "API: Fix prop=revisions&rvdiffto= without rvprop=content"

diff --combined includes/api/ApiQueryRevisions.php
index 592c434,41bc8d4..50c3c7b
--- 1/includes/api/ApiQueryRevisions.php
--- 2/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@@ -37,7 -37,7 +37,7 @@@ class ApiQueryRevisions extends ApiQuer
        private $diffto, $difftotext, $expandTemplates, $generateXML, $section,
                $token, $parseContent, $contentFormat;
  
 -      public function __construct( $query, $moduleName ) {
 +      public function __construct( ApiQuery $query, $moduleName ) {
                parent::__construct( $query, $moduleName, 'rv' );
        }
  
@@@ -209,7 -209,7 +209,7 @@@
                        $this->addWhereFld( 'ct_tag', $params['tag'] );
                }
  
-               if ( isset( $prop['content'] ) || !is_null( $this->difftotext ) ) {
+               if ( isset( $prop['content'] ) || !is_null( $this->diffto ) || !is_null( $this->difftotext ) ) {
                        // For each page we will request, the user must have read rights for that page
                        $user = $this->getUser();
                        /** @var $title Title */