From 97245b257cc231e26365c34be8351c5735243ab3 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Mon, 4 Jun 2007 20:00:06 +0000
Subject: [PATCH] * (bug 10117) Special:Wantedpages doesn't handle invalid
 titles in result - now prints out a warning inline * Some refactoring of
 Special:Wantedpages in general

---
 RELEASE-NOTES                   |  3 +-
 includes/SpecialWantedpages.php | 63 +++++++++++++++++----------------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 34839035c1..fa58e33a34 100644
--- 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 8b70020924..7afa3defb2 100644
--- 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;
+		}
 	}
 	
 }
-- 
2.20.1