* (bug 4167) Fix regression caused by patch for bug 153

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

diff --git a/includes/SpecialWhatlinkshere.php b/includes/SpecialWhatlinkshere.php
index 879b4ae..4d5bfa0 100644 (file)
--- a/includes/SpecialWhatlinkshere.php
+++ b/includes/SpecialWhatlinkshere.php
@@ -13,12 +13,10 @@ function wfSpecialWhatlinkshere($par = NULL) {
        global $wgUser, $wgOut, $wgRequest;
        $fname = 'wfSpecialWhatlinkshere';
 
-       $target = $wgRequest->getVal( 'target' );
+       $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
        list( $limit, $offset ) = $wgRequest->getLimitOffset(); 
 
-       if(!empty($par)) {
-               $target = $par;
-       } else if ( is_null( $target ) ) {
+       if (is_null($target)) {
                $wgOut->errorpage( 'notargettitle', 'notargettext' );
                return;
        }
@@ -31,94 +29,76 @@ function wfSpecialWhatlinkshere($par = NULL) {
        $wgOut->setPagetitle( $nt->getPrefixedText() );
        $wgOut->setSubtitle( wfMsg( 'linklistsub' ) );
 
-       $id = $nt->getArticleID();
        $sk = $wgUser->getSkin();
        $isredir = ' (' . wfMsg( 'isredirect' ) . ")\n";
 
        $wgOut->addHTML('&lt; '.$sk->makeKnownLinkObj($nt, '', 'redirect=no' )."<br />\n");
 
-       $specialTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
-       $wgOut->addHTML( wfViewPrevNext( $offset, $limit, $specialTitle, 'target=' . urlencode( $target ) ) );
-
-       $dbr =& wfGetDB( DB_SLAVE );
-       extract( $dbr->tableNames( 'page', 'brokenlinks', 'links' ) );
-
-       if ( 0 == $id ) {
-               print $dbr->limitResult( $limit, $offset );
-               exit;
-
-               $sql = "SELECT page_id,page_namespace,page_title,page_is_redirect FROM $brokenlinks,$page WHERE bl_to='" .
-                 $dbr->strencode( $nt->getPrefixedDBkey() ) . "' AND bl_from=page_id " . 
-                 $dbr->limitResult( $limit, $offset );
-               $res = $dbr->query( $sql, $fname );
-
-               if ( 0 == $dbr->numRows( $res ) ) {
-                       $wgOut->addHTML( wfMsg( 'nolinkshere' ) );
-               } else {
-                       $wgOut->addHTML( wfMsg( 'linkshere' ) );
-                       $wgOut->addHTML( "\n<ul>" );
-
-                       while ( $row = $dbr->fetchObject( $res ) ) {
-                               $nt = Title::makeTitle( $row->page_namespace, $row->page_title );
-                               if( !$nt ) {
-                                       continue;
-                               }
-                               $link = $sk->makeKnownLinkObj( $nt, '', 'redirect=no' );
-                               $wgOut->addHTML( "<li>{$link}" );
-
-                               if ( $row->page_is_redirect ) {
-                                       $wgOut->addHTML( $isredir );
-                                       wfShowIndirectLinks( 1, $row->page_id, 500 );
-                               }
-                               $wgOut->addHTML( "</li>\n" );
-                       }
-                       $wgOut->addHTML( "</ul>\n" );
-                       $dbr->freeResult( $res );
-               }
-       } else {
-               wfShowIndirectLinks( 0, $id, $limit, $offset );
-       }
-       $wgOut->addHTML( wfViewPrevNext( $offset, $limit, $specialTitle, 'target=' . urlencode( $target ) ) );
+       wfShowIndirectLinks( 0, $nt, $limit, $offset );
 }
 
 /**
- *
+ * @param int   $level
+ * @param Title $target
+ * @param int   $limit
+ * @param int   $offset
+ * @access private
  */
-function wfShowIndirectLinks( $level, $lid, $limit, $offset = 0 ) {
+function wfShowIndirectLinks( $level, $target, $limit, $offset = 0 ) {
        global $wgOut, $wgUser;
        $fname = 'wfShowIndirectLinks';
 
        $dbr =& wfGetDB( DB_READ );
-       extract( $dbr->tableNames( 'links','page' ) );
        
-       if ( $level == 0 ) {
-               $limitSql = $dbr->limitResult( $limit, $offset );
-       } else {
-               $limitSql = "LIMIT $limit";
-       }
-
-       $sql = "SELECT page_id,page_namespace,page_title,page_is_redirect FROM $links,$page WHERE l_to={$lid} AND l_from=page_id $limitSql";
-       $res = $dbr->query( $sql, $fname );
+       // Read one extra row as an at-end check
+       $queryLimit = $limit + 1; 
+       $limitSql = ( $level == 0 )
+               ? "$offset,$queryLimit"
+               : $queryLimit;
+
+       $res = $dbr->select( array( 'pagelinks', 'page' ),
+               array( 'page_id', 'page_namespace', 'page_title', 'page_is_redirect' ),
+               array(
+                       'pl_from=page_id',
+                       'pl_namespace' => $target->getNamespace(),
+                       'pl_title'     => $target->getDbKey() ),
+               $fname,
+               array( 'LIMIT' => $limitSql ) );
 
        if ( 0 == $dbr->numRows( $res ) ) {
                if ( 0 == $level ) {
-                       $wgOut->addHTML( wfMsg( 'nolinkshere' ) );
+                       $wgOut->addWikiText( wfMsg( 'nolinkshere' ) );
                }
                return;
        }
        if ( 0 == $level ) {
-               $wgOut->addHTML( wfMsg( 'linkshere' ) );
+               $wgOut->addWikiText( wfMsg( 'linkshere' ) );
        }
        $sk = $wgUser->getSkin();
        $isredir = ' (' . wfMsg( 'isredirect' ) . ")\n";
 
+       if( $dbr->numRows( $res ) == 0 ) {
+               return;
+       }
+       $atend = ( $dbr->numRows( $res ) <= $limit );
+       
+       if( $level == 0 ) {
+               $specialTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
+               $prevnext = wfViewPrevNext( $offset, $limit, $specialTitle,
+                       'target=' . urlencode( $target->getPrefixedDbKey() ),
+                       $atend );
+               $wgOut->addHTML( $prevnext );
+       }
+       
        $wgOut->addHTML( '<ul>' );
+       $linksShown = 0;
        while ( $row = $dbr->fetchObject( $res ) ) {
-               $nt = Title::makeTitle( $row->page_namespace, $row->page_title );
-               if( !$nt ) {
-                       $wgOut->addHTML( '<!-- bad backlink: ' . htmlspecialchars( $row->l_from ) . " -->\n" );
-                       continue;
+               if( ++$linksShown > $limit ) {
+                       // Last row is for checks only; don't display it.
+                       break;
                }
+               
+               $nt = Title::makeTitle( $row->page_namespace, $row->page_title );
 
                if ( $row->page_is_redirect ) {
                        $extra = 'redirect=no';
@@ -132,12 +112,16 @@ function wfShowIndirectLinks( $level, $lid, $limit, $offset = 0 ) {
                if ( $row->page_is_redirect ) {
                        $wgOut->addHTML( $isredir );
                        if ( $level < 2 ) {
-                               wfShowIndirectLinks( $level + 1, $row->page_id, 500 );
+                               wfShowIndirectLinks( $level + 1, $nt, 500 );
                        }
                }
                $wgOut->addHTML( "</li>\n" );
        }
        $wgOut->addHTML( "</ul>\n" );
+       
+       if( $level == 0 ) {
+               $wgOut->addHTML( $prevnext );
+       }
 }
 
 ?>