Make paging links on category pages known. This allows more comfortable browsing...

[lhc/web/wiklou.git] / includes / CategoryPage.php

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 559f813..f431045 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -144,8 +144,13 @@ class CategoryViewer {
        function addSubcategory( $title, $sortkey, $pageLength ) {
                global $wgContLang;
                // Subcategory; strip the 'Category' namespace from the link text.
-               $this->children[] = $this->getSkin()->makeKnownLinkObj(
-                       $title, $wgContLang->convertHtml( $title->getText() ) );
+               $this->children[] = $this->getSkin()->link(
+                       $title,
+                       $wgContLang->convertHtml( $title->getText() ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
 
                $this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey );
        }
@@ -191,7 +196,14 @@ class CategoryViewer {
                global $wgContLang;
                $titletext = $wgContLang->convertHtml( $title->getPrefixedText() );
                $this->articles[] = $isRedirect
-                       ? '<span class="redirect-in-category">' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . '</span>'
+                       ? '<span class="redirect-in-category">' .
+                               $this->getSkin()->link(
+                                       $title,
+                                       $titletext,
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
+                               ) . '</span>'
                        : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext );
                $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) );
        }
@@ -251,17 +263,11 @@ class CategoryViewer {
                                $this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
                        }
                }
-               $dbr->freeResult( $res );
        }
 
        function getCategoryTop() {
-               $r = '';
-               if( $this->until != '' ) {
-                       $r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit );
-               } elseif( $this->nextPage != '' || $this->from != '' ) {
-                       $r .= $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit );
-               }
-               return $r == ''
+               $r = $this->getCategoryBottom();
+               return $r === ''
                        ? $r
                        : "<br style=\"clear:both;\"/>\n" . $r;
        }
@@ -452,13 +458,25 @@ class CategoryViewer {
 
                $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
                if( $first != '' ) {
-                       $prevLink = $sk->makeLinkObj( $title, $prevLink,
-                               wfArrayToCGI( $query + array( 'until' => $first ) ) );
+                       $prevQuery = $query;
+                       $prevQuery['until'] = $first;
+                       $prevLink = $sk->linkKnown(
+                               $title,
+                               $prevLink,
+                               array(),
+                               $prevQuery
+                       );
                }
                $nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
                if( $last != '' ) {
-                       $nextLink = $sk->makeLinkObj( $title, $nextLink,
-                               wfArrayToCGI( $query + array( 'from' => $last ) ) );
+                       $lastQuery = $query;
+                       $lastQuery['from'] = $last;
+                       $nextLink = $sk->linkKnown(
+                               $title,
+                               $nextLink,
+                               array(),
+                               $lastQuery
+                       );
                }
 
                return "($prevLink) ($nextLink)";