(bug 4970) Make category paging limits configurable

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a7b5134..fb6ba7f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -242,7 +242,6 @@ i18n / Languages:
 * Restriction types now use restriction-* messages instead of ui messages
 * (bug 4685) Slovenian LanguageSl.php hardcodes project namespace
 
-
 Parser:
 * (bug 2522) {{CURRENTDAY2}} now shows the current day number with two digits
 * (bug 3210) Fix Media: links with remote image URL path
@@ -649,6 +648,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Fixed and enhanced a little the Live Preview, which had been broken for some time
 * Added article size limit, $wgMaxArticleSize
 * (bug 4974) Don't follow redirected talk page on "new messages" link
+* (bug 4970) Make category paging limits configurable
 
 === Caveats ===
 

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index c27acfc..b515986 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -64,7 +64,7 @@ class CategoryPage extends Article {
         * @access private
         */
        function doCategoryMagic( $from = '', $until = '' ) {
-               global $wgContLang,$wgUser, $wgCategoryMagicGallery;
+               global $wgContLang,$wgUser, $wgCategoryMagicGallery, $wgCategoryPagingLimit;
                $fname = 'CategoryPage::doCategoryMagic';
                wfProfileIn( $fname );
 
@@ -88,7 +88,7 @@ class CategoryPage extends Article {
                        $pageCondition = '1 = 1';
                        $flip = false;
                }
-               $limit = 200;
+               $limit = $wgCategoryPagingLimit;
                $res = $dbr->select(
                        array( 'page', 'categorylinks' ),
                        array( 'page_title', 'page_namespace', 'page_len', 'cl_sortkey' ),

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9d52656..71c81f6 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1561,6 +1561,11 @@ $wgThumbLimits = array(
  */
 $wgCategoryMagicGallery = true;
 
+/**
+ * Paging limit for categories
+ */
+$wgCategoryPagingLimit = 200;
+
 /**
  * Browser Blacklist for unicode non compliant browsers
  * Contains a list of regexps : "/regexp/"  matching problematic browsers