Roll back r46196, 46202 for now "__IGNOREUNUSED__ excludes cats from UnusedCategories...

The name is very unclear; would prefer to nail that down before rolling it out.

diff --git a/CREDITS b/CREDITS
index adb1d86..f21448a 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -56,7 +56,6 @@ following names for their contribution to the product.
 
 == Patch Contributors ==
 * Agbad
-* Ahmad Sherif
 * Brad Jorsch
 * Brent G
 * Daniel Arnold

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 45f8f04..81a1eef 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -58,8 +58,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   link instead of Go button & Search button
 * (bug 2314) Add links to user custom CSS and JS to Special:Preferences
 * More helpful error message on raw page access if PHP_SELF isn't set
-* (bug 17145) Specific categories can be excluded from Special:UnusedCategories
-  with __IGNOREUNUSED__
 * (bug 13040) Gender switch in user preferences
 * (bug 13040) {{GENDER:}} magic word for interface messages
 * (bug 3301) Optionally sort user list according to account creation time

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 2700273..5b5b77f 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -159,7 +159,6 @@ class MagicWord {
                'noeditsection',
                'newsectionlink',
                'hiddencat',
-               'ignoreunused',
                'index',
                'noindex',
                'staticredirect',

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 13cec38..f2a8447 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3327,9 +3327,6 @@ class Parser
                                wfDebug( __METHOD__.": [[MediaWiki:hidden-category-category]] is not a valid title!\n" );
                        }
                }
-               if ( isset( $this->mDoubleUnderscores['ignoreunused'] ) && $this->mTitle->getNamespace() == NS_CATEGORY ) {
-                       $this->mOutput->setProperty( 'ignoreunused', 'y' );
-               }
                # (bug 8068) Allow control over whether robots index a page.
                #
                # FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here!  This

diff --git a/includes/specials/SpecialUnusedcategories.php b/includes/specials/SpecialUnusedcategories.php
index 8ed4078..406f794 100644 (file)
--- a/includes/specials/SpecialUnusedcategories.php
+++ b/includes/specials/SpecialUnusedcategories.php
@@ -22,16 +22,14 @@ class UnusedCategoriesPage extends QueryPage {
        function getSQL() {
                $NScat = NS_CATEGORY;
                $dbr = wfGetDB( DB_SLAVE );
-               list( $categorylinks, $page, $page_props ) = $dbr->tableNamesN( 'categorylinks', 'page', 'page_props' );
+               list( $categorylinks, $page ) = $dbr->tableNamesN( 'categorylinks', 'page' );
                return "SELECT 'Unusedcategories' as type,
                                {$NScat} as namespace, page_title as title, page_title as value
                                FROM $page
                                LEFT JOIN $categorylinks ON page_title=cl_to
-                               LEFT JOIN $page_props ON (pp_page=page_id AND pp_propname = 'ignoreunused')
                                WHERE cl_from IS NULL
                                AND page_namespace = {$NScat}
-                               AND page_is_redirect = 0
-                               AND pp_propname IS NULL";
+                               AND page_is_redirect = 0";
        }
 
        function formatResult( $skin, $result ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index feea6ad..533584f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -328,7 +328,6 @@ $magicWords = array(
        'filepath'               => array( 0,    'FILEPATH:'              ),
        'tag'                    => array( 0,    'tag'                    ),
        'hiddencat'              => array( 1,    '__HIDDENCAT__'          ),
-       'ignoreunused'           => array( 1,    '__IGNOREUNUSED__'       ),
        'pagesincategory'        => array( 1,    'PAGESINCATEGORY', 'PAGESINCAT' ),
        'pagesize'               => array( 1,    'PAGESIZE'               ),
        'index'                  => array( 1,    '__INDEX__'              ),