From 4e67c4bdee7e131fb8cd03541ee34e8d3bed8259 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 9 Feb 2009 13:28:12 +0000 Subject: [PATCH] Fix some more regressions from r46845 reported by Brad Jorsch on the mediawiki-api list --- includes/api/ApiQueryAllLinks.php | 6 ++++-- includes/api/ApiQueryAllmessages.php | 2 +- includes/api/ApiQueryDeletedrevs.php | 6 +++++- includes/api/ApiQueryRevisions.php | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php index 3238904b40..03262a75fc 100644 --- a/includes/api/ApiQueryAllLinks.php +++ b/includes/api/ApiQueryAllLinks.php @@ -127,8 +127,10 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase { $fit = $result->addValue(array('query', $this->getModuleName()), null, $vals); if(!$fit) { - $this->setContinueEnumParameter('continue', - $this->keyToTitle($row->pl_title) . "|" . $row->pl_from); + if($params['unique']) + $this->setContinueEnumParameter('from', $this->keyToTitle($row->pl_title)); + else + $this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from); break; } } else { diff --git a/includes/api/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php index 1c0b5326d1..1d617dc218 100644 --- a/includes/api/ApiQueryAllmessages.php +++ b/includes/api/ApiQueryAllmessages.php @@ -76,7 +76,7 @@ class ApiQueryAllmessages extends ApiQueryBase { $messages = array(); foreach( $messages_target as $message ) { if(!is_null($params['from'])) - if($message < $params['from']) + if($message != $params['from']) continue; $messages[$message] = wfMsg( $message ); } diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php index 8ef0e8eede..d4a6294712 100644 --- a/includes/api/ApiQueryDeletedrevs.php +++ b/includes/api/ApiQueryDeletedrevs.php @@ -229,7 +229,11 @@ class ApiQueryDeletedrevs extends ApiQueryBase { } if(!$fit) { - $this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->ar_timestamp)); + if($mode == 'all') + $this->setContinueEnumParameter('continue', $this->keyToTitle($row->ar_title) . '|' . + $row->ar_timestamp); + else + $this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->ar_timestamp)); break; } } diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index c88d3f998d..e8f55c0c7c 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -231,8 +231,8 @@ class ApiQueryRevisions extends ApiQueryBase { ApiBase :: dieDebug(__METHOD__, 'param validation?'); $this->addOption('LIMIT', $limit +1); - if(!is_null($continue)) - $this->addOption('OFFSET', $continue); + if(!is_null($params['continue'])) + $this->addOption('OFFSET', $params['continue']); $data = array (); $count = 0; @@ -256,7 +256,7 @@ class ApiQueryRevisions extends ApiQueryBase { if($enumRevMode) $this->setContinueEnumParameter('startid', intval($row->rev_id)); else - $this->setContinueEnumParameter('continue', $continue + $count - 1); + $this->setContinueEnumParameter('continue', $params['continue'] + $count - 1); break; } } -- 2.20.1