Unclutter ImagePage. Move EXIF data to the end of the page. Move image upload links...

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

diff --git a/includes/SpecialImagelist.php b/includes/SpecialImagelist.php
index cc42ad4..b889cf7 100644 (file)
--- a/includes/SpecialImagelist.php
+++ b/includes/SpecialImagelist.php
@@ -44,7 +44,7 @@ function wfSpecialImagelist() {
        }
        list( $limit, $offset ) = wfCheckLimits( 50 );
        if ( 0 == $limit ) {
-               $lt = wfMsg( "all" );
+               $lt = wfMsg( 'imagelistall' );
        } else {
                $lt = $wgLang->formatNum( "${limit}" );
                $sql .= " LIMIT {$limit}";
@@ -67,7 +67,7 @@ function wfSpecialImagelist() {
          htmlspecialchars( $wpIlMatch ) . "\" /> " .
          "<input type='submit' name=\"wpIlSubmit\" value=\"{$sub}\" /></form>" );
        $nums = array( 50, 100, 250, 500 );
-       $here = $wgContLang->specialPage( "Imagelist" );
+       $here = Title::makeTitle( NS_SPECIAL, 'Imagelist' );
 
        $fill = "";
        $first = true;
@@ -75,7 +75,7 @@ function wfSpecialImagelist() {
                if ( ! $first ) { $fill .= " | "; }
                $first = false;
 
-               $fill .= $sk->makeKnownLink( $here, $wgLang->formatNum( $num ),
+               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
                  "sort=byname&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
        }
        $text = wfMsg( "showlast", $fill, $byname );
@@ -87,7 +87,7 @@ function wfSpecialImagelist() {
                if ( ! $first ) { $fill .= " | "; }
                $first = false;
 
-               $fill .= $sk->makeKnownLink( $here, $wgLang->formatNum( $num ),
+               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
                  "sort=bysize&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
        }
        $text = wfMsg( "showlast", $fill, $bysize );
@@ -99,7 +99,7 @@ function wfSpecialImagelist() {
                if ( ! $first ) { $fill .= " | "; }
                $first = false;
 
-               $fill .= $sk->makeKnownLink( $here, $wgLang->formatNum( $num ),
+               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
                  "sort=bydate&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
        }
        $text = wfMsg( "showlast", $fill, $bydate );
@@ -109,23 +109,23 @@ function wfSpecialImagelist() {
        while ( $s = $dbr->fetchObject( $res ) ) {
                $name = $s->img_name;
                $ut = $s->img_user_text;
-               if ( 0 == $s->img_user ) { $ul = $ut; }
-               else { $ul = $sk->makeLink( $wgContLang->getNsText(
-                 Namespace::getUser() ) . ":{$ut}", $ut ); }
+               if ( 0 == $s->img_user ) {
+                       $ul = $ut;
+               } else {
+                       $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut );
+               }
 
-               $ilink = "<a href=\"" . htmlspecialchars( Image::wfImageUrl( $name ) ) .
+               $ilink = "<a href=\"" . htmlspecialchars( Image::imageUrl( $name ) ) .
                  "\">" . htmlspecialchars( $name ) . "</a>";
 
                $nb = wfMsg( "nbytes", $wgLang->formatNum( $s->img_size ) );
                $l = "(" .
-                 $sk->makeKnownLink( $wgContLang->getNsText(
-                 Namespace::getImage() ) . ":{$name}", wfMsg( "imgdesc" ) ) .
+                 $sk->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ),
+                 wfMsg( "imgdesc" ) ) .
                  ") {$ilink} . . {$nb} . . {$ul} . . " .
                  $wgLang->timeanddate( $s->img_timestamp, true );
 
-               if ( "" != $s->img_description ) {
-                       $l .= ' <i>(' . $sk->formatComment( $s->img_description ) . ')</i>';
-               }
+               $l .= $sk->commentBlock( $s->img_description );
                $wgOut->addHTML( "{$l}<br />\n" );
        }
        $wgOut->addHTML( "</p>" );