In the allpages index, make the whole line links to hopefully

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

diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index e2a2893..3432a8d 100644 (file)
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -6,10 +6,12 @@ function wfSpecialAllpages( $par=NULL )
        $indexMaxperpage = 480;
        $toplevelMaxperpage = 50;
        $from = $wgRequest->getVal( 'from' );
-       $namespace = $wgRequest->getVal( 'namespace' );
-       if ( is_null($namespace) ) { $namespace = 0; }
-       $arr = $wgLang->getNamespaces();
-       $wgOut->setPagetitle ( $namespace > 0 ? wfMsg ( 'allpagesnamespace', $arr[$namespace] )
+       $namespace = $wgRequest->getInt( 'namespace' );
+       $names = $wgLang->getNamespaces();
+       if( !isset( $names[$namespace] ) ) {
+               $namespace = 0;
+       }
+       $wgOut->setPagetitle ( $namespace > 0 ? wfMsg ( 'allpagesnamespace', $names[$namespace] )
                                              : wfMsg ( 'allarticles' ) );
 
        if ( $par ) {
@@ -39,7 +41,7 @@ function namespaceForm ( $namespace = 0, $from = "" )
 
        $frombox = '<input type="text" size="20" name="from" value="'
                    . htmlspecialchars ( $from ) . '"/>';
-       $submitbutton = '<input type="submit" value="' . wfMsg( 'go' ) . '" />';
+       $submitbutton = '<input type="submit" value="' . wfMsg( 'allpagessubmit' ) . '" />';
 
        $out = "<div class='namespaceselector'><form method='get' action='{$wgScript}'>";
        $out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
@@ -55,16 +57,8 @@ function indexShowToplevel ( $namespace = 0 )
        $fname = "indexShowToplevel";
        $namespace = intval ($namespace);
 
-       # Cache
-       $vsp = $wgLang->getValidSpecialPages();
-       $log = new LogPage( $vsp["Allpages"] );
-       $log->mUpdateRecentChanges = false;
-
-       global $wgMiserMode;
-       if ( $wgMiserMode ) {
-               $log->showAsDisabledPage();
-               return;
-       }
+       # TODO: Either make this *much* faster or cache the title index points
+       # in the querycache table.
 
        $dbr =& wfGetDB( DB_SLAVE );
        $cur = $dbr->tableName( 'cur' );
@@ -155,9 +149,6 @@ function indexShowToplevel ( $namespace = 0 )
                $out2 = $nsForm . '<hr />';
        }
 
-       # Saving cache
-       $log->replaceContent( $out );
-
        $wgOut->addHtml( $out2 . $out );
 }
 
@@ -167,14 +158,16 @@ function indexShowline( $inpoint, $outpoint, $namespace = 0 )
        $sk = $wgUser->getSkin();
        $dbr =& wfGetDB( DB_SLAVE );
 
-       $inpointf = str_replace( "_", " ", $inpoint );
-       $outpointf = str_replace( "_", " ", $outpoint );
-       $queryparams = 'from=' . $dbr->strencode( $inpoint );
-       if ( $namespace > 0 ) { $queryparams .= '&namespace='.intval($namespace); }
+       $inpointf = htmlspecialchars( str_replace( "_", " ", $inpoint ) );
+       $outpointf = htmlspecialchars( str_replace( "_", " ", $outpoint ) );
+       $queryparams = $namespace ? ('namespace='.intval($namespace)) : '';
+       $special = Title::makeTitle( NS_SPECIAL, 'Allpages/' . $inpoint );
+       $link = $special->escapeLocalUrl( $queryparams );
+       
        $out = wfMsg(
                'alphaindexline',
-               $sk->makeKnownLink( $wgLang->specialPage( "Allpages" ), $inpointf, $queryparams ) . '</td><td>',
-               '</td><td align="left">' . $outpointf
+               "<a href=\"$link\">$inpointf</a></td><td><a href=\"$link\">",
+               "</a></td><td align=\"left\"><a href=\"$link\">$outpointf</a>"
        );
        return '<tr><td align="right">'.$out.'</td></tr>';
 }