Merge "mediawiki.page.gallery.resize: Remove weird mw.hook call"

[lhc/web/wiklou.git] / includes / specials / SpecialWantedfiles.php

diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php
index ddeb4a1..7d439fa 100644 (file)
--- a/includes/specials/SpecialWantedfiles.php
+++ b/includes/specials/SpecialWantedfiles.php
@@ -73,18 +73,46 @@ class WantedFilesPage extends WantedQueryPage {
        }
 
        function getQueryInfo() {
-               return array (
-                       'tables' => array ( 'imagelinks', 'image' ),
-                       'fields' => array ( 'namespace' => NS_FILE,
-                                       'title' => 'il_to',
-                                       'value' => 'COUNT(*)' ),
-                       'conds' => array ( 'img_name IS NULL' ),
-                       'options' => array ( 'GROUP BY' => 'il_to' ),
-                       'join_conds' => array ( 'image' =>
-                               array ( 'LEFT JOIN',
-                                       array ( 'il_to = img_name' )
+               return array(
+                       'tables' => array(
+                               'imagelinks',
+                               'page',
+                               'redirect',
+                               'img1' => 'image',
+                               'img2' => 'image',
+                       ),
+                       'fields' => array(
+                               'namespace' => NS_FILE,
+                               'title' => 'il_to',
+                               'value' => 'COUNT(*)'
+                       ),
+                       'conds' => array(
+                               'img1.img_name' => null,
+                               // We also need to exclude file redirects
+                               'img2.img_name' => null,
+                        ),
+                       'options' => array( 'GROUP BY' => 'il_to' ),
+                       'join_conds' => array(
+                               'img1' => array( 'LEFT JOIN',
+                                       'il_to = img1.img_name'
+                               ),
+                               'page' => array( 'LEFT JOIN', array(
+                                       'il_to = page_title',
+                                       'page_namespace' => NS_FILE,
+                               ) ),
+                               'redirect' => array( 'LEFT JOIN', array(
+                                       'page_id = rd_from',
+                                       'rd_namespace' => NS_FILE,
+                                       'rd_interwiki' => ''
+                               ) ),
+                               'img2' => array( 'LEFT JOIN',
+                                       'rd_title = img2.img_name'
                                )
                        )
                );
        }
+
+       protected function getGroupName() {
+               return 'maintenance';
+       }
 }