finally found the reason for the li bug, top a now in skin

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

diff --git a/includes/SpecialWhatlinkshere.php b/includes/SpecialWhatlinkshere.php
index f9d2a26..3d2fb17 100644 (file)
--- a/includes/SpecialWhatlinkshere.php
+++ b/includes/SpecialWhatlinkshere.php
@@ -1,15 +1,24 @@
-<?
+<?php
 
-function wfSpecialWhatlinkshere()
+function wfSpecialWhatlinkshere($par = NULL)
 {
        global $wgUser, $wgOut, $target;
        $fname = "wfSpecialWhatlinkshere";
 
+       if($par) {
+               $target = $par;
+       } else {
+               $target = $_REQUEST['target'] ;
+       }
        if ( "" == $target ) {
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
-       $nt = Title::newFromURL( wfCleanQueryVar( $target ) );
+       $nt = Title::newFromURL( $target );
+       if( !$nt ) {
+               $wgOut->errorpage( "notargettitle", "notargettext" );
+               return;
+       }
        $wgOut->setPagetitle( $nt->getPrefixedText() );
        $wgOut->setSubtitle( wfMsg( "linklistsub" ) );
 
@@ -17,10 +26,12 @@ function wfSpecialWhatlinkshere()
        $sk = $wgUser->getSkin();
        $isredir = " (" . wfMsg( "isredirect" ) . ")\n";
 
+       $wgOut->addHTML("&lt; ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."<br>\n");
+       
        if ( 0 == $id ) {
-               $sql = "SELECT DISTINCT bl_from FROM brokenlinks WHERE bl_to='" .
-                 wfStrencode( $nt->getPrefixedDBkey() ) . "' LIMIT 500";
-               $res = wfQuery( $sql, $fname );
+               $sql = "SELECT cur_id,cur_namespace,cur_title,cur_is_redirect FROM brokenlinks,cur WHERE bl_to='" .
+                 wfStrencode( $nt->getPrefixedDBkey() ) . "' AND bl_from=cur_id LIMIT 500";
+               $res = wfQuery( $sql, DB_READ, $fname );
 
                if ( 0 == wfNumRows( $res ) ) {
                        $wgOut->addHTML( wfMsg( "nolinkshere" ) );
@@ -29,19 +40,16 @@ function wfSpecialWhatlinkshere()
                        $wgOut->addHTML( "\n<ul>" );
 
                        while ( $row = wfFetchObject( $res ) ) {
-                               $lid = $row->bl_from;
-                               $sql = "SELECT cur_namespace,cur_title,cur_is_redirect " .
-                                 "FROM cur WHERE cur_id={$lid}";
-                               $res2 = wfQuery( $sql, $fname );
-                               $s = wfFetchObject( $res2 );
-
-                               $n = Title::makeName( $s->cur_namespace, $s->cur_title );
-                               $link = $sk->makeKnownLink( $n, "", "redirect=no" );
+                               $nt = Title::makeTitle( $row->cur_namespace, $row->cur_title );
+                               if( !$nt ) {
+                                       continue;
+                               }
+                               $link = $sk->makeKnownLinkObj( $nt, "", "redirect=no" );
                                $wgOut->addHTML( "<li>{$link}" );
 
-                               if ( 1 == $s->cur_is_redirect ) {
+                               if ( $row->cur_is_redirect ) {
                                        $wgOut->addHTML( $isredir );
-                                       wfShowIndirectLinks( 1, $lid );
+                                       wfShowIndirectLinks( 1, $row->cur_id );
                                }
                                $wgOut->addHTML( "</li>\n" );
                        }
@@ -58,8 +66,8 @@ function wfShowIndirectLinks( $level, $lid )
        global $wgOut, $wgUser;
        $fname = "wfShowIndirectLinks";
 
-       $sql = "SELECT DISTINCT l_from FROM links WHERE l_to={$lid} LIMIT 500";
-       $res = wfQuery( $sql, $fname );
+       $sql = "SELECT cur_id,cur_namespace,cur_title,cur_is_redirect FROM links,cur WHERE l_to={$lid} AND l_from=cur_id LIMIT 500";
+       $res = wfQuery( $sql, DB_READ, $fname );
 
        if ( 0 == wfNumRows( $res ) ) {
                if ( 0 == $level ) {
@@ -75,25 +83,28 @@ function wfShowIndirectLinks( $level, $lid )
 
        $wgOut->addHTML( "<ul>" );
        while ( $row = wfFetchObject( $res ) ) {
-               $nt = Title::newFromDBkey( $row->l_from );
-               $ns = $nt->getNamespace();
-               $t = wfStrencode( $nt->getDBkey() );
-
-               $link = $sk->makeKnownLink( $row->l_from, "", "redirect=no" );
+               $nt = Title::makeTitle( $row->cur_namespace, $row->cur_title );
+               if( !$nt ) {
+                       $wgOut->addHTML( "<!-- bad backlink: " . htmlspecialchars( $row->l_from ) . " -->\n" );
+                       continue;
+               }
+               
+               if ( $row->cur_is_redirect ) {
+                   $extra = "redirect=no";
+               } else {
+                   $extra = "";
+               }
+           
+               $link = $sk->makeKnownLinkObj( $nt, "", $extra );
                $wgOut->addHTML( "<li>{$link}" );
 
-               $sql = "SELECT cur_id,cur_is_redirect FROM cur " .
-                 "WHERE cur_namespace={$ns} AND cur_title='{$t}'";
-               $res2 = wfQuery( $sql, $fname );
-               $s = wfFetchObject( $res2 );
-
-               if ( 1 == $s->cur_is_redirect ) {
-                       $wgOut->addHTML( $isredir );
-                       if ( $level < 2 ) {
-                               wfShowIndirectLinks( $level + 1, $s->cur_id );
-                       }
+               if ( $row->cur_is_redirect ) {
+                   $wgOut->addHTML( $isredir );
+                   if ( $level < 2 ) {
+                       wfShowIndirectLinks( $level + 1, $row->cur_id );
+                   }
                }
-               $wgOut->addHTML( "</il>\n" );
+               $wgOut->addHTML( "</li>\n" );
        }
        $wgOut->addHTML( "</ul>\n" );
 }