* (bug 17207) Fix regression breaking category page display on PHP 5.1

r46020 added a call to $wgContLang->convert() for category article listings, but mistakenly passed the title *object* instead of the text.
In PHP 5.2, this was silently converted to a string, but in older versions this would interpolate as something useless like "Object id #110".

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f1e61fe..9d23008 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -112,6 +112,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add 'change tagging' facility, where changes can be tagged internally with
   certain designations, which are displayed on various summaries of changes, and
   the entries can be styled with CSS.
+* (bug 17207) Fix regression breaking category page display on PHP 5.1
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 71b8c4b..4baa413 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -189,7 +189,7 @@ class CategoryViewer {
         */
        function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
                global $wgContLang;
-               $titletext = $wgContLang->convert($title);
+               $titletext = $wgContLang->convert( $title->getPrefixedText() );
                $this->articles[] = $isRedirect
                        ? '<span class="redirect-in-category">' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . '</span>'
                        : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext );