Fix regression in ICU-mode UTF-8 verification: U+FFFF is forbidden

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

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 77bce4d..9a0f253 100644 (file)
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -20,6 +20,7 @@ class UnusedimagesPage extends QueryPage {
        function sortDescending() {
                return false;
        }
+       function isSyndicated() { return false; }
 
        function getSQL() {
                $dbr =& wfGetDB( DB_SLAVE );
@@ -30,23 +31,23 @@ class UnusedimagesPage extends QueryPage {
        }
        
        function formatResult( $skin, $result ) {
-               global $wgLang;
+               global $wgLang, $wgContLang;
                $title = Title::makeTitle( NS_IMAGE, $result->title );
-               $ins = $wgLang->getNsText(NS_IMAGE);
                
+               $imageUrl = htmlspecialchars( Image::wfImageUrl( $result->title ) );
                $return =
                # The 'desc' linking to the image page
-               '('.$skin->makeKnownLink( $ins.':'.$result->title, wfMsg('imgdesc') ).') '
+               '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') '
                # Link to the image itself
-               . '<a href="'.Image::wfImageUrl($title->getText()).'">'.$title->getText().'</a>'
+               . '<a href="' . $imageUrl . '">' . htmlspecialchars( $title->getText() ) . '</a>'
                # Last modified date
                . ' . . '.$wgLang->timeanddate($result->value)
                # Link to username
-               . ' . . '.$skin->makeLink($wgLang->getNsText(NS_USER).':'.$result->img_user_text,$result->img_user_text);
+               . ' . . '.$skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text);
                
                # If there is a description, show it
                if($result->img_description != '') {
-                       $return .= ' <em>('.$result->img_description.')</em>';
+                       $return .= ' <i>(' . $skin->formatComment( $result->img_description ) . ')</i>';
                }
                return $return;
        }