Merge "Add 'contentmodel' to resultproperties in prop=revisions"

diff --combined includes/api/ApiQueryRevisions.php
index 4f08605,d159f2d..66ff3f0
--- 1/includes/api/ApiQueryRevisions.php
--- 2/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@@ -261,7 -261,7 +261,7 @@@ class ApiQueryRevisions extends ApiQuer
                        // rvstart and rvstartid when that is supplied.
                        if ( !is_null( $params['continue'] ) ) {
                                $params['startid'] = $params['continue'];
 -                              unset( $params['start'] );
 +                              $params['start'] = null;
                        }
  
                        // This code makes an assumption that sorting by rev_id and rev_timestamp produces
@@@ -546,9 -546,9 +546,9 @@@
  
                        if ( $text === null ) {
                                $format = $this->contentFormat ? $this->contentFormat : $content->getDefaultFormat();
 +                              $model = $content->getModel();
  
                                if ( !$content->isSupportedFormat( $format ) ) {
 -                                      $model = $content->getModel();
                                        $name = $title->getPrefixedDBkey();
  
                                        $this->dieUsage( "The requested format {$this->contentFormat} is not supported ".
@@@ -556,11 -556,7 +556,11 @@@
                                }
  
                                $text = $content->serialize( $format );
 +
 +                              // always include format and model.
 +                              // Format is needed to deserialize, model is needed to interpret.
                                $vals['contentformat'] = $format;
 +                              $vals['contentmodel'] = $model;
                        }
  
                        if ( $text !== false ) {
@@@ -787,7 -783,10 +787,10 @@@
                                        ApiBase::PROP_NULLABLE => true
                                ),
                                'texthidden' => 'boolean'
-                       )
+                       ),
+                       'contentmodel' => array(
+                               'contentmodel' => 'string'
+                       ),
                );
  
                self::addTokenProperties( $props, $this->getTokenFunctions() );