Update to MediaWiki 1.24.1

1 files changed, 13 insertions, 12 deletions

diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php
index d332db75..36ec09ec 100644
--- a/includes/specials/SpecialUnusedimages.php
+++ b/includes/specials/SpecialUnusedimages.php
@@ -44,31 +44,32 @@ class UnusedimagesPage extends ImageQueryPage {
 	}
 
 	function getQueryInfo() {
-		global $wgCountCategorizedImagesAsUsed;
 		$retval = array(
 			'tables' => array( 'image', 'imagelinks' ),
-			'fields' => array( 'namespace' => NS_FILE,
-					'title' => 'img_name',
-					'value' => 'img_timestamp',
-					'img_user', 'img_user_text',
-					'img_description' ),
+			'fields' => array(
+				'namespace' => NS_FILE,
+				'title' => 'img_name',
+				'value' => 'img_timestamp',
+				'img_user', 'img_user_text',
+				'img_description'
+			),
 			'conds' => array( 'il_to IS NULL' ),
-			'join_conds' => array( 'imagelinks' => array(
-					'LEFT JOIN', 'il_to = img_name' ) )
+			'join_conds' => array( 'imagelinks' => array( 'LEFT JOIN', 'il_to = img_name' ) )
 		);
 
-		if ( $wgCountCategorizedImagesAsUsed ) {
+		if ( $this->getConfig()->get( 'CountCategorizedImagesAsUsed' ) ) {
 			// Order is significant
 			$retval['tables'] = array( 'image', 'page', 'categorylinks',
-					'imagelinks' );
+				'imagelinks' );
 			$retval['conds']['page_namespace'] = NS_FILE;
 			$retval['conds'][] = 'cl_from IS NULL';
 			$retval['conds'][] = 'img_name = page_title';
 			$retval['join_conds']['categorylinks'] = array(
-					'LEFT JOIN', 'cl_from = page_id' );
+				'LEFT JOIN', 'cl_from = page_id' );
 			$retval['join_conds']['imagelinks'] = array(
-					'LEFT JOIN', 'il_to = page_title' );
+				'LEFT JOIN', 'il_to = page_title' );
 		}
+
 		return $retval;
 	}