Bug 1761: Cleanup of Recent Changes indicator flags

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

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 947ab7a..57ac474 100644 (file)
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -24,18 +24,30 @@ class UnusedimagesPage extends QueryPage {
        function isSyndicated() { return false; }
 
        function getSQL() {
+               global $wgCountCategorizedImagesAsUsed;
                $dbr =& wfGetDB( DB_SLAVE );
-               extract( $dbr->tableNames( 'image','imagelinks' ) );
                
-               return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description' .
-                     ' FROM '.$image.' LEFT JOIN '.$imagelinks.' ON img_name=il_to WHERE il_to IS NULL ';
+               if ( $wgCountCategorizedImagesAsUsed ) {
+                       extract( $dbr->tableNames( 'page', 'image', 'imagelinks', 'categorylinks' ) );
+               
+                       return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description
+                                       FROM ((('.$page.' AS I LEFT JOIN '.$categorylinks.' AS L ON I.page_id = L.cl_from) 
+                                               LEFT JOIN '.$imagelinks.' AS P ON I.page_title = P.il_to)
+                                               INNER JOIN '.$image.' AS G ON I.page_title = G.img_name)
+                                       WHERE I.page_namespace = '.NS_IMAGE.' AND L.cl_from IS NULL AND P.il_to IS NULL';
+               } else {
+                       extract( $dbr->tableNames( 'image','imagelinks' ) );
+               
+                       return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description' .
+                       ' FROM '.$image.' LEFT JOIN '.$imagelinks.' ON img_name=il_to WHERE il_to IS NULL ';
+               }
        }
        
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
                $title = Title::makeTitle( NS_IMAGE, $result->title );
                
-               $imageUrl = htmlspecialchars( Image::wfImageUrl( $result->title ) );
+               $imageUrl = htmlspecialchars( Image::imageUrl( $result->title ) );
                $return =
                # The 'desc' linking to the image page
                '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') '
@@ -44,12 +56,10 @@ class UnusedimagesPage extends QueryPage {
                # Last modified date
                . ' . . '.$wgLang->timeanddate($result->value)
                # Link to username
-               . ' . . '.$skin->makeLinkObj( Title::makeTitle( 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 .= ' <i>(' . $skin->formatComment( $result->img_description ) . ')</i>';
-               }
+               . $skin->commentBlock( $result->img_description );
+               
                return $return;
        }