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

Paginate even if some events are filtered out

Browse source 
When requesting notifications, the 'continue' value used
for pagination is only included if there is more
notifications than requested. When some are filtered out,
there is less notifications and no 'continue' value,
which leads to no pagination at all on the special page.

Change-Id: I1a13d2a343f4e60489e2a6a0474c97664ed00d46
This commit is contained in:
Stephane Bisson 2016-07-25 15:54:16 -04:00
parent 5b7f24b11e
commit da0e0e37e0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/api/ApiEchoNotifications.php
View file

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