Follow up r49996, changing pathrev to revision on non-trunk preventing the 404 error.

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

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 47393e5..4d31773 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -20,7 +20,8 @@ class CategoryPage extends Article {
                if ( isset( $diff ) && $diffOnly )
                        return Article::view();
 
-               if(!wfRunHooks('CategoryPageView', array(&$this))) return;
+               if( !wfRunHooks( 'CategoryPageView', array( &$this ) ) )
+                       return;
 
                if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
                        $this->openShowCategory();
@@ -28,14 +29,23 @@ class CategoryPage extends Article {
 
                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.
-
                if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
                        $this->closeShowCategory();
                }
        }
+       
+       /**
+        * Don't return a 404 for categories in use.
+        */
+       function hasViewableContent() {
+               if( parent::hasViewableContent() ) {
+                       return true;
+               } else {
+                       $cat = Category::newFromTitle( $this->mTitle );
+                       return $cat->getId() != 0;
+               }
+                       
+       }
 
        function openShowCategory() {
                # For overloading
@@ -66,7 +76,7 @@ class CategoryViewer {
                $this->from = $from;
                $this->until = $until;
                $this->limit = $wgCategoryPagingLimit;
-               $this->cat = Category::newFromName( $title->getDBKey() );
+               $this->cat = Category::newFromTitle( $title );
        }
 
        /**
@@ -179,9 +189,10 @@ class CategoryViewer {
         */
        function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
                global $wgContLang;
+               $titletext = $wgContLang->convertHtml( $title->getPrefixedText(), true );
                $this->articles[] = $isRedirect
-                       ? '<span class="redirect-in-category">' . $this->getSkin()->makeKnownLinkObj( $title ) . '</span>'
-                       : $this->getSkin()->makeSizeLinkObj( $pageLength, $title );
+                       ? '<span class="redirect-in-category">' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . '</span>'
+                       : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext );
                $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) );
        }
 
@@ -195,7 +206,7 @@ class CategoryViewer {
        }
 
        function doCategoryQuery() {
-               $dbr = wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE, 'category' );
                if( $this->from != '' ) {
                        $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $this->from );
                        $this->flip = false;
@@ -210,14 +221,14 @@ class CategoryViewer {
                        array( 'page', 'categorylinks', 'category' ),
                        array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey',
                                'cat_id', 'cat_title', 'cat_subcats', 'cat_pages', 'cat_files' ),
-                       array( $pageCondition,
-                              'cl_to' => $this->title->getDBkey() ),
+                       array( $pageCondition, 'cl_to' => $this->title->getDBkey() ),
                        __METHOD__,
                        array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey',
-                              'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
-                              'LIMIT'    => $this->limit + 1 ),
+                               'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+                               'LIMIT'    => $this->limit + 1 ),
                        array( 'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
-                              'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ) );
+                               'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) )
+               );
 
                $count = 0;
                $this->nextPage = null;
@@ -234,7 +245,7 @@ class CategoryViewer {
                        if( $title->getNamespace() == NS_CATEGORY ) {
                                $cat = Category::newFromRow( $x, $title );
                                $this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len );
-                       } elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) {
+                       } elseif( $this->showGallery && $title->getNamespace() == NS_FILE ) {
                                $this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
                        } else {
                                $this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
@@ -303,7 +314,7 @@ class CategoryViewer {
                        $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' );
 
                        return "<div id=\"mw-category-media\">\n" .
-                       '<h2>' . wfMsg( 'category-media-header', htmlspecialchars($this->title->getText()) ) . "</h2>\n" .
+                       '<h2>' . wfMsg( 'category-media-header', htmlspecialchars( $this->title->getText() ) ) . "</h2>\n" .
                        $countmsg . $this->gallery->toHTML() . "\n</div>";
                } else {
                        return '';
@@ -351,7 +362,8 @@ class CategoryViewer {
         */
        function columnList( $articles, $articles_start_char ) {
                // divide list into three equal chunks
-               $chunk = (int) (count ( $articles ) / 3);
+               $chunk = (int) ( count( $articles ) / 3 );
+               $remaining = count( $articles ) % 3;
 
                // get and display header
                $r = '<table width="100%"><tr valign="top">';
@@ -359,9 +371,9 @@ class CategoryViewer {
                $prev_start_char = 'none';
 
                // loop through the chunks
-               for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
+               for( $startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
                        $chunkIndex < 3;
-                       $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
+                       $chunkIndex++, $startChunk = $endChunk, $endChunk += $remaining == 0 ? $chunk : $chunk + 1 )
                {
                        $r .= "<td>\n";
                        $atColumnTop = true;
@@ -438,12 +450,12 @@ class CategoryViewer {
                $sk = $this->getSkin();
                $limitText = $wgLang->formatNum( $limit );
 
-               $prevLink = htmlspecialchars( wfMsg( 'prevn', $limitText ) );
+               $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
                if( $first != '' ) {
                        $prevLink = $sk->makeLinkObj( $title, $prevLink,
                                wfArrayToCGI( $query + array( 'until' => $first ) ) );
                }
-               $nextLink = htmlspecialchars( wfMsg( 'nextn', $limitText ) );
+               $nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
                if( $last != '' ) {
                        $nextLink = $sk->makeLinkObj( $title, $nextLink,
                                wfArrayToCGI( $query + array( 'from' => $last ) ) );