From e1c60a0f2703370e3708ed40c2a359be71509310 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Wed, 2 Aug 2017 14:13:37 -0700 Subject: [PATCH] RCFilters: Adjust server default variable names for limit/days Change-Id: I4a204e1a61516cff505e6e0a71aa702034cea4dc --- includes/specials/SpecialRecentchanges.php | 6 +++--- .../src/mediawiki.rcfilters/mw.rcfilters.Controller.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 46f7927bb1..6ef75e07c0 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -196,9 +196,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $out->addJsConfigVars( 'StructuredChangeFiltersDisplayConfig', [ - 'maxLimit' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days - 'arrayLimit' => $this->getConfig()->get( 'RCLinkLimits' ), - 'arrayDays' => $this->getConfig()->get( 'RCLinkDays' ), + 'maxDays' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days + 'limitArray' => $this->getConfig()->get( 'RCLinkLimits' ), + 'daysArray' => $this->getConfig()->get( 'RCLinkDays' ), ] ); } diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index f07d3f1f59..864e397a43 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -115,7 +115,7 @@ // we should remove all sticky behavior methods completely // See T172156 // isSticky: true, - filters: displayConfig.arrayLimit.map( function ( num ) { + filters: displayConfig.limitArray.map( function ( num ) { return controller._createFilterDataFromNumber( num, num ); } ) }, @@ -128,7 +128,7 @@ validate: $.isNumeric, range: { min: 0, - max: displayConfig.maxLimit + max: displayConfig.maxDays }, sortFunc: function ( a, b ) { return Number( a.name ) - Number( b.name ); }, numToLabelFunc: function ( i ) { @@ -143,7 +143,7 @@ // Hours (1, 2, 6, 12) 0.04166, 0.0833, 0.25, 0.5 // Days - ].concat( displayConfig.arrayDays ) + ].concat( displayConfig.daysArray ) .map( function ( num ) { return controller._createFilterDataFromNumber( num, -- 2.20.1