Followup r95753 per CR: prevent extensions from making isMovable() return true for...
[lhc/web/wiklou.git] / includes / CategoryPage.php
index 2bed882..bb08cf5 100644 (file)
@@ -1,32 +1,57 @@
 <?php
 /**
- * Special handling for category description pages
- * Modelled after ImagePage.php
+ * Class for viewing MediaWiki category description pages.
+ * Modelled after ImagePage.php.
  *
- * @package MediaWiki
+ * @file
  */
-if( !defined( 'MEDIAWIKI' ) )
-       die();
 
-if( $wgCategoryMagicGallery ) 
-       require_once('ImageGallery.php');
+if ( !defined( 'MEDIAWIKI' ) )
+       die( 1 );
 
 /**
- * @package MediaWiki 
+ * Special handling for category description pages, showing pages,
+ * subcategories and file that belong to the category
  */
 class CategoryPage extends Article {
+       # Subclasses can change this to override the viewer class.
+       protected $mCategoryViewerClass = 'CategoryViewer';
+
+       protected function newPage( Title $title ) {
+               // Overload mPage with a category-specific page
+               return new WikiCategoryPage( $title );
+       }
+
+       /**
+        * Constructor from a page id
+        * @param $id Int article ID to load
+        */
+       public static function newFromID( $id ) {
+               $t = Title::newFromID( $id );
+               # @todo FIXME: Doesn't inherit right
+               return $t == null ? null : new self( $t );
+               # return $t == null ? null : new static( $t ); // PHP 5.3
+       }
 
        function view() {
+               global $wgRequest, $wgUser;
+
+               $diff = $wgRequest->getVal( 'diff' );
+               $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
+
+               if ( isset( $diff ) && $diffOnly ) {
+                       return parent::view();
+               }
+
+               if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) {
+                       return;
+               }
+
                if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
                        $this->openShowCategory();
                }
 
-               Article::view();
-               
-               # If the article we've just shown is in the "Image" namespace,
-               # follow it with the history list and link list for the image
-               # it describes.
+               parent::view();
 
                if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
                        $this->closeShowCategory();
@@ -36,294 +61,666 @@ class CategoryPage extends Article {
        function openShowCategory() {
                # For overloading
        }
-       
-       # generate a list of subcategories and pages for a category
-       # depending on wfMsg("usenewcategorypage") it either calls the new
-       # or the old code. The new code will not work properly for some
-       # languages due to sorting issues, so they might want to turn it
-       # off.
 
        function closeShowCategory() {
-               global $wgOut;
-               $msg = wfMsg('usenewcategorypage');
-               if ( '0' == @$msg[0] )
-               {
-                       $wgOut->addHTML( $this->oldCategoryMagic() );
-               } else {
-                       $wgOut->addHTML( $this->newCategoryMagic() );
-               }
-       }
+               global $wgOut, $wgRequest;
 
-       # This method generates the list of subcategories and pages for a category
-       function oldCategoryMagic () {
-               global $wgContLang, $wgUser ;
-               $fname = 'CategoryPage::oldCategoryMagic';
+               // Use these as defaults for back compat --catrope
+               $oldFrom = $wgRequest->getVal( 'from' );
+               $oldUntil = $wgRequest->getVal( 'until' );
+               
+               $from = $until = array();
+               foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
+                       $from[$type] = $wgRequest->getVal( "{$type}from", $oldFrom );
+                       $until[$type] = $wgRequest->getVal( "{$type}until", $oldUntil );
+               }
 
+               $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() );
+               $wgOut->addHTML( $viewer->getHTML() );
+       }
+}
 
-               $sk =& $wgUser->getSkin() ;
+class CategoryViewer {
+       var $limit, $from, $until,
+               $articles, $articles_start_char,
+               $children, $children_start_char,
+               $showGallery, $imgsNoGalley,
+               $imgsNoGallery_start_char,
+               $imgsNoGallery;
+
+       /**
+        * @var 
+        */
+       var $nextPage;
+
+       /**
+        * @var Array
+        */
+       var $flip;
+
+       /**
+        * @var Title
+        */
+       var $title;
+
+       /**
+        * @var Collation
+        */
+       var $collation;
+
+       /**
+        * @var ImageGallery
+        */
+       var $gallery;
+
+       /**
+        * Category object for this page
+        * @var Category
+        */
+       private $cat;
+
+       /**
+        * The original query array, to be used in generating paging links.
+        * @var array
+        */
+       private $query;
+
+       function __construct( $title, $from = '', $until = '', $query = array() ) {
+               global $wgCategoryPagingLimit;
+               $this->title = $title;
+               $this->from = $from;
+               $this->until = $until;
+               $this->limit = $wgCategoryPagingLimit;
+               $this->cat = Category::newFromTitle( $title );
+               $this->query = $query;
+               $this->collation = Collation::singleton();
+               unset( $this->query['title'] );
+       }
 
-               $articles = array() ;
-               $children = array() ;
-               $r = '';
-               $id = $this->mTitle->getArticleID() ;
-
-               # FIXME: add limits
-               $dbr =& wfGetDB( DB_SLAVE );
-               $page = $dbr->tableName( 'page' );
-               $categorylinks = $dbr->tableName( 'categorylinks' );
-
-               $t = $dbr->strencode( $this->mTitle->getDBKey() );
-               $sql = "SELECT DISTINCT page_title, page_namespace FROM $page,$categorylinks " .
-                               "WHERE cl_to='$t' AND cl_from=page_id AND page_is_redirect=0 ORDER BY cl_sortkey" ;
-               $res = $dbr->query( $sql, $fname ) ;
-               # For all pages that link to this category
-               while ( $x = $dbr->fetchObject ( $res ) )
-               {
-                       $t = $wgContLang->getNsText ( $x->page_namespace ) ;
-                       if ( $t != '' ) $t .= ':' ;
-                       $t .= $x->page_title ;
-
-                       if ( $x->page_namespace == NS_CATEGORY ) {
-                                       array_push ( $children , $sk->makeLink ( $t ) ) ; # Subcategory
-                       } else {
-                                       array_push ( $articles , $sk->makeLink ( $t ) ) ; # Page in this category
-                       }
+       /**
+        * Format the category data list.
+        *
+        * @return string HTML output
+        */
+       public function getHTML() {
+               global $wgOut, $wgCategoryMagicGallery;
+               wfProfileIn( __METHOD__ );
+
+               $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
+
+               $this->clearCategoryState();
+               $this->doCategoryQuery();
+               $this->finaliseCategoryState();
+
+               $r = $this->getSubcategorySection() .
+                       $this->getPagesSection() .
+                       $this->getImageSection();
+
+               if ( $r == '' ) {
+                       // If there is no category content to display, only
+                       // show the top part of the navigation links.
+                       // @todo FIXME: Cannot be completely suppressed because it
+                       //        is unknown if 'until' or 'from' makes this
+                       //        give 0 results.
+                       $r = $r . $this->getCategoryTop();
+               } else {
+                       $r = $this->getCategoryTop() .
+                               $r .
+                               $this->getCategoryBottom();
                }
-               $dbr->freeResult ( $res ) ;
 
-               # Showing subcategories
-               if ( count ( $children ) > 0 ) {
-                       $r .= '<h2>'.wfMsg('subcategories')."</h2>\n" ;
-                       $r .= implode ( ', ' , $children ) ;
+               // Give a proper message if category is empty
+               if ( $r == '' ) {
+                       $r = wfMsgExt( 'category-empty', array( 'parse' ) );
+               } else {
+                       $pageLang = $this->title->getPageLanguage();
+                       $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() );
+                       # close the previous div, show the headings in user language,
+                       # then open a new div with the page content language again
+                       $r = '</div>' . $r . Html::openElement( 'div', $langAttribs );
                }
 
-               # Showing pages in this category
-               if ( count ( $articles ) > 0 ) {
-                       $ti = $this->mTitle->getText() ;
-                       $h =  wfMsg( 'category_header', $ti );
-                       $r .= "<h2>$h</h2>\n" ;
-                       $r .= implode ( ', ' , $articles ) ;
+               wfProfileOut( __METHOD__ );
+               return $r;
+       }
+
+       function clearCategoryState() {
+               $this->articles = array();
+               $this->articles_start_char = array();
+               $this->children = array();
+               $this->children_start_char = array();
+               if ( $this->showGallery ) {
+                       $this->gallery = new ImageGallery();
+                       $this->gallery->setHideBadImages();
+               } else {
+                       $this->imgsNoGallery = array();
+                       $this->imgsNoGallery_start_char = array();
                }
+       }
 
-               # Showing subcategories
-               if ( count ( $children ) > 0 ) {
-                       $r .= '<h2>'.wfMsg('subcategories')."</h2>\n" ;
-                       $r .= implode ( ', ' , $children ) ;
+       /**
+        * Add a subcategory to the internal lists, using a Category object
+        */
+       function addSubcategoryObject( Category $cat, $sortkey, $pageLength ) {
+               // Subcategory; strip the 'Category' namespace from the link text.
+               $title = $cat->getTitle();
+
+               $link = Linker::link( $title, htmlspecialchars( $title->getText() ) );
+               if ( $title->isRedirect() ) {
+                       // This didn't used to add redirect-in-category, but might
+                       // as well be consistent with the rest of the sections
+                       // on a category page.
+                       $link = '<span class="redirect-in-category">' . $link . '</span>';
                }
+               $this->children[] = $link;
+
+               $this->children_start_char[] = 
+                       $this->getSubcategorySortChar( $cat->getTitle(), $sortkey );
+       }
 
-               # Showing pages in this category
-               if ( count ( $articles ) > 0 ) {
-                       $ti = $this->mTitle->getText() ;
-                       $h =  wfMsg( 'category_header', $ti );
-                       $r .= "<h2>$h</h2>\n" ;
-                       $r .= implode ( ', ' , $articles ) ;
+       /**
+        * Add a subcategory to the internal lists, using a title object
+        * @deprecated since 1.17 kept for compatibility, please use addSubcategoryObject instead
+        */
+       function addSubcategory( Title $title, $sortkey, $pageLength ) {
+               $this->addSubcategoryObject( Category::newFromTitle( $title ), $sortkey, $pageLength );
+       }
+
+       /**
+       * Get the character to be used for sorting subcategories.
+       * If there's a link from Category:A to Category:B, the sortkey of the resulting
+       * entry in the categorylinks table is Category:A, not A, which it SHOULD be.
+       * Workaround: If sortkey == "Category:".$title, than use $title for sorting,
+       * else use sortkey...
+       *
+       * @param Title $title
+       * @param string $sortkey The human-readable sortkey (before transforming to icu or whatever).
+       */
+       function getSubcategorySortChar( $title, $sortkey ) {
+               global $wgContLang;
+
+               if ( $title->getPrefixedText() == $sortkey ) {
+                       $word = $title->getDBkey();
+               } else {
+                       $word = $sortkey;
                }
 
-               return $r ;
+               $firstChar = $this->collation->getFirstLetter( $word );
+
+               return $wgContLang->convert( $firstChar );
        }
 
-       function newCategoryMagic () {
-               global $wgContLang,$wgUser, $wgCategoryMagicGallery;
+       /**
+        * Add a page in the image namespace
+        */
+       function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) {
+               global $wgContLang;
+               if ( $this->showGallery ) {
+                       $flip = $this->flip['file'];
+                       if ( $flip ) {
+                               $this->gallery->insert( $title );
+                       } else {
+                               $this->gallery->add( $title );
+                       }
+               } else {
+                       $link = Linker::link( $title );
+                       if ( $isRedirect ) {
+                               // This seems kind of pointless given 'mw-redirect' class,
+                               // but keeping for back-compatibility with user css.
+                               $link = '<span class="redirect-in-category">' . $link . '</span>';
+                       }
+                       $this->imgsNoGallery[] = $link;
 
-               $sk =& $wgUser->getSkin();
+                       $this->imgsNoGallery_start_char[] = $wgContLang->convert( 
+                               $this->collation->getFirstLetter( $sortkey ) );
+               }
+       }
 
-               $r = "<br style=\"clear:both;\"/>\n";
+       /**
+        * Add a miscellaneous page
+        */
+       function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
+               global $wgContLang;
+
+               $link = Linker::link( $title );
+               if ( $isRedirect ) {
+                       // This seems kind of pointless given 'mw-redirect' class,
+                       // but keeping for back-compatiability with user css.
+                       $link = '<span class="redirect-in-category">' . $link . '</span>';
+               }
+               $this->articles[] = $link;
 
-               $articles = array() ;
-               $articles_start_char = array();
-               $children = array() ;
-               $children_start_char = array();
-               $data = array () ;
-               $id = $this->mTitle->getArticleID() ;
+               $this->articles_start_char[] = $wgContLang->convert( 
+                       $this->collation->getFirstLetter( $sortkey ) );
+       }
 
-               if ( $wgCategoryMagicGallery ) {
-                       $ig = new ImageGallery();
+       function finaliseCategoryState() {
+               if ( $this->flip['subcat'] ) {
+                       $this->children            = array_reverse( $this->children );
+                       $this->children_start_char = array_reverse( $this->children_start_char );
                }
+               if ( $this->flip['page'] ) {
+                       $this->articles            = array_reverse( $this->articles );
+                       $this->articles_start_char = array_reverse( $this->articles_start_char );
+               }
+               if ( !$this->showGallery && $this->flip['file'] ) {
+                       $this->imgsNoGallery            = array_reverse( $this->imgsNoGallery );
+                       $this->imgsNoGallery_start_char = array_reverse( $this->imgsNoGallery_start_char );
+               }
+       }
 
-               # FIXME: add limits
-               $dbr =& wfGetDB( DB_SLAVE );
-               $page = $dbr->tableName( 'page' );
-               $categorylinks = $dbr->tableName( 'categorylinks' );
-
-               $t = $dbr->strencode( $this->mTitle->getDBKey() );
-               $sql = "SELECT DISTINCT page_title,page_namespace,cl_sortkey FROM " .
-                               "$page,$categorylinks WHERE cl_to='$t' AND cl_from=page_id AND page_is_redirect ORDER BY cl_sortkey" ;
-               $res = $dbr->query ( $sql ) ;
-               while ( $x = $dbr->fetchObject ( $res ) )
-               {
-                       $t = $ns = $wgContLang->getNsText ( $x->page_namespace ) ;
-                       if ( $t != '' ) $t .= ':' ;
-                       $t .= $x->page_title ;
-                       $ctitle = str_replace( '_',' ',$x->page_title );
-
-                       if ( $x->page_namespace == NS_CATEGORY ) {
-                               array_push ( $children, $sk->makeKnownLink ( $t, $ctitle ) ) ; # Subcategory
-
-                               // If there's a link from Category:A to Category:B, the sortkey of the resulting
-                               // entry in the categorylinks table is Category:A, not A, which it SHOULD be.
-                               // Workaround: If sortkey == "Category:".$title, than use $title for sorting,
-                               // else use sortkey...
-                               if ( ($ns.':'.$ctitle) == $x->cl_sortkey ) {
-                                       array_push ( $children_start_char, $wgContLang->firstChar( $x->page_title ) );
+       function doCategoryQuery() {
+               $dbr = wfGetDB( DB_SLAVE, 'category' );
+
+               $this->nextPage = array(
+                       'page' => null,
+                       'subcat' => null,
+                       'file' => null,
+               );
+               $this->flip = array( 'page' => false, 'subcat' => false, 'file' => false );
+
+               foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
+                       # Get the sortkeys for start/end, if applicable.  Note that if
+                       # the collation in the database differs from the one
+                       # set in $wgCategoryCollation, pagination might go totally haywire.
+                       $extraConds = array( 'cl_type' => $type );
+                       if ( $this->from[$type] !== null ) {
+                               $extraConds[] = 'cl_sortkey >= '
+                                       . $dbr->addQuotes( $this->collation->getSortKey( $this->from[$type] ) );
+                       } elseif ( $this->until[$type] !== null ) {
+                               $extraConds[] = 'cl_sortkey < '
+                                       . $dbr->addQuotes( $this->collation->getSortKey( $this->until[$type] ) );
+                               $this->flip[$type] = true;
+                       }
+
+                       $res = $dbr->select(
+                               array( 'page', 'categorylinks', 'category' ),
+                               array( 'page_id', 'page_title', 'page_namespace', 'page_len',
+                                       'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title',
+                                       'cat_subcats', 'cat_pages', 'cat_files',
+                                       'cl_sortkey_prefix', 'cl_collation' ),
+                               array_merge( array( 'cl_to' => $this->title->getDBkey() ),  $extraConds ),
+                               __METHOD__,
+                               array(
+                                       'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+                                       'LIMIT' => $this->limit + 1,
+                                       'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey',
+                               ),
+                               array(
+                                       'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
+                                       'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY )
+                               )
+                       );
+
+                       $count = 0;
+                       foreach ( $res as $row ) {
+                               $title = Title::newFromRow( $row );
+                               if ( $row->cl_collation === '' ) {
+                                       // Hack to make sure that while updating from 1.16 schema
+                                       // and db is inconsistent, that the sky doesn't fall.
+                                       // See r83544. Could perhaps be removed in a couple decades...
+                                       $humanSortkey = $row->cl_sortkey;
                                } else {
-                                       array_push ( $children_start_char, $wgContLang->firstChar( $x->cl_sortkey ) ) ;
+                                       $humanSortkey = $title->getCategorySortkey( $row->cl_sortkey_prefix );
+                               }
+
+                               if ( ++$count > $this->limit ) {
+                                       # We've reached the one extra which shows that there
+                                       # are additional pages to be had. Stop here...
+                                       $this->nextPage[$type] = $humanSortkey;
+                                       break;
+                               }
+
+                               if ( $title->getNamespace() == NS_CATEGORY ) {
+                                       $cat = Category::newFromRow( $row, $title );
+                                       $this->addSubcategoryObject( $cat, $humanSortkey, $row->page_len );
+                               } elseif ( $title->getNamespace() == NS_FILE ) {
+                                       $this->addImage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect );
+                               } else {
+                                       $this->addPage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect );
                                }
-                       } elseif ( $wgCategoryMagicGallery && $x->page_namespace == NS_IMAGE ) {
-                               $ig->add( new Image( $x->page_title ) );
-                       } else {
-                               array_push ( $articles , $sk->makeKnownLink ( $t ) ) ; # Page in this category
-                               array_push ( $articles_start_char, $wgContLang->firstChar( $x->cl_sortkey ) ) ;
                        }
                }
-               $dbr->freeResult ( $res ) ;
+       }
 
-               $ti = $this->mTitle->getText() ;
+       function getCategoryTop() {
+               $r = $this->getCategoryBottom();
+               return $r === ''
+                       ? $r
+                       : "<br style=\"clear:both;\"/>\n" . $r;
+       }
 
+       function getSubcategorySection() {
                # Don't show subcategories section if there are none.
-               if ( count ( $children ) > 0 )
-               {
+               $r = '';
+               $rescnt = count( $this->children );
+               $dbcnt = $this->cat->getSubcatCount();
+               $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'subcat' );
+
+               if ( $rescnt > 0 ) {
                        # Showing subcategories
+                       $r .= "<div id=\"mw-subcategories\">\n";
                        $r .= '<h2>' . wfMsg( 'subcategories' ) . "</h2>\n";
+                       $r .= $countmsg;
+                       $r .= $this->getSectionPagingLinks( 'subcat' );
+                       $r .= $this->formatList( $this->children, $this->children_start_char );
+                       $r .= $this->getSectionPagingLinks( 'subcat' );
+                       $r .= "\n</div>";
+               }
+               return $r;
+       }
+
+       function getPagesSection() {
+               $ti = htmlspecialchars( $this->title->getText() );
+               # Don't show articles section if there are none.
+               $r = '';
+
+               # @todo FIXME: Here and in the other two sections: we don't need to bother
+               # with this rigamarole if the entire category contents fit on one page
+               # and have already been retrieved.  We can just use $rescnt in that
+               # case and save a query and some logic.
+               $dbcnt = $this->cat->getPageCount() - $this->cat->getSubcatCount()
+                       - $this->cat->getFileCount();
+               $rescnt = count( $this->articles );
+               $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' );
+
+               if ( $rescnt > 0 ) {
+                       $r = "<div id=\"mw-pages\">\n";
+                       $r .= '<h2>' . wfMsg( 'category_header', $ti ) . "</h2>\n";
+                       $r .= $countmsg;
+                       $r .= $this->getSectionPagingLinks( 'page' );
+                       $r .= $this->formatList( $this->articles, $this->articles_start_char );
+                       $r .= $this->getSectionPagingLinks( 'page' );
+                       $r .= "\n</div>";
+               }
+               return $r;
+       }
 
-                       $numchild = count( $children );
-                       if($numchild == 1) {
-                               $r .= wfMsg( 'subcategorycount1', $wgContLang->formatNum( 1 ) );
+       function getImageSection() {
+               $r = '';
+               $rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery );
+               if ( $rescnt > 0 ) {
+                       $dbcnt = $this->cat->getFileCount();
+                       $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' );
+
+                       $r .= "<div id=\"mw-category-media\">\n";
+                       $r .= '<h2>' . wfMsg( 'category-media-header', htmlspecialchars( $this->title->getText() ) ) . "</h2>\n";
+                       $r .= $countmsg;
+                       $r .= $this->getSectionPagingLinks( 'file' );
+                       if ( $this->showGallery ) {
+                               $r .= $this->gallery->toHTML();
                        } else {
-                               $r .= wfMsg( 'subcategorycount' , $wgContLang->formatNum( $numchild ) );
+                               $r .= $this->formatList( $this->imgsNoGallery, $this->imgsNoGallery_start_char );
                        }
-                       unset($numchild);
+                       $r .= $this->getSectionPagingLinks( 'file' );
+                       $r .= "\n</div>";
+               }
+               return $r;
+       }
 
-                       if ( count ( $children ) > 6 ) {
+       /**
+        * Get the paging links for a section (subcats/pages/files), to go at the top and bottom
+        * of the output.
+        *
+        * @param $type String: 'page', 'subcat', or 'file'
+        * @return String: HTML output, possibly empty if there are no other pages
+        */
+       private function getSectionPagingLinks( $type ) {
+               if ( $this->until[$type] !== null ) {
+                       return $this->pagingLinks( $this->nextPage[$type], $this->until[$type], $type );
+               } elseif ( $this->nextPage[$type] !== null || $this->from[$type] !== null ) {
+                       return $this->pagingLinks( $this->from[$type], $this->nextPage[$type], $type );
+               } else {
+                       return '';
+               }
+       }
 
-                               // divide list into three equal chunks
-                               $chunk = (int) (count ( $children ) / 3);
+       function getCategoryBottom() {
+               return '';
+       }
 
-                               // get and display header
-                               $r .= '<table width="100%"><tr valign="top">';
+       /**
+        * Format a list of articles chunked by letter, either as a
+        * bullet list or a columnar format, depending on the length.
+        *
+        * @param $articles Array
+        * @param $articles_start_char Array
+        * @param $cutoff Int
+        * @return String
+        * @private
+        */
+       function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
+               $list = '';
+               if ( count ( $articles ) > $cutoff ) {
+                       $list = self::columnList( $articles, $articles_start_char );
+               } elseif ( count( $articles ) > 0 ) {
+                       // for short lists of articles in categories.
+                       $list = self::shortList( $articles, $articles_start_char );
+               }
 
-                               $startChunk = 0;
-                               $endChunk = $chunk;
+               $pageLang = $this->title->getPageLanguage();
+               $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
+                       'class' => 'mw-content-'.$pageLang->getDir() );
+               $list = Html::rawElement( 'div', $attribs, $list );
 
-                               // loop through the chunks
-                               for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
-                                       $chunkIndex < 3;
-                                       $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
-                               {
+               return $list;
+       }
 
-                                       $r .= '<td><ul>';
-                                       // output all subcategories to category
-                                       for ($index = $startChunk ;
-                                               $index < $endChunk && $index < count($children);
-                                               $index++ )
-                                       {
-                                               // check for change of starting letter or begging of chunk
-                                               if ( ($index == $startChunk)
-                                                       || ($children_start_char[$index] != $children_start_char[$index - 1]) )
-                                               {
-                                                       $r .= "</ul><h3>{$children_start_char[$index]}</h3>\n<ul>";
-                                               }
+       /**
+        * Format a list of articles chunked by letter in a three-column
+        * list, ordered vertically.
+        *
+        * TODO: Take the headers into account when creating columns, so they're
+        * more visually equal.
+        *
+        * More distant TODO: Scrap this and use CSS columns, whenever IE finally
+        * supports those.
+        *
+        * @param $articles Array
+        * @param $articles_start_char Array
+        * @return String
+        * @private
+        */
+       static function columnList( $articles, $articles_start_char ) {
+               $columns = array_combine( $articles, $articles_start_char );
+               # Split into three columns
+               $columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ );
+
+               $ret = '<table width="100%"><tr valign="top"><td>';
+               $prevchar = null;
+
+               foreach ( $columns as $column ) {
+                       $colContents = array();
+
+                       # Kind of like array_flip() here, but we keep duplicates in an
+                       # array instead of dropping them.
+                       foreach ( $column as $article => $char ) {
+                               if ( !isset( $colContents[$char] ) ) {
+                                       $colContents[$char] = array();
+                               }
+                               $colContents[$char][] = $article;
+                       }
 
-                                               $r .= "<li>{$children[$index]}</li>";
-                                       }
-                                       $r .= '</ul></td>';
+                       $first = true;
+                       foreach ( $colContents as $char => $articles ) {
+                               $ret .= '<h3>' . htmlspecialchars( $char );
+                               if ( $first && $char === $prevchar ) {
+                                       # We're continuing a previous chunk at the top of a new
+                                       # column, so add " cont." after the letter.
+                                       $ret .= ' ' . wfMsgHtml( 'listingcontinuesabbrev' );
+                               }
+                               $ret .= "</h3>\n";
 
+                               $ret .= '<ul><li>';
+                               $ret .= implode( "</li>\n<li>", $articles );
+                               $ret .= '</li></ul>';
 
-                               }
-                               $r .= '</tr></table>';
-                       } else {
-                               // for short lists of subcategories to category.
-
-                               $r .= "<h3>{$children_start_char[0]}</h3>\n";
-                               $r .= '<ul><li>'.$children[0].'</li>';
-                               for ($index = 1; $index < count($children); $index++ )
-                               {
-                                       if ($children_start_char[$index] != $children_start_char[$index - 1])
-                                       {
-                                               $r .= "</ul><h3>{$children_start_char[$index]}</h3>\n<ul>";
-                                       }
-                                       $r .= "<li>{$children[$index]}</li>";
-                               }
-                               $r .= '</ul>';
+                               $first = false;
+                               $prevchar = $char;
                        }
-               } # END of if ( count($children) > 0 )
-
-               $r .= '<h2>' . wfMsg( 'category_header', $ti ) . "</h2>\n";
 
-               $numart = count( $articles );
-               if($numart == 1) {
-                       $r .= wfMsg( 'categoryarticlecount1', $wgContLang->formatNum( 1 ) );
-               } else {
-                       $r .= wfMsg( 'categoryarticlecount' , $wgContLang->formatNum( $numart ) );
+                       $ret .= "</td>\n<td>";
                }
-               unset($numart);
-
-               # Showing articles in this category
-               if ( count ( $articles ) > 6) {
-                       $ti = $this->mTitle->getText() ;
-
-                       // divide list into three equal chunks
-                       $chunk = (int) (count ( $articles ) / 3);
-
-                       // get and display header
-                       $r .= '<table width="100%"><tr valign="top">';
-
-                       $prev_start_char = ""; 
-
-                       // loop through the chunks
-                       for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
-                               $chunkIndex < 3;
-                               $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
-                       {
-
-                               $r .= '<td><ul>';
-
-                               // output all articles in category
-                               for ($index = $startChunk ;
-                                       $index < $endChunk && $index < count($articles);
-                                       $index++ )
-                               {
-                                       // check for change of starting letter or begging of chunk
-                                       if ( ($index == $startChunk) ||
-                                            ($articles_start_char[$index] != $articles_start_char[$index - 1]) )
-
-                                       {
-                                               $cont_msg = "";
-                                               if($articles_start_char[$index] == $prev_start_char)
-                                                       $cont_msg = wfMsg('listingcontinuesabbrev');
-                                               $r .= "</ul><h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
-                                               $prev_start_char = $articles_start_char[$index];
-                                       }
-
-                                       $r .= "<li>{$articles[$index]}</li>";
-                               }
-                               $r .= '</ul></td>';
 
+               $ret .= '</td></tr></table>';
+               return $ret;
+       }
 
+       /**
+        * Format a list of articles chunked by letter in a bullet list.
+        * @param $articles Array
+        * @param $articles_start_char Array
+        * @return String
+        * @private
+        */
+       static function shortList( $articles, $articles_start_char ) {
+               $r = '<h3>' . htmlspecialchars( $articles_start_char[0] ) . "</h3>\n";
+               $r .= '<ul><li>' . $articles[0] . '</li>';
+               for ( $index = 1; $index < count( $articles ); $index++ ) {
+                       if ( $articles_start_char[$index] != $articles_start_char[$index - 1] ) {
+                               $r .= "</ul><h3>" . htmlspecialchars( $articles_start_char[$index] ) . "</h3>\n<ul>";
                        }
-                       $r .= '</tr></table>';
-               } elseif ( count($articles) > 0) {
-                       // for short lists of articles in categories.
-                       $ti = $this->mTitle->getText() ;
-
-                       $r .= '<h3>'.$articles_start_char[0]."</h3>\n";
-                       $r .= '<ul><li>'.$articles[0].'</li>';
-                       for ($index = 1; $index < count($articles); $index++ )
-                       {
-                               if ($articles_start_char[$index] != $articles_start_char[$index - 1])
-                               {
-                                       $r .= "</ul><h3>{$articles_start_char[$index]}</h3>\n<ul>";
-                               }
 
-                               $r .= "<li>{$articles[$index]}</li>";
-                       }
-                       $r .= '</ul>';
+                       $r .= "<li>{$articles[$index]}</li>";
+               }
+               $r .= '</ul>';
+               return $r;
+       }
+
+       /**
+        * Create paging links, as a helper method to getSectionPagingLinks().
+        *
+        * @param $first String The 'until' parameter for the generated URL
+        * @param $last String The 'from' parameter for the genererated URL
+        * @param $type String A prefix for parameters, 'page' or 'subcat' or
+        *     'file'
+        * @return String HTML
+        */
+       private function pagingLinks( $first, $last, $type = '' ) {
+               global $wgLang;
+
+               $limitText = $wgLang->formatNum( $this->limit );
+
+               $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
+
+               if ( $first != '' ) {
+                       $prevQuery = $this->query;
+                       $prevQuery["{$type}until"] = $first;
+                       unset( $prevQuery["{$type}from"] );
+                       $prevLink = Linker::linkKnown(
+                               $this->addFragmentToTitle( $this->title, $type ),
+                               $prevLink,
+                               array(),
+                               $prevQuery
+                       );
                }
 
-               if ( $wgCategoryMagicGallery && ! $ig->isEmpty() ) {
-                       $r.= $ig->toHTML();
+               $nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
+
+               if ( $last != '' ) {
+                       $lastQuery = $this->query;
+                       $lastQuery["{$type}from"] = $last;
+                       unset( $lastQuery["{$type}until"] );
+                       $nextLink = Linker::linkKnown(
+                               $this->addFragmentToTitle( $this->title, $type ),
+                               $nextLink,
+                               array(),
+                               $lastQuery
+                       );
                }
 
-               return $r ;
+               return "($prevLink) ($nextLink)";
+       }
+
+       /**
+        * Takes a title, and adds the fragment identifier that
+        * corresponds to the correct segment of the category.
+        *
+        * @param Title $title: The title (usually $this->title)
+        * @param String $section: Which section
+        */
+       private function addFragmentToTitle( $title, $section ) {
+               switch ( $section ) {
+                       case 'page':
+                               $fragment = 'mw-pages';
+                               break;
+                       case 'subcat':
+                               $fragment = 'mw-subcategories';
+                               break;
+                       case 'file':
+                               $fragment = 'mw-category-media';
+                               break;
+                       default:
+                               throw new MWException( __METHOD__ .
+                                       " Invalid section $section." );
+               }
+
+               return Title::makeTitle( $title->getNamespace(),
+                       $title->getDBkey(), $fragment );
+       }
+       /**
+        * What to do if the category table conflicts with the number of results
+        * returned?  This function says what. Each type is considered independently
+        * of the other types.
+        *
+        * Note for grepping: uses the messages category-article-count,
+        * category-article-count-limited, category-subcat-count,
+        * category-subcat-count-limited, category-file-count,
+        * category-file-count-limited.
+        *
+        * @param $rescnt Int: The number of items returned by our database query.
+        * @param $dbcnt Int: The number of items according to the category table.
+        * @param $type String: 'subcat', 'article', or 'file'
+        * @return String: A message giving the number of items, to output to HTML.
+        */
+       private function getCountMessage( $rescnt, $dbcnt, $type ) {
+               global $wgLang;
+               # There are three cases:
+               #   1) The category table figure seems sane.  It might be wrong, but
+               #      we can't do anything about it if we don't recalculate it on ev-
+               #      ery category view.
+               #   2) The category table figure isn't sane, like it's smaller than the
+               #      number of actual results, *but* the number of results is less
+               #      than $this->limit and there's no offset.  In this case we still
+               #      know the right figure.
+               #   3) We have no idea.
+
+               # Check if there's a "from" or "until" for anything
+
+               // This is a little ugly, but we seem to use different names
+               // for the paging types then for the messages.
+               if ( $type === 'article' ) {
+                       $pagingType = 'page';
+               } else {
+                       $pagingType = $type;
+               }
+
+               $fromOrUntil = false;
+               if ( $this->from[$pagingType] !== null || $this->until[$pagingType] !== null ) {
+                       $fromOrUntil = true;
+               }
+
+               if ( $dbcnt == $rescnt || ( ( $rescnt == $this->limit || $fromOrUntil )
+                       && $dbcnt > $rescnt ) ) {
+                       # Case 1: seems sane.
+                       $totalcnt = $dbcnt;
+               } elseif ( $rescnt < $this->limit && !$fromOrUntil ) {
+                       # Case 2: not sane, but salvageable.  Use the number of results.
+                       # Since there are fewer than 200, we can also take this opportunity
+                       # to refresh the incorrect category table entry -- which should be
+                       # quick due to the small number of entries.
+                       $totalcnt = $rescnt;
+                       $this->cat->refreshCounts();
+               } else {
+                       # Case 3: hopeless.  Don't give a total count at all.
+                       return wfMsgExt( "category-$type-count-limited", 'parse',
+                               $wgLang->formatNum( $rescnt ) );
+               }
+               return wfMsgExt(
+                       "category-$type-count",
+                       'parse',
+                       $wgLang->formatNum( $rescnt ),
+                       $wgLang->formatNum( $totalcnt )
+               );
        }
 }
-?>