From ce31ef7454562d92c84f9a093ae617528c02be52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sun, 14 Jan 2007 12:25:12 +0000 Subject: [PATCH] * A little bit prettier --- includes/SpecialDisambiguations.php | 124 +++++++++++++--------------- languages/messages/MessagesEn.php | 2 +- 2 files changed, 60 insertions(+), 66 deletions(-) diff --git a/includes/SpecialDisambiguations.php b/includes/SpecialDisambiguations.php index 626b967c2a..6267dd2e01 100644 --- a/includes/SpecialDisambiguations.php +++ b/includes/SpecialDisambiguations.php @@ -5,11 +5,6 @@ * @subpackage SpecialPage */ -/** - * - * @package MediaWiki - * @subpackage SpecialPage - */ class DisambiguationsPage extends PageQueryPage { function getName() { @@ -19,69 +14,67 @@ 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(); - return '

'.wfMsg('disambiguationstext', $sk->makeKnownLinkObj($this->getDisambiguationPageObj()))."


\n"; + function getPageHeader( ) { + global $wgOut; + return $wgOut->parse( wfMsg( 'disambiguations-text' ) ); } function getSQL() { $dbr =& wfGetDB( DB_SLAVE ); - list( $page, $pagelinks, $templatelinks) = $dbr->tableNamesN( 'page', 'pagelinks', 'templatelinks' ); - $dMsgText = wfMsgForContent('disambiguationspage'); - + $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; + + # 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() { @@ -93,10 +86,10 @@ class DisambiguationsPage extends PageQueryPage { $title = Title::newFromId( $result->value ); $dp = Title::makeTitle( $result->namespace, $result->title ); - $from = $skin->makeKnownLinkObj( $title,''); - $edit = $skin->makeBrokenLinkObj( $title, "(".wfMsg("qbedit").")" , 'redirect=no'); + $from = $skin->makeKnownLinkObj( $title, '' ); + $edit = $skin->makeKnownLinkObj( $title, "(".wfMsgHtml("qbedit").")" , 'redirect=no&action=edit' ); $arr = $wgContLang->getArrow(); - $to = $skin->makeKnownLinkObj( $dp,''); + $to = $skin->makeKnownLinkObj( $dp, '' ); return "$from $edit $arr $to"; } @@ -112,4 +105,5 @@ function wfSpecialDisambiguations() { return $sd->doQuery( $offset, $limit ); } -?> + +?> \ No newline at end of file diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 75e8e81613..26ca3c0dcb 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1449,7 +1449,7 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$7''' 'disambiguations' => 'Disambiguation pages', 'disambiguations-summary' => '', 'disambiguationspage' => 'Template:disambig', -'disambiguationstext' => "The following pages link to a disambiguation page. They should link to the appropriate topic instead.
A page is treated as disambiguation if it is linked from $1.
Links from other namespaces are not listed here.", +'disambiguations-text' => "The following pages link to a '''disambiguation page'''. They should link to the appropriate topic instead.
A page is treated as disambiguation page if it uses a template which is linked from [[MediaWiki:disambiguationspage]]", 'doubleredirects' => 'Double redirects', 'doubleredirects-summary' => '', -- 2.20.1