Changing lines like this: "extract( $dbw->tableNames( 'page', 'archive' ) );" to...

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

diff --git a/includes/SpecialDoubleRedirects.php b/includes/SpecialDoubleRedirects.php
index 079d7eb..cf1153e 100644 (file)
--- a/includes/SpecialDoubleRedirects.php
+++ b/includes/SpecialDoubleRedirects.php
@@ -26,7 +26,7 @@ class DoubleRedirectsPage extends PageQueryPage {
 
        function getSQLText( &$dbr, $namespace = null, $title = null ) {
                
-               extract( $dbr->tableNames( 'page', 'pagelinks' ) );
+               list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
 
                $limitToTitle = !( $namespace === null && $title === null );
                $sql = $limitToTitle ? "SELECT" : "SELECT 'DoubleRedirects' as type," ;
@@ -61,7 +61,7 @@ class DoubleRedirectsPage extends PageQueryPage {
                return '';
        }
 
-       function formatResult( $result ) {
+       function formatResult( $skin, $result ) {
                global $wgContLang;
        
                $fname = 'DoubleRedirectsPage::formatResult';
@@ -83,10 +83,10 @@ class DoubleRedirectsPage extends PageQueryPage {
                $titleB = Title::makeTitle( $result->nsb, $result->tb );
                $titleC = Title::makeTitle( $result->nsc, $result->tc );
 
-               $linkA = Linker::makeKnownLinkObj( $titleA,'', 'redirect=no' );
-               $edit = Linker::makeBrokenLinkObj( $titleA, "(".wfMsg("qbedit").")" , 'redirect=no');
-               $linkB = Linker::makeKnownLinkObj( $titleB, '', 'redirect=no' );
-               $linkC = Linker::makeKnownLinkObj( $titleC );
+               $linkA = $skin->makeKnownLinkObj( $titleA,'', 'redirect=no' );
+               $edit = $skin->makeBrokenLinkObj( $titleA, "(".wfMsg("qbedit").")" , 'redirect=no');
+               $linkB = $skin->makeKnownLinkObj( $titleB, '', 'redirect=no' );
+               $linkC = $skin->makeKnownLinkObj( $titleC );
                $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
 
                return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" );