X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialDisambiguations.php;h=da0562ab19956abccc40e31eb8f05df3ecb1e442;hb=a2b6b9ab699cfe0614051a73ea446ca5ff88e290;hp=e141a29a1d3275bba157220a2edeb5465bf7e347;hpb=37b2fff6f57f1a975db780478254425bee1fd553;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php
index e141a29a1d..da0562ab19 100644
--- a/includes/SpecialDisambiguations.php
+++ b/includes/SpecialDisambiguations.php
@@ -1,72 +1,96 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/**
- *
- */
-require_once('QueryPage.php');
-
-/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
- */
 class DisambiguationsPage extends PageQueryPage {
 
 	function getName() {
 		return 'Disambiguations';
 	}
-	
+
 	function isExpensive( ) { return true; }
 	function isSyndicated() { return false; }
 
+
 	function getPageHeader( ) {
-		global $wgUser;
-		$sk = $wgUser->getSkin();
-		
-		#FIXME : probably need to add a backlink to the maintenance page.
-		return '<p>'.wfMsg("disambiguationstext", $sk->makeKnownLink(wfMsgForContent('disambiguationspage')) )."</p><br />\n";
+		global $wgOut;
+		return $wgOut->parse( wfMsg( 'disambiguations-text' ) );
 	}
 
 	function getSQL() {
-		$dbr =& wfGetDB( DB_SLAVE );
-		extract( $dbr->tableNames( 'page', 'pagelinks' ) );
-		
-		$dp = Title::newFromText(wfMsgForContent("disambiguationspage"));
-		$id = $dp->getArticleId();
-        $dns = $dp->getNamespace();
-        $dtitle = $dbr->addQuotes( $dp->getDBkey() );
-
-		$sql = "SELECT 'Disambiguations' as type,"
-			. "la.pl_namespace AS namespace, la.pl_title AS title, la.pl_from AS link_from"
-		    . " FROM {$pagelinks} AS la, {$pagelinks} AS lb,"
-			.      " {$page} AS pa, {$page} AS pb"
-		    . " WHERE pb.page_namespace = $dns"
-            . " AND pb.page_title = $dtitle"      # disambiguation pages
-			. " AND lb.pl_title = pb.page_title"  # title of pages that are disamb
-			. " AND pa.page_id = lb.pl_from"      # id of page poiting to a disamb
-			. " AND la.pl_title = pa.page_title"; # title of those
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$dMsgText = wfMsgForContent('disambiguationspage');
+
+		$linkBatch = new LinkBatch;
+
+		# If the text can be treated as a title, use it verbatim.
+		# Otherwise, pull the titles from the links table
+		$dp = Title::newFromText($dMsgText);
+		if( $dp ) {
+			if($dp->getNamespace() != NS_TEMPLATE) {
+				# FIXME we assume the disambiguation message is a template but
+				# the page can potentially be from another namespace :/
+				wfDebug("Mediawiki:disambiguationspage message does not refer to a template!\n");
+			}
+			$linkBatch->addObj( $dp );
+		} else {
+				# Get all the templates linked from the Mediawiki:Disambiguationspage
+				$disPageObj = Title::makeTitleSafe( NS_MEDIAWIKI, 'disambiguationspage' );
+				$res = $dbr->select(
+					array('pagelinks', 'page'),
+					'pl_title',
+					array('page_id = pl_from', 'pl_namespace' => NS_TEMPLATE,
+						'page_namespace' => $disPageObj->getNamespace(), 'page_title' => $disPageObj->getDBkey()),
+					__METHOD__ );
+
+				while ( $row = $dbr->fetchObject( $res ) ) {
+					$linkBatch->addObj( Title::makeTitle( NS_TEMPLATE, $row->pl_title ));
+				}
+
+				$dbr->freeResult( $res );
+		}
+
+		$set = $linkBatch->constructSet( 'lb.tl', $dbr );
+		if( $set === false ) {
+			# We must always return a valid sql query, but this way DB will always quicly return an empty result
+			$set = 'FALSE';
+			wfDebug("Mediawiki:disambiguationspage message does not link to any templates!\n");
+		}
+
+		list( $page, $pagelinks, $templatelinks) = $dbr->tableNamesN( 'page', 'pagelinks', 'templatelinks' );
+
+		$sql = "SELECT 'Disambiguations' AS \"type\", pb.page_namespace AS namespace,"
+			." pb.page_title AS title, la.pl_from AS value"
+			." FROM {$templatelinks} AS lb, {$page} AS pb, {$pagelinks} AS la, {$page} AS pa"
+			." WHERE $set"  # disambiguation template(s)
+			.' AND pa.page_id = la.pl_from'
+			.' AND pa.page_namespace = ' . NS_MAIN  # Limit to just articles in the main namespace
+			.' AND pb.page_id = lb.tl_from'
+			.' AND pb.page_namespace = la.pl_namespace'
+			.' AND pb.page_title = la.pl_title'
+			.' ORDER BY lb.tl_namespace, lb.tl_title';
+
 		return $sql;
 	}
 
 	function getOrder() {
 		return '';
 	}
-	
+
 	function formatResult( $skin, $result ) {
-		global $wgContLang ;
-		$title = Title::newFromId( $result->link_from );
-        $dp = Title::makeTitle( $result->namespace, $result->title );
-
-		$from = $skin->makeKnownLinkObj( $title,'');
-		$edit = $skin->makeBrokenLinkObj( $title, "(".wfMsg("qbedit").")" , 'redirect=no');
-		$to   = $skin->makeKnownLinkObj( $dp,'');
-		
-		return "$from $edit => $to";
+		global $wgContLang;
+		$title = Title::newFromId( $result->value );
+		$dp = Title::makeTitle( $result->namespace, $result->title );
+
+		$from = $skin->makeKnownLinkObj( $title, '' );
+		$edit = $skin->makeKnownLinkObj( $title, "(".wfMsgHtml("qbedit").")" , 'redirect=no&action=edit' );
+		$arr  = $wgContLang->getArrow();
+		$to   = $skin->makeKnownLinkObj( $dp, '' );
+
+		return "$from $edit $arr $to";
 	}
 }
 
@@ -75,9 +99,10 @@ class DisambiguationsPage extends PageQueryPage {
  */
 function wfSpecialDisambiguations() {
 	list( $limit, $offset ) = wfCheckLimits();
-	
+
 	$sd = new DisambiguationsPage();
-	
+
 	return $sd->doQuery( $offset, $limit );
 }
-?>
+
+?>
\ No newline at end of file