Followup r95753 per CR: prevent extensions from making isMovable() return true for...
[lhc/web/wiklou.git] / includes / CategoryPage.php
index a8cae43..bb08cf5 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Special handling for category description pages.
+ * Class for viewing MediaWiki category description pages.
  * Modelled after ImagePage.php.
  *
  * @file
@@ -17,6 +17,22 @@ 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;
 
@@ -42,27 +58,6 @@ class CategoryPage extends Article {
                }
        }
 
-       /**
-        * Don't return a 404 for categories in use.
-        * In use defined as: either the actual page exists
-        * or the category currently has members.
-        */
-       function hasViewableContent() {
-               if ( parent::hasViewableContent() ) {
-                       return true;
-               } else {
-                       $cat = Category::newFromTitle( $this->mTitle );
-                       // If any of these are not 0, then has members
-                       if ( $cat->getPageCount()
-                               || $cat->getSubcatCount()
-                               || $cat->getFileCount()
-                       ) {
-                               return true;
-                       }
-               }
-               return false;
-       }
-
        function openShowCategory() {
                # For overloading
        }
@@ -91,7 +86,7 @@ class CategoryViewer {
                $children, $children_start_char,
                $showGallery, $imgsNoGalley,
                $imgsNoGallery_start_char,
-               $skin, $imgsNoGallery;
+               $imgsNoGallery;
 
        /**
         * @var 
@@ -148,7 +143,7 @@ class CategoryViewer {
         * @return string HTML output
         */
        public function getHTML() {
-               global $wgOut, $wgCategoryMagicGallery, $wgContLang;
+               global $wgOut, $wgCategoryMagicGallery;
                wfProfileIn( __METHOD__ );
 
                $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
@@ -164,7 +159,7 @@ class CategoryViewer {
                if ( $r == '' ) {
                        // If there is no category content to display, only
                        // show the top part of the navigation links.
-                       // FIXME: cannot be completely suppressed because it
+                       // @todo FIXME: Cannot be completely suppressed because it
                        //        is unknown if 'until' or 'from' makes this
                        //        give 0 results.
                        $r = $r . $this->getCategoryTop();
@@ -177,10 +172,16 @@ class CategoryViewer {
                // 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 );
                }
 
                wfProfileOut( __METHOD__ );
-               return $wgContLang->convert( $r );
+               return $r;
        }
 
        function clearCategoryState() {
@@ -197,17 +198,6 @@ class CategoryViewer {
                }
        }
 
-       /**
-        * @return Skin
-        */
-       function getSkin() {
-               if ( !$this->skin ) {
-                       global $wgUser;
-                       $this->skin = $wgUser->getSkin();
-               }
-               return $this->skin;
-       }
-
        /**
         * Add a subcategory to the internal lists, using a Category object
         */
@@ -215,7 +205,7 @@ class CategoryViewer {
                // Subcategory; strip the 'Category' namespace from the link text.
                $title = $cat->getTitle();
 
-               $link = $this->getSkin()->link( $title, $title->getText() );
+               $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
@@ -230,7 +220,7 @@ class CategoryViewer {
 
        /**
         * Add a subcategory to the internal lists, using a title object
-        * @deprecated kept for compatibility, please use addSubcategoryObject instead
+        * @deprecated since 1.17 kept for compatibility, please use addSubcategoryObject instead
         */
        function addSubcategory( Title $title, $sortkey, $pageLength ) {
                $this->addSubcategoryObject( Category::newFromTitle( $title ), $sortkey, $pageLength );
@@ -244,7 +234,7 @@ class CategoryViewer {
        * else use sortkey...
        *
        * @param Title $title
-       * @param string $sortkey
+       * @param string $sortkey The human-readable sortkey (before transforming to icu or whatever).
        */
        function getSubcategorySortChar( $title, $sortkey ) {
                global $wgContLang;
@@ -273,7 +263,7 @@ class CategoryViewer {
                                $this->gallery->add( $title );
                        }
                } else {
-                       $link = $this->getSkin()->link( $title );
+                       $link = Linker::link( $title );
                        if ( $isRedirect ) {
                                // This seems kind of pointless given 'mw-redirect' class,
                                // but keeping for back-compatibility with user css.
@@ -292,7 +282,7 @@ class CategoryViewer {
        function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
                global $wgContLang;
 
-               $link = $this->getSkin()->link( $title );
+               $link = Linker::link( $title );
                if ( $isRedirect ) {
                        // This seems kind of pointless given 'mw-redirect' class,
                        // but keeping for back-compatiability with user css.
@@ -347,7 +337,8 @@ class CategoryViewer {
                                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' ),
+                                       'cat_subcats', 'cat_pages', 'cat_files',
+                                       'cl_sortkey_prefix', 'cl_collation' ),
                                array_merge( array( 'cl_to' => $this->title->getDBkey() ),  $extraConds ),
                                __METHOD__,
                                array(
@@ -364,22 +355,29 @@ class CategoryViewer {
                        $count = 0;
                        foreach ( $res as $row ) {
                                $title = Title::newFromRow( $row );
-                               $rawSortkey = $row->cl_sortkey;
+                               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 {
+                                       $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] = $rawSortkey;
+                                       $this->nextPage[$type] = $humanSortkey;
                                        break;
                                }
 
                                if ( $title->getNamespace() == NS_CATEGORY ) {
                                        $cat = Category::newFromRow( $row, $title );
-                                       $this->addSubcategoryObject( $cat, $rawSortkey, $row->page_len );
+                                       $this->addSubcategoryObject( $cat, $humanSortkey, $row->page_len );
                                } elseif ( $title->getNamespace() == NS_FILE ) {
-                                       $this->addImage( $title, $rawSortkey, $row->page_len, $row->page_is_redirect );
+                                       $this->addImage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect );
                                } else {
-                                       $this->addPage( $title, $rawSortkey, $row->page_len, $row->page_is_redirect );
+                                       $this->addPage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect );
                                }
                        }
                }
@@ -417,7 +415,7 @@ class CategoryViewer {
                # Don't show articles section if there are none.
                $r = '';
 
-               # FIXME, here and in the other two sections: we don't need to bother
+               # @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.
@@ -492,13 +490,20 @@ class CategoryViewer {
         * @private
         */
        function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
+               $list = '';
                if ( count ( $articles ) > $cutoff ) {
-                       return self::columnList( $articles, $articles_start_char );
+                       $list = self::columnList( $articles, $articles_start_char );
                } elseif ( count( $articles ) > 0 ) {
                        // for short lists of articles in categories.
-                       return self::shortList( $articles, $articles_start_char );
+                       $list = self::shortList( $articles, $articles_start_char );
                }
-               return '';
+
+               $pageLang = $this->title->getPageLanguage();
+               $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
+                       'class' => 'mw-content-'.$pageLang->getDir() );
+               $list = Html::rawElement( 'div', $attribs, $list );
+
+               return $list;
        }
 
        /**
@@ -593,7 +598,7 @@ class CategoryViewer {
         */
        private function pagingLinks( $first, $last, $type = '' ) {
                global $wgLang;
-               $sk = $this->getSkin();
+
                $limitText = $wgLang->formatNum( $this->limit );
 
                $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
@@ -602,8 +607,8 @@ class CategoryViewer {
                        $prevQuery = $this->query;
                        $prevQuery["{$type}until"] = $first;
                        unset( $prevQuery["{$type}from"] );
-                       $prevLink = $sk->linkKnown(
-                               $this->title,
+                       $prevLink = Linker::linkKnown(
+                               $this->addFragmentToTitle( $this->title, $type ),
                                $prevLink,
                                array(),
                                $prevQuery
@@ -616,8 +621,8 @@ class CategoryViewer {
                        $lastQuery = $this->query;
                        $lastQuery["{$type}from"] = $last;
                        unset( $lastQuery["{$type}until"] );
-                       $nextLink = $sk->linkKnown(
-                               $this->title,
+                       $nextLink = Linker::linkKnown(
+                               $this->addFragmentToTitle( $this->title, $type ),
                                $nextLink,
                                array(),
                                $lastQuery
@@ -627,6 +632,32 @@ class CategoryViewer {
                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