Return nothing on empty math tags instead of char encoding

[lhc/web/wiklou.git] / includes / SpecialDisambiguations.php

diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php
index b227ba6..626b967 100644 (file)
--- a/includes/SpecialDisambiguations.php
+++ b/includes/SpecialDisambiguations.php
@@ -5,11 +5,6 @@
  * @subpackage SpecialPage
  */
 
-/**
- *
- */
-require_once('QueryPage.php');
-
 /**
  *
  * @package MediaWiki
@@ -20,54 +15,90 @@ class DisambiguationsPage extends PageQueryPage {
        function getName() {
                return 'Disambiguations';
        }
-       
+
        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' ) );
+               list( $page, $pagelinks, $templatelinks) =  $dbr->tableNamesN( 'page', 'pagelinks', 'templatelinks' );
+
+        $dMsgText = wfMsgForContent('disambiguationspage');
                
-               $dp = Title::newFromText(wfMsgForContent("disambiguationspage"));
-               $id = $dp->getArticleId();
-        $dns = $dp->getNamespace();
-        $dtitle = $dbr->addQuotes( $dp->getDBkey() );
+               $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';
 
-               $sql = "SELECT 'Disambiguations' as type,"
-                       . "la.pl_namespace AS namespace, la.pl_title AS title, la.pl_from AS value"
-                   . " 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 pointing to a disamb
-                       . " AND la.pl_title != $dtitle"        # exclude the link 
-                       . " AND la.pl_title = pa.page_title "; # title of those
-               return $sql;
+        return $sql;
        }
 
        function getOrder() {
                return '';
        }
-       
+
        function formatResult( $skin, $result ) {
-               global $wgContLang ;
+               global $wgContLang;
                $title = Title::newFromId( $result->value );
-        $dp = Title::makeTitle( $result->namespace, $result->title );
+               $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";
        }
 }
 
@@ -76,9 +107,9 @@ class DisambiguationsPage extends PageQueryPage {
  */
 function wfSpecialDisambiguations() {
        list( $limit, $offset ) = wfCheckLimits();
-       
+
        $sd = new DisambiguationsPage();
-       
+
        return $sd->doQuery( $offset, $limit );
 }
 ?>