* Don't show hist link if hidden

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

diff --git a/includes/SpecialCategories.php b/includes/SpecialCategories.php
index 13866a3..a653d2a 100644 (file)
--- a/includes/SpecialCategories.php
+++ b/includes/SpecialCategories.php
@@ -9,28 +9,47 @@ function wfSpecialCategories() {
 
        $cap = new CategoryPager();
        $wgOut->addHTML( 
-               wfMsgWikiHtml( 'categoriespagetext' ) .
+               wfMsgExt( 'categoriespagetext', array( 'parse' ) ) .
                $cap->getNavigationBar()
                . '<ul>' . $cap->getBody() . '</ul>' .
                $cap->getNavigationBar()
-               );
+       );
 }
 
+/**
+ * TODO: Allow sorting by count.  We need to have a unique index to do this
+ * properly.
+ *
+ * @addtogroup SpecialPage
+ * @addtogroup Pager
+ */
 class CategoryPager extends AlphabeticPager {
        function getQueryInfo() {
+               global $wgRequest;
                return array(
-                       'tables' => array('categorylinks'),
-                       'fields' => array('cl_to','count(*) count'),
-                       'options' => array('GROUP BY' => 'cl_to')
-                       );
+                       'tables' => array( 'category' ),
+                       'fields' => array( 'cat_title','cat_pages' ),
+                       'conds' => array( 'cat_pages > 0' )
+               );
        }
        
        function getIndexField() {
-               return "cl_to";
+#              return array( 'abc' => 'cat_title', 'count' => 'cat_pages' );
+               return 'cat_title';
+       }
+
+#      protected function getOrderTypeMessages() {
+#              return array( 'abc' => 'special-categories-sort-abc',
+#                      'count' => 'special-categories-sort-count' );
+#      }
+
+       protected function getDefaultDirections() {
+#              return array( 'abc' => false, 'count' => true );
+               return false;
        }
        
        /* Override getBody to apply LinksBatch on resultset before actually outputting anything. */
-       function getBody() {
+       public function getBody() {
                if (!$this->mQueryDone) {
                        $this->doQuery();
                }
@@ -39,7 +58,7 @@ class CategoryPager extends AlphabeticPager {
                $this->mResult->rewind();
                
                while ( $row = $this->mResult->fetchObject() ) {
-                       $batch->addObj( Title::makeTitleSafe( NS_CATEGORY, $row->cl_to ) );
+                       $batch->addObj( Title::makeTitleSafe( NS_CATEGORY, $row->cat_title ) );
                }
                $batch->execute();
                $this->mResult->rewind();
@@ -48,15 +67,12 @@ class CategoryPager extends AlphabeticPager {
        
        function formatRow($result) {
                global $wgLang;
-               $title = Title::makeTitle( NS_CATEGORY, $result->cl_to );
-               return ( 
-                       '<li>' .
-                       $this->getSkin()->makeLinkObj( $title, $title->getText() )
-                       . ' ' .
-                       wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
-                               $wgLang->formatNum( $result->count ) )
-                       . "</li>\n" );
+               $title = Title::makeTitle( NS_CATEGORY, $result->cat_title );
+               $titleText = $this->getSkin()->makeLinkObj( $title, htmlspecialchars( $title->getText() ) );
+               $count = wfMsgExt( 'nmembers', array( 'parsemag', 'escape' ),
+                               $wgLang->formatNum( $result->cat_pages ) );
+               return Xml::tags('li', null, "$titleText ($count)" ) . "\n";
        }
 }
 
-?>
+