* (bug 10117) Special:Wantedpages doesn't handle invalid titles in result - now print...

* Some refactoring of Special:Wantedpages in general

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3483903..fa58e33 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -110,7 +110,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 3624) TeX: \ker, \hom, \arg, \dim treated like \sin & \cos
 * (bug 10132, 10134) Restore back-compatibility Image::imageUrl() function
 * (bug 10113) Fix double-click for view source on protected pages
-
+* (bug 10117) Special:Wantedpages doesn't handle invalid titles in result
+  set [now prints out a warning]
 
 == MediaWiki API changes since 1.10 ==
 

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index 8b70020..7afa3de 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -63,46 +63,49 @@ class WantedPagesPage extends QueryPage {
                        $db->dataSeek( $res, 0 );
        }
 
-
-       function formatResult( $skin, $result ) {
+       /**
+        * Format an individual result
+        *
+        * @param Skin $skin Skin to use for UI elements
+        * @param object $result Result row
+        * @return string
+        */
+       public function formatResult( $skin, $result ) {
                global $wgLang;
-
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
-
-               if( $this->isCached() ) {
-                       # Check existence; which is stored in the link cache
-                       if( !$title->exists() ) {
-                               # Make a redlink
-                               $pageLink = $skin->makeBrokenLinkObj( $title );
+               if( $title instanceof Title ) {
+                       if( $this->isCached() ) {
+                               $pageLink = $title->exists()
+                                       ? '<s>' . $skin->makeLinkObj( $title ) . '</s>'
+                                       : $skin->makeBrokenLinkObj( $title );
                        } else {
-                               # Make a a struck-out normal link
-                               $pageLink = "<s>" . $skin->makeLinkObj( $title ) . "</s>";
-                       }               
+                               $pageLink = $skin->makeBrokenLinkObj( $title );
+                       }
+                       return wfSpecialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) );
                } else {
-                       # Not cached? Don't bother checking existence; it can't
-                       $pageLink = $skin->makeBrokenLinkObj( $title );
+                       $tsafe = htmlspecialchars( $result->title );
+                       return "Invalid title in result set; {$tsafe}";
                }
-               
-               # Make a link to "what links here" if it's required
-               $wlhLink = $this->nlinks
-                                       ? $this->makeWlhLink( $title, $skin,
-                                                       wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
-                                                               $wgLang->formatNum( $result->value ) ) )
-                                       : null;
-                                       
-               return wfSpecialList($pageLink, $wlhLink);
        }
        
        /**
-        * Make a "what links here" link for a specified title
-        * @param $title Title to make the link for
-        * @param $skin Skin to use
-        * @param $text Link text
+        * Make a "what links here" link for a specified result if required
+        *
+        * @param Title $title Title to make the link for
+        * @param Skin $skin Skin to use
+        * @param object $result Result row
         * @return string
         */
-       function makeWlhLink( &$title, &$skin, $text ) {
-               $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere' );
-               return $skin->makeKnownLinkObj( $wlhTitle, $text, 'target=' . $title->getPrefixedUrl() );
+       private function makeWlhLink( $title, $skin, $result ) {
+               global $wgLang;
+               if( $this->nlinks ) {
+                       $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' );
+                       $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ),
+                               $wgLang->formatNum( $result->value ) );
+                       return $skin->makeKnownLinkObj( $wlh, $label, 'target=' . $title->getPrefixedUrl() );
+               } else {
+                       return null;
+               }
        }
        
 }