From: Jens Frank <jeluf@users.mediawiki.org>
Date: Fri, 15 Apr 2005 21:49:21 +0000 (+0000)
Subject: (bug 1849) New option allows to consider categorized images as used on Special:Unused... 
X-Git-Tag: 1.5.0alpha1~259
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=c546391ab9467f58bd593d30287bea21df42e5b5;p=lhc%2Fweb%2Fwiklou.git

(bug 1849) New option allows to consider categorized images as used on Special:Unusedimages
---

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 3b7459f71f..57ac474cac 100644
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -24,11 +24,23 @@ 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 ) {