Merge "Allow wildcard searching in wiki IDs for interwiki user rights logs"

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

diff --git a/includes/specials/SpecialUncategorizedpages.php b/includes/specials/SpecialUncategorizedpages.php
index 8bc9e48..8251d5b 100644 (file)
--- a/includes/specials/SpecialUncategorizedpages.php
+++ b/includes/specials/SpecialUncategorizedpages.php
@@ -25,8 +25,8 @@
  * A special page looking for page without any category.
  *
  * @ingroup SpecialPage
+ * @todo FIXME: Make $requestedNamespace selectable, unify all subclasses into one
  */
-// @todo FIXME: Make $requestedNamespace selectable, unify all subclasses into one
 class UncategorizedPagesPage extends PageQueryPage {
        protected $requestedNamespace = false;
 
@@ -49,16 +49,23 @@ class UncategorizedPagesPage extends PageQueryPage {
        function getQueryInfo() {
                return array(
                        'tables' => array( 'page', 'categorylinks' ),
-                       'fields' => array( 'namespace' => 'page_namespace',
-                                       'title' => 'page_title',
-                                       'value' => 'page_title' ),
+                       'fields' => array(
+                               'namespace' => 'page_namespace',
+                               'title' => 'page_title',
+                               'value' => 'page_title'
+                       ),
                        // default for page_namespace is all content namespaces (if requestedNamespace is false)
                        // otherwise, page_namespace is requestedNamespace
-                       'conds' => array( 'cl_from IS NULL',
-                                       'page_namespace' => ( $this->requestedNamespace !== false ? $this->requestedNamespace : MWNamespace::getContentNamespaces() ),
-                                       'page_is_redirect' => 0 ),
-                       'join_conds' => array( 'categorylinks' => array(
-                                       'LEFT JOIN', 'cl_from = page_id' ) )
+                       'conds' => array(
+                               'cl_from IS NULL',
+                               'page_namespace' => $this->requestedNamespace !== false
+                                               ? $this->requestedNamespace
+                                               : MWNamespace::getContentNamespaces(),
+                               'page_is_redirect' => 0
+                       ),
+                       'join_conds' => array(
+                               'categorylinks' => array( 'LEFT JOIN', 'cl_from = page_id' )
+                       )
                );
        }
 
@@ -68,6 +75,7 @@ class UncategorizedPagesPage extends PageQueryPage {
                if ( $this->requestedNamespace === false && count( MWNamespace::getContentNamespaces() ) > 1 ) {
                        return array( 'page_namespace', 'page_title' );
                }
+
                return array( 'page_title' );
        }