* (bug 2329) Fix title formatting in several special pages

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 42ccc3a..d1fc875 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -261,7 +261,11 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 814) Integrate AuthPlugin changes to support Ryan Lane's external
   LDAP authentication plugin
 * (bug 2034) Armor HTML attributes against template inclusion and links munging
+
+=== Changes since 1.5alpha2 ===
+
 * (bug 2319) Fix parse hook tag matching
+* (bug 2329) Fix title formatting in several special pages
 
 
 === Caveats ===

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 3e37e37..4dd83db 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -387,7 +387,7 @@ class PageQueryPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgContLang;
                $nt = Title::makeTitle( $result->namespace, $result->title );
-               return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $result->title ) );
+               return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $nt->getPrefixedText() ) );
        }
 }
 

diff --git a/includes/SpecialAncientpages.php b/includes/SpecialAncientpages.php
index 991fed3..4d67603 100644 (file)
--- a/includes/SpecialAncientpages.php
+++ b/includes/SpecialAncientpages.php
@@ -50,7 +50,8 @@ class AncientPagesPage extends QueryPage {
                global $wgLang, $wgContLang;
 
                $d = $wgLang->timeanddate( wfTimestamp( TS_MW, $result->value ), true );
-               $link = $skin->makeKnownLink( $result->title, $wgContLang->convert( $result->title) );
+               $title = Title::makeTitle( $result->namespace, $result->title );
+               $link = $skin->makeKnownLinkObj( $title, $wgContLang->convert( $title->getPrefixedText() ) );
                return "{$link} ({$d})";
        }
 }

diff --git a/includes/SpecialPopularpages.php b/includes/SpecialPopularpages.php
index 4e1a088..930e3e9 100644 (file)
--- a/includes/SpecialPopularpages.php
+++ b/includes/SpecialPopularpages.php
@@ -42,7 +42,8 @@ class PopularPagesPage extends QueryPage {
 
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
-               $link = $skin->makeKnownLink( $result->title, $wgContLang->convert( $result->title ) );
+               $title = Title::makeTitle( $result->namespace, $result->title );
+               $link = $skin->makeKnownLinkObj( $title, $wgContLang->convert( $title->getPrefixedText() ) );
                $nv = wfMsg( "nviews", $wgLang->formatNum( $result->value ) );
                return "{$link} ({$nv})";
        }