Followup r95753 per CR: prevent extensions from making isMovable() return true for...

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

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index c9f4564..bb08cf5 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -86,7 +86,7 @@ class CategoryViewer {
                $children, $children_start_char,
                $showGallery, $imgsNoGalley,
                $imgsNoGallery_start_char,
-               $skin, $imgsNoGallery;
+               $imgsNoGallery;
 
        /**
         * @var 
@@ -143,7 +143,7 @@ class CategoryViewer {
         * @return string HTML output
         */
        public function getHTML() {
-               global $wgOut, $wgCategoryMagicGallery, $wgContLang, $wgBetterDirectionality;
+               global $wgOut, $wgCategoryMagicGallery;
                wfProfileIn( __METHOD__ );
 
                $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
@@ -172,9 +172,7 @@ class CategoryViewer {
                // Give a proper message if category is empty
                if ( $r == '' ) {
                        $r = wfMsgExt( 'category-empty', array( 'parse' ) );
-               }
-
-               if( $wgBetterDirectionality ) {
+               } else {
                        $pageLang = $this->title->getPageLanguage();
                        $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() );
                        # close the previous div, show the headings in user language,
@@ -183,7 +181,7 @@ class CategoryViewer {
                }
 
                wfProfileOut( __METHOD__ );
-               return $wgContLang->convert( $r );
+               return $r;
        }
 
        function clearCategoryState() {
@@ -200,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
         */
@@ -218,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
@@ -276,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.
@@ -295,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.
@@ -503,8 +490,6 @@ class CategoryViewer {
         * @private
         */
        function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
-               global $wgBetterDirectionality;
-
                $list = '';
                if ( count ( $articles ) > $cutoff ) {
                        $list = self::columnList( $articles, $articles_start_char );
@@ -513,12 +498,10 @@ class CategoryViewer {
                        $list = self::shortList( $articles, $articles_start_char );
                }
 
-               if( $wgBetterDirectionality ) {
-                       $pageLang = $this->title->getPageLanguage();
-                       $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
-                               'class' => 'mw-content-'.$pageLang->getDir() );
-                       $list = Html::rawElement( 'div', $attribs, $list );
-               }
+               $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;
        }
@@ -615,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 );
@@ -624,7 +607,7 @@ class CategoryViewer {
                        $prevQuery = $this->query;
                        $prevQuery["{$type}until"] = $first;
                        unset( $prevQuery["{$type}from"] );
-                       $prevLink = $sk->linkKnown(
+                       $prevLink = Linker::linkKnown(
                                $this->addFragmentToTitle( $this->title, $type ),
                                $prevLink,
                                array(),
@@ -638,7 +621,7 @@ class CategoryViewer {
                        $lastQuery = $this->query;
                        $lastQuery["{$type}from"] = $last;
                        unset( $lastQuery["{$type}until"] );
-                       $nextLink = $sk->linkKnown(
+                       $nextLink = Linker::linkKnown(
                                $this->addFragmentToTitle( $this->title, $type ),
                                $nextLink,
                                array(),