Localisation updates for core messages from Betawiki (2008-06-23 22:55 CEST)

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

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index ec1610f..5d4db92 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -642,7 +642,6 @@ EOT
                        __METHOD__,
                        array( 'LIMIT' => $limit + 1)   
                );
-
                $count = $dbr->numRows( $res );
                if ( $count == 0 ) {
                        $wgOut->addHTML( "<div id='mw-imagepage-nolinkstoimage'>\n" );
@@ -650,10 +649,9 @@ EOT
                        $wgOut->addHTML( "</div>\n" );
                        return;
                }
-               $wgOut->addHTML( "<div id='mw-imagepage-section-linkstoimage'>\n" .
-                               wfMsgExt( 'linkstoimage', array( 'parseinline', 'escape' ), min( $count, $limit ) ) .
-                               "<ul class='mw-imagepage-linktoimage'>\n"
-               );
+               $wgOut->addHTML( "<div id='mw-imagepage-section-linkstoimage'>\n" );
+               $wgOut->addWikiMsg( 'linkstoimage', $count );
+               $wgOut->addHTML( "<ul class='mw-imagepage-linktoimage'>\n" );
 
                $sk = $wgUser->getSkin();
                $count = 0;
@@ -668,45 +666,43 @@ EOT
                }
                $wgOut->addHTML( "</ul></div>\n" );
                $res->free();
-               
+
                // Add a links to [[Special:Whatlinkshere]]
                if ( $count > $limit )
                        $wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
        }
        
-       function imageRedirects() 
+       function imageRedirects()
        {
                global $wgUser, $wgOut;
 
                $redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
                if ( count( $redirects ) == 0 ) return;
 
-               $wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" .
-                               wfMsgExt( 'redirectstofile', array( 'parseinline', 'escape' ),  count( $redirects ) ) .
-                               "<ul class='mw-imagepage-redirectstofile'>\n"
-               );
+               $wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
+               $wgOut->addWikiMsg( 'redirectstofile', count( $redirects ) );
+               $wgOut->addHTML( "<ul class='mw-imagepage-redirectstofile'>\n" );
 
                $sk = $wgUser->getSkin();
                foreach ( $redirects as $title ) {
-                       $link = $sk->makeKnownLinkObj( $title, "" );
+                       $link = $sk->makeKnownLinkObj( $title, "", "redirect=no" );
                        $wgOut->addHTML( "<li>{$link}</li>\n" );
                }
                $wgOut->addHTML( "</ul></div>\n" );
 
        }
-       
+
        function imageDupes() {
-               global $wgOut, $wgUser;         
+               global $wgOut, $wgUser;
 
                $this->loadFile();
 
                $dupes = $this->getDuplicates();
                if ( count( $dupes ) == 0 ) return;
 
-               $wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" .
-                               wfMsgExt( 'duplicatesoffile', array( 'parseinline', 'escape' ),  count( $dupes ) ) .
-                               "<ul class='mw-imagepage-duplicates'>\n"
-               );
+               $wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
+               $wgOut->addWikiMsg( 'duplicatesoffile', count( $dupes ) );
+               $wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
 
                $sk = $wgUser->getSkin();
                foreach ( $dupes as $file ) {