X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUnusedimages.php;h=c4d7d2a774a241f67c9f4b38b8ebc081bdecd2b6;hb=37b2fff6f57f1a975db780478254425bee1fd553;hp=60a6e18b28e0895d649211407b1dd43b11d376e8;hpb=c05629c0107641e2d082857c8266830a066c0b94;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 60a6e18b28..c4d7d2a774 100644
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -9,7 +9,8 @@
 require_once("QueryPage.php");
 
 /**
- *
+ * @package MediaWiki
+ * @subpackage SpecialPage
  */
 class UnusedimagesPage extends QueryPage {
 
@@ -20,34 +21,45 @@ class UnusedimagesPage extends QueryPage {
 	function sortDescending() {
 		return false;
 	}
+	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 );
-		$ins = $wgContLang->getNsText(NS_IMAGE);
 		
+		$imageUrl = htmlspecialchars( Image::imageUrl( $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($wgContLang->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>';
-		}
+		. $skin->commentBlock( $wgContLang->convert( $result->img_description ) );
+		
 		return $return;
 	}