* (bug 18943) Handle invalid titles gracefully at Special:Mostlinked

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a3ac466..95d7632 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -162,6 +162,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   and user can upload
 * Don't say "You need to log in to upload/move", because it's possible that
   uploading/moving is disabled for registered users as well (e.g. only sysops)
+* (bug 18943) Handle invalid titles gracefully at Special:Mostlinked
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php
index e63e250..cbe5e65 100644 (file)
--- a/includes/specials/SpecialMostlinked.php
+++ b/includes/specials/SpecialMostlinked.php
@@ -75,6 +75,9 @@ class MostlinkedPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgLang;
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
+               if ( !$title ) {
+                       return '<!-- ' . htmlspecialchars( "Invalid title: [[$title]]" ) . ' -->';
+               }
                $link = $skin->link( $title );
                $wlh = $this->makeWlhLink( $title,
                        wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),