jenkins-bot has submitted this change and it was merged.
Change subject: SpecialAllPages: Fix a few subtle "Previous page" link bugs
......................................................................
SpecialAllPages: Fix a few subtle "Previous page" link bugs
* When finding the start of the previous page, exclude redirects if
"Hide redirects" is checked. Otherwise, if some of the previous 345
wiki pages were redirects, an equal number of results would be
repeated when going back.
* Use the DB key form of the title (not the unprefixed text form)
when building the query.
* Don't select unnecessary rows beyond the start of the previous page.
At the same time, fix a bug that could cause results close to the
beginning to be skipped when going back.
* When finding the start of the first page, don't omit ORDER BY for
MySQL and SQLite.
* Don't suppress the link when the unprefixed title is "0" or similar
or is numerically equal to the "from" parameter value.
* Suppress the link when the title would come after the "from"
parameter value, not just when it would be equal to that value.
Change-Id: I2cc6958b894afa824a5345871b5a27b01f9fcc73
---
M includes/specials/SpecialAllPages.php
1 file changed, 37 insertions(+), 46 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialAllPages.php
b/includes/specials/SpecialAllPages.php
index 74b1f7b..c4a67c0 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -25,6 +25,7 @@
* Implements Special:Allpages
*
* @ingroup SpecialPage
+ * @todo Rewrite using IndexPager
*/
class SpecialAllPages extends IncludableSpecialPage {
@@ -179,6 +180,7 @@
$toList = $this->getNamespaceKeyAndText( $namespace, $to );
$namespaces =
$this->getContext()->getLanguage()->getNamespaces();
$n = 0;
+ $prevTitle = null;
if ( !$fromList || !$toList ) {
$out = $this->msg( 'allpagesbadtitle' )->parseAsBlock();
@@ -191,15 +193,13 @@
list( , $toKey, $to ) = $toList;
$dbr = wfGetDB( DB_SLAVE );
- $conds = array(
- 'page_namespace' => $namespace,
- 'page_title >= ' . $dbr->addQuotes( $fromKey )
- );
-
+ $filterConds = array( 'page_namespace' => $namespace );
if ( $hideredirects ) {
- $conds['page_is_redirect'] = 0;
+ $filterConds['page_is_redirect'] = 0;
}
+ $conds = $filterConds;
+ $conds[] = 'page_title >= ' . $dbr->addQuotes( $fromKey
);
if ( $toKey !== "" ) {
$conds[] = 'page_title <= ' . $dbr->addQuotes(
$toKey );
}
@@ -234,49 +234,40 @@
} else {
$out = '';
}
+
+ if ( $fromKey !== '' && !$this->including() ) {
+ # Get the first title from previous chunk
+ $prevConds = $filterConds;
+ $prevConds[] = 'page_title < ' .
$dbr->addQuotes( $fromKey );
+ $prevKey = $dbr->selectField(
+ 'page',
+ 'page_title',
+ $prevConds,
+ __METHOD__,
+ array( 'ORDER BY' => 'page_title DESC',
'OFFSET' => $this->maxPerPage - 1 )
+ );
+
+ if ( $prevKey === false ) {
+ # The previous chunk is not complete,
need to link to the very first title
+ # available in the database
+ $prevKey = $dbr->selectField(
+ 'page',
+ 'page_title',
+ $prevConds,
+ __METHOD__,
+ array( 'ORDER BY' =>
'page_title' )
+ );
+ }
+
+ if ( $prevKey !== false ) {
+ $prevTitle = Title::makeTitle(
$namespace, $prevKey );
+ }
+ }
}
if ( $this->including() ) {
$output->addHTML( $out );
return;
- }
-
- if ( $from == '' ) {
- // First chunk; no previous link.
- $prevTitle = null;
- } else {
- # Get the last title from previous chunk
- $dbr = wfGetDB( DB_SLAVE );
- $res_prev = $dbr->select(
- 'page',
- 'page_title',
- array( 'page_namespace' => $namespace,
'page_title < ' . $dbr->addQuotes( $from ) ),
- __METHOD__,
- array( 'ORDER BY' => 'page_title DESC',
- 'LIMIT' => $this->maxPerPage, 'OFFSET'
=> ( $this->maxPerPage - 1 )
- )
- );
-
- # Get first title of previous complete chunk
- if ( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) {
- $pt = $dbr->fetchObject( $res_prev );
- $prevTitle = Title::makeTitle( $namespace,
$pt->page_title );
- } else {
- # The previous chunk is not complete, need to
link to the very first title
- # available in the database
- $options = array( 'LIMIT' => 1 );
- if ( !$dbr->implicitOrderby() ) {
- $options['ORDER BY'] = 'page_title';
- }
- $reallyFirstPage_title = $dbr->selectField(
'page', 'page_title',
- array( 'page_namespace' => $namespace
), __METHOD__, $options );
- # Show the previous link if it s not the
current requested chunk
- if ( $from != $reallyFirstPage_title ) {
- $prevTitle = Title::makeTitle(
$namespace, $reallyFirstPage_title );
- } else {
- $prevTitle = null;
- }
- }
}
$self = $this->getPageTitle();
@@ -287,7 +278,7 @@
$bottomLinks = array();
# Do we put a previous link ?
- if ( $prevTitle && $pt = $prevTitle->getText() ) {
+ if ( $prevTitle ) {
$query = array( 'from' => $prevTitle->getText() );
if ( $namespace ) {
@@ -300,7 +291,7 @@
$prevLink = Linker::linkKnown(
$self,
- $this->msg( 'prevpage', $pt )->escaped(),
+ $this->msg( 'prevpage', $prevTitle->getText()
)->escaped(),
array(),
$query
);
--
To view, visit https://gerrit.wikimedia.org/r/222715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cc6958b894afa824a5345871b5a27b01f9fcc73
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
