From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/api/ApiQueryRevisions.php | 57 +++++++++++++++----------------------- 1 file changed, 22 insertions(+), 35 deletions(-) (limited to 'includes/api/ApiQueryRevisions.php') diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 64a0a4ea..e6b21a92 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -1,6 +1,6 @@ tokenFunctions; } + /** + * @param $pageid + * @param $title Title + * @param $rev Revision + * @return bool|String + */ public static function getRollbackToken( $pageid, $title, $rev ) { global $wgUser; if ( !$wgUser->isAllowed( 'rollback' ) ) { @@ -119,8 +125,7 @@ class ApiQueryRevisions extends ApiQueryBase { $params['diffto'] = 0; } if ( ( !ctype_digit( $params['diffto'] ) || $params['diffto'] < 0 ) - && $params['diffto'] != 'prev' && $params['diffto'] != 'next' ) - { + && $params['diffto'] != 'prev' && $params['diffto'] != 'next' ) { $this->dieUsage( 'rvdiffto must be set to a non-negative number, "prev", "next" or "cur"', 'diffto' ); } // Check whether the revision exists and is readable, @@ -169,7 +174,6 @@ class ApiQueryRevisions extends ApiQueryBase { $this->getResult()->setParsedLimit( $this->getModuleName(), $limit ); } - if ( !is_null( $this->token ) || $pageCount > 0 ) { $this->addFields( Revision::selectPageFields() ); } @@ -224,10 +228,9 @@ class ApiQueryRevisions extends ApiQueryBase { } } - //Bug 24166 - API error when using rvprop=tags + // Bug 24166 - API error when using rvprop=tags $this->addTables( 'revision' ); - if ( $enumRevMode ) { // This is mostly to prevent parameter errors (and optimize SQL?) if ( !is_null( $params['startid'] ) && !is_null( $params['start'] ) ) { @@ -249,14 +252,14 @@ class ApiQueryRevisions extends ApiQueryBase { // one row with the same timestamp for the same page. // The order needs to be the same as start parameter to avoid SQL filesort. if ( is_null( $params['startid'] ) && is_null( $params['endid'] ) ) { - $this->addWhereRange( 'rev_timestamp', $params['dir'], + $this->addTimestampWhereRange( 'rev_timestamp', $params['dir'], $params['start'], $params['end'] ); } else { $this->addWhereRange( 'rev_id', $params['dir'], $params['startid'], $params['endid'] ); // One of start and end can be set // If neither is set, this does nothing - $this->addWhereRange( 'rev_timestamp', $params['dir'], + $this->addTimestampWhereRange( 'rev_timestamp', $params['dir'], $params['start'], $params['end'], false ); } @@ -479,27 +482,7 @@ class ApiQueryRevisions extends ApiQueryBase { $text = $wgParser->preprocess( $text, $title, new ParserOptions() ); } if ( $this->parseContent ) { - global $wgEnableParserCache; - - $popts = new ParserOptions(); - $popts->setTidy( true ); - - $articleObj = new Article( $title ); - - $p_result = false; - $pcache = ParserCache::singleton(); - if ( $wgEnableParserCache ) { - $p_result = $pcache->get( $articleObj, $popts ); - } - if ( !$p_result ) { - $p_result = $wgParser->parse( $text, $title, $popts ); - - if ( $wgEnableParserCache ) { - $pcache->save( $p_result, $articleObj, $popts ); - } - } - - $text = $p_result->getText(); + $text = $wgParser->parse( $text, $title, new ParserOptions() )->getText(); } ApiResult::setContent( $vals, $text ); } elseif ( $this->fld_content ) { @@ -627,9 +610,9 @@ class ApiQueryRevisions extends ApiQueryBase { 'endid' => 'Stop revision enumeration on this revid (enum)', 'start' => 'From which revision timestamp to start enumeration (enum)', 'end' => 'Enumerate up to this timestamp (enum)', - 'dir' => 'Direction of enumeration - towards "newer" or "older" revisions (enum)', - 'user' => 'Only include revisions made by user', - 'excludeuser' => 'Exclude revisions made by user', + 'dir' => $this->getDirectionDescription( $p, ' (enum)' ), + 'user' => 'Only include revisions made by user (enum)', + 'excludeuser' => 'Exclude revisions made by user (enum)', 'expandtemplates' => 'Expand templates in revision content', 'generatexml' => 'Generate XML parse tree for revision content', 'parse' => 'Parse revision content. For performance reasons if this option is used, rvlimit is enforced to 1.', @@ -647,7 +630,7 @@ class ApiQueryRevisions extends ApiQueryBase { public function getDescription() { return array( 'Get revision information', - 'This module may be used in several ways:', + 'May be used in several ways:', ' 1) Get data about a set of pages (last revision), by setting titles or pageids parameter', ' 2) Get revisions for one given page, by using titles/pageids with start/end/limit params', ' 3) Get data about a set of revisions by setting their IDs with revids parameter', @@ -685,7 +668,11 @@ class ApiQueryRevisions extends ApiQueryBase { ); } + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:Properties#revisions_.2F_rv'; + } + public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryRevisions.php 75521 2010-10-27 11:50:20Z catrope $'; + return __CLASS__ . ': $Id: ApiQueryRevisions.php 104449 2011-11-28 15:52:04Z reedy $'; } } -- cgit v1.2.3-54-g00ecf