wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-12 09:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Get the overfetched before bundling to avoid removing the base"

Browse source
This commit is contained in:
jenkins-bot 2016-08-24 18:55:44 +00:00 committed by Gerrit Code Review
parent 9dd4e4ee30 cc86387f80
commit 276a38e8ad
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/api/ApiEchoNotifications.php
View file

@ -258,9 +258,9 @@ class ApiEchoNotifications extends ApiCrossWikiBase {
$notifs = $notifMapper->fetchUnreadByUser( $user, $limit + 1, $continue, $eventTypes, $titles );
}
// compute $canContinue before bundling and rendering so the count
// get $overfetchedItem before bundling and rendering so that the 'continue' value
// is not affected by filtering
$canContinue = count( $notifs ) > $limit;
$overfetchedItem = count( $notifs ) > $limit ? array_pop( $result['list'] ) : null;
if ( $bundle ) {
$bundler = new Bundler();
@ -281,10 +281,9 @@ class ApiEchoNotifications extends ApiCrossWikiBase {
}
// Generate offset if necessary
if ( $canContinue ) {
$lastItem = array_pop( $result['list'] );
if ( $overfetchedItem ) {
// @todo: what to do with this when fetching from multiple wikis?
$result['continue'] = $lastItem['timestamp']['utcunix'] . '|' . $lastItem['id'];
$result['continue'] = $overfetchedItem['timestamp']['utcunix'] . '|' . $overfetchedItem['id'];
}
return $result;