replace TYPE= with ENGINE=, (supported since 4.0, TYPE deprecated since 4.1)

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

diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php
index b8f4ba3..b14fd73 100644 (file)
--- a/includes/SpecialDisambiguations.php
+++ b/includes/SpecialDisambiguations.php
@@ -20,50 +20,55 @@ 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";
+               return '<p>'.wfMsg('disambiguationstext', $sk->makeKnownLink(wfMsgForContent('disambiguationspage')) )."</p><br />\n";
        }
 
        function getSQL() {
                $dbr =& wfGetDB( DB_SLAVE );
-               extract( $dbr->tableNames( 'page', 'pagelinks' ) );
-               
-               $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() );
+               $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,"
+               $sql = "SELECT 'Disambiguations' AS 'type', pa.page_namespace AS namespace,"
                         ." pa.page_title AS title, la.pl_from AS value"
-                        ." FROM {$pagelinks} AS lb, {$page} AS pa, {$pagelinks} AS la"
-                        ." WHERE lb.pl_namespace = $dns AND lb.pl_title = $dtitle" # disambiguation template
-                        ." AND pa.page_id = lb.pl_from"        
-                        ." AND pa.page_namespace = la.pl_namespace"
-                        ." AND pa.page_title = la.pl_title";
+                        ." 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 ;
                $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');
                $to   = $skin->makeKnownLinkObj( $dp,'');
-               
+
                return "$from $edit => $to";
        }
 }
@@ -73,9 +78,9 @@ class DisambiguationsPage extends PageQueryPage {
  */
 function wfSpecialDisambiguations() {
        list( $limit, $offset ) = wfCheckLimits();
-       
+
        $sd = new DisambiguationsPage();
-       
+
        return $sd->doQuery( $offset, $limit );
 }
 ?>