* (bug 8919) Suppress paging links and related messages where there are no

  rows to list for query pages
  Based on patch by Sui Min

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 24399ba..52cd439 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -220,6 +220,8 @@ lighter making things easier to read.
 * (bug 9044) Send a comment with action=raw pages in CSS/JS output mode
   to work around IE/Mac bug where empty pages time out verrrrryyyyy slowly,
   particularly with new keepalive-friendly HTTP on Wikipedia
+* (bug 8919) Suppress paging links and related messages where there are no
+  rows to list for query pages
 
 
 == Languages updated ==

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index fd91f9e..42e8a6b 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -332,6 +332,13 @@ class QueryPage {
 
                if($shownavigation) {
                        $wgOut->addHTML( $this->getPageHeader() );
+
+                       # if list is empty, show it
+                       if( $num == 0 ) {
+                               $wgOut->addHTML( '<hr><p>' . wfMsgHTML('specialpage-empty') . '</p>' );
+                               return;
+                       }
+
                        $top = wfShowingResults( $offset, $num);
                        $wgOut->addHTML( "<p>{$top}\n" );
 

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index f65fe5a..8fc74fe 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -198,16 +198,16 @@ class IPUnblockForm {
                }
 
                $pager = new IPBlocklistPager( $this, $conds );
-               $s = $pager->getNavigationBar() .
-                       $this->searchForm();
                if ( $pager->getNumRows() ) {
+                       $s = $this->searchForm() .
+                               $pager->getNavigationBar();
                        $s .= "<ul>" . 
                                $pager->getBody() .
                                "</ul>";
+                       $s .= $pager->getNavigationBar();
                } else {
-                       $s .= '<p>' . wfMsgHTML( 'ipblocklistempty' ) . '</p>';
+                       $s = '<hr><p>' . wfMsgHTML( 'ipblocklistempty' ) . '</p>';
                }
-               $s .= $pager->getNavigationBar();
                $wgOut->addHTML( $s );
        }
 

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index 8c2c20f..a50096f 100644 (file)
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -23,16 +23,16 @@ class ProtectedPagesForm {
                }
 
                $pager = new ProtectedPagesPager( $this );
-               $s = $pager->getNavigationBar();
 
                if ( $pager->getNumRows() ) {
+                       $s = $pager->getNavigationBar();
                        $s .= "<ul>" . 
                                $pager->getBody() .
                                "</ul>";
+                       $s .= $pager->getNavigationBar();
                } else {
-                       $s .= '<p>' . wfMsgHTML( 'protectedpagesempty' ) . '</p>';
+                       $s = '<hr><p>' . wfMsgHTML( 'protectedpagesempty' ) . '</p>';
                }
-               $s .= $pager->getNavigationBar();
                $wgOut->addHTML( $s );
        }
 

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index b58f91d..e96c875 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -159,12 +159,14 @@ class SpecialSearch {
 
                $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
                        + ( $textMatches ? $textMatches->numRows() : 0);
-               if ( $num >= $this->limit ) {
-                       $top = wfShowingResults( $this->offset, $this->limit );
-               } else {
-                       $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
+               if ( $num > 0 ) {
+                       if ( $num >= $this->limit ) {
+                               $top = wfShowingResults( $this->offset, $this->limit );
+                       } else {
+                               $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
+                       }
+                       $wgOut->addHTML( "<p>{$top}</p>\n" );
                }
-               $wgOut->addHTML( "<p>{$top}</p>\n" );
 
                if( $num || $this->offset ) {
                        $prevnext = wfViewPrevNext( $this->offset, $this->limit,

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 1894d12..06dbf98 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1080,10 +1080,11 @@ Davon haben '''$2''' (=$4%) $5-Rechte.",
 # Miscellaneous special pages
 'nbytes'                          => '$1 {{PLURAL:$1|Byte|Bytes}}',
 'ncategories'                     => '$1 {{PLURAL:$1|Kategorie|Kategorien}}',
-'nlinks'                          => '{{PLURAL:$1|ein Verweis|$1 Verweise}}',
+'nlinks'                          => '{{PLURAL:$1|1 Verweis|$1 Verweise}}',
 'nmembers'                        => '– {{PLURAL:$1|1 Eintrag|$1 Einträge}}',
-'nrevisions'                      => '{{PLURAL:$1|eine Bearbeitung|$1 Bearbeitungen}}',
-'nviews'                          => '{{PLURAL:$1|eine Abfrage|$1 Abfragen}}',
+'nrevisions'                      => '{{PLURAL:$1|1 Bearbeitung|$1 Bearbeitungen}}',
+'nviews'                          => '{{PLURAL:$1|1 Abfrage|$1 Abfragen}}',
+'specialpage-empty'               => 'Die Seite enthält aktuell keine Einträge.',
 'lonelypages'                     => 'Verwaiste Seiten',
 'lonelypages-summary'             => 'Diese Spezialseite zeigt Seiten, auf die von keiner anderen Seite verlinkt wird. Diese verwaisten Seiten sind deshalb nicht erwünscht, oder eventuell fragwürdig, weil sie über die normale Navigation durch {{SITENAME}} nie aufgerufen werden können. ',
 'lonelypagestext'                 => '',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e4bfeae..28724b5 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1484,7 +1484,7 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$7'''
 'nmembers'             => '$1 {{PLURAL:$1|member|members}}',
 'nrevisions'           => '$1 {{PLURAL:$1|revision|revisions}}',
 'nviews'               => '$1 {{PLURAL:$1|view|views}}',
-
+'specialpage-empty'     => 'This page is empty.',
 'lonelypages'  => 'Orphaned pages',
 'lonelypages-summary'  => '',
 'lonelypagestext'      => 'The following pages are not linked from other pages in this wiki.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index ff76442..a0b9224 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -879,6 +879,7 @@ $wgMessageStructure = array(
                'nmembers',
                'nrevisions',
                'nviews',
+               'specialpage-empty',
                'lonelypages',
                'lonelypages-summary',
                'lonelypagestext',