From: Jens Frank <jeluf@users.mediawiki.org>
Date: Sun, 10 Apr 2005 21:37:45 +0000 (+0000)
Subject: Revert last change
X-Git-Tag: 1.5.0alpha1~305
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=6e568e558b8ea8616b1074756be97ba5b8f98060;p=lhc%2Fweb%2Fwiklou.git

Revert last change
---

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 24262aa781..3b7459f71f 100644
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -24,24 +24,11 @@ class UnusedimagesPage extends QueryPage {
 	function isSyndicated() { return false; }
 
 	function getSQL() {
-		global $wgCountCategorizedImagesAsUsed;
 		$dbr =& wfGetDB( DB_SLAVE );
+		extract( $dbr->tableNames( 'image','imagelinks' ) );
 		
-		if ( $wgCountCategorizedImagesAsUsed ) {
-			extract( $dbr->tableNames( 'cur', 'image', 'imagelinks', 'categorylinks' ) );
-		
-			return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description
-					FROM ((('.$cur.' AS I LEFT JOIN '.$categorylinks.' AS L ON I.cur_id = L.cl_from) 
-						LEFT JOIN '.$imagelinks.' AS P ON I.cur_title = P.il_to)
-						INNER JOIN '.$image.' AS G ON I.cur_title = G.img_name)
-					WHERE I.cur_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 ';
-		}
+		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 ) {