* Fix explicit s-maxage=0 on raw pages; should help with proxy issues in

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

diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php
index 2522e66..16dcfb0 100644 (file)
--- a/includes/SpecialDisambiguations.php
+++ b/includes/SpecialDisambiguations.php
@@ -18,53 +18,57 @@ require_once('QueryPage.php');
 class DisambiguationsPage extends PageQueryPage {
 
        function getName() {
-               return 'disambiguations';
+               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";
+               return '<p>'.wfMsg('disambiguationstext', $sk->makeKnownLink(wfMsgForContent('disambiguationspage')) )."</p><br />\n";
        }
 
        function getSQL() {
                $dbr =& wfGetDB( DB_SLAVE );
-               extract( $dbr->tableNames( 'page', 'links' ) );
-               
-               $dp = Title::newFromText(wfMsgForContent("disambiguationspage"));
+               extract( $dbr->tableNames( 'page', 'pagelinks', 'templatelinks' ) );
+
+               $dp = Title::newFromText(wfMsgForContent('disambiguationspage'));
+               $id = $dp->getArticleId();
         $dns = $dp->getNamespace();
         $dtitle = $dbr->addQuotes( $dp->getDBkey() );
 
-               $sql = "SELECT 'Disambiguations' as type,"
-            .        " pa.page_namespace AS namespace, pa.page_title AS title"
-                   . " FROM {$links} as la, {$links} as lb, {$page} as pa, {$page} as pb"
-                   . " WHERE pb.page_namespace = $dns"
-            . " AND pb.page_title = $dtitle"
-                   . " AND la.l_from = lb.l_to"
-                   . " AND pa.page_id = lb.l_from"
-                   . " AND pb.page_id = lb.l_to" ;
+               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;
        }
 
        function getOrder() {
                return '';
        }
-       
+
        function formatResult( $skin, $result ) {
-               global $wgContLang ;
-               $dp = Title::newFromText(wfMsgForContent("disambiguationspage"));
-        $title = Title::makeTitle( $result->namespace, $result->title );
+               $title = Title::newFromId( $result->value );
+        $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";
        }
 }
@@ -74,10 +78,9 @@ class DisambiguationsPage extends PageQueryPage {
  */
 function wfSpecialDisambiguations() {
        list( $limit, $offset ) = wfCheckLimits();
-       
+
        $sd = new DisambiguationsPage();
-       
-       return $sd->doQuery( $offset, $limit );
 
+       return $sd->doQuery( $offset, $limit );
 }
 ?>