* (bug 9903) Don't mark redirects in categories as stubs [wrong semantics]

* Escaping issue

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2ecc411..b4d3af0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -268,6 +268,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10495) $wgMemcachedDebug set twice in includes/DefaultSettings.php
 * (bug 10316) Prevent inconsistent cached skin settings in gen=js by setting
   the intended skin directly in the URL.
+* (bug 9903) Don't mark redirects in categories as stubs
 
 
 == API changes since 1.10 ==

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 40c465a..c9f11e9 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -165,12 +165,9 @@ class CategoryViewer {
         */
        function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
                global $wgContLang;
-               $link = $this->getSkin()->makeSizeLinkObj( 
-                       $pageLength, $title, $wgContLang->convert( $title->getPrefixedText() ) 
-               );
-               if ($isRedirect)
-                       $link = '<span class="redirect-in-category">'.$link.'</span>';
-               $this->articles[] = $link;
+               $this->articles[] = $isRedirect
+                       ? '<span class="redirect-in-category">' . $this->getSkin()->makeKnownLinkObj( $title ) . '</span>'
+                       : $this->getSkin()->makeSizeLinkObj( $pageLength, $title );
                $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) );
        }