1 files changed, 56 insertions, 22 deletions

diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php
index 1a0297af..0355c85b 100644
--- a/includes/SpecialDisambiguations.php
+++ b/includes/SpecialDisambiguations.php
@@ -19,37 +19,69 @@ class DisambiguationsPage extends PageQueryPage {
 	function isExpensive( ) { return true; }
 	function isSyndicated() { return false; }
 
+    function getDisambiguationPageObj() {
+        return Title::makeTitleSafe( NS_MEDIAWIKI, 'disambiguationspage');
+    }
+    
 	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";
+		return '<p>'.wfMsg('disambiguationstext', $sk->makeKnownLinkObj($this->getDisambiguationPageObj()))."</p><br />\n";
 	}
 
 	function getSQL() {
 		$dbr =& wfGetDB( DB_SLAVE );
 		extract( $dbr->tableNames( 'page', 'pagelinks', 'templatelinks' ) );
 
-		$dp = Title::newFromText(wfMsgForContent('disambiguationspage'));
-		$id = $dp->getArticleId();
-		$dns = $dp->getNamespace();
-		$dtitle = $dbr->addQuotes( $dp->getDBkey() );
-
-		if($dns != 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");
-		}
-
-		$sql = "SELECT 'Disambiguations' AS \"type\", pa.page_namespace AS namespace,"
-			 ." pa.page_title AS title, la.pl_from AS value"
-			 ." FROM {$templatelinks} AS lb, {$page} AS pa, {$pagelinks} AS la"
-			 ." WHERE lb.tl_namespace = $dns AND lb.tl_title = $dtitle" # disambiguation template
-			 .' AND pa.page_id = lb.tl_from'
-			 .' AND pa.page_namespace = la.pl_namespace'
-			 .' AND pa.page_title = la.pl_title';
-		return $sql;
+        $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 = $this->getDisambiguationPageObj();
+			$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()),
+				'DisambiguationsPage::getSQL' );
+            
+    		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 ) {
+            $set = 'FALSE';  # We must always return a valid sql query, but this way DB will always quicly return an empty result
+            wfDebug("Mediawiki:disambiguationspage message does not link to any templates!\n");
+        }
+        
+        $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() {
@@ -57,14 +89,16 @@ class DisambiguationsPage extends PageQueryPage {
 	}
 
 	function formatResult( $skin, $result ) {
+		global $wgContLang;
 		$title = Title::newFromId( $result->value );
 		$dp = Title::makeTitle( $result->namespace, $result->title );
 
 		$from = $skin->makeKnownLinkObj( $title,'');
 		$edit = $skin->makeBrokenLinkObj( $title, "(".wfMsg("qbedit").")" , 'redirect=no');
+		$arr  = $wgContLang->getArrow();
 		$to   = $skin->makeKnownLinkObj( $dp,'');
 
-		return "$from $edit => $to";
+		return "$from $edit $arr $to";
 	}
 }