[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialRecentchanges: Globals for config are bad, m'kay

2017-07-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/363976 )

Change subject: SpecialRecentchanges: Globals for config are bad, m'kay
..


SpecialRecentchanges: Globals for config are bad, m'kay

Change-Id: I9ca7aead42ffee1e891525fc80f3438157f4fb2f
---
M includes/specials/SpecialRecentchanges.php
1 file changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index bec87c5..05bcc4d 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -138,10 +138,6 @@
 * @param string $subpage
 */
public function execute( $subpage ) {
-   global $wgStructuredChangeFiltersEnableSaving,
-   $wgStructuredChangeFiltersEnableExperimentalViews,
-   $wgStructuredChangeFiltersEnableLiveUpdate;
-
// Backwards-compatibility: redirect to new feed URLs
$feedFormat = $this->getRequest()->getVal( 'feed' );
if ( !$this->including() && $feedFormat ) {
@@ -184,15 +180,15 @@
$out->addJsConfigVars( 'wgStructuredChangeFilters', 
$jsData['groups'] );
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableSaving',
-   $wgStructuredChangeFiltersEnableSaving
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableSaving' )
);
$out->addJsConfigVars(

'wgStructuredChangeFiltersEnableExperimentalViews',
-   
$wgStructuredChangeFiltersEnableExperimentalViews
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableExperimentalViews' )
);
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableLiveUpdate',
-   $wgStructuredChangeFiltersEnableLiveUpdate
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableLiveUpdate' )
);
$out->addJsConfigVars(
'wgRCFiltersChangeTags',

-- 
To view, visit https://gerrit.wikimedia.org/r/363976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ca7aead42ffee1e891525fc80f3438157f4fb2f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialRecentchanges: Globals for config are bad, m'kay

2017-07-07 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363976 )

Change subject: SpecialRecentchanges: Globals for config are bad, m'kay
..

SpecialRecentchanges: Globals for config are bad, m'kay

Change-Id: I9ca7aead42ffee1e891525fc80f3438157f4fb2f
---
M includes/specials/SpecialRecentchanges.php
1 file changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/363976/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index bec87c5..05bcc4d 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -138,10 +138,6 @@
 * @param string $subpage
 */
public function execute( $subpage ) {
-   global $wgStructuredChangeFiltersEnableSaving,
-   $wgStructuredChangeFiltersEnableExperimentalViews,
-   $wgStructuredChangeFiltersEnableLiveUpdate;
-
// Backwards-compatibility: redirect to new feed URLs
$feedFormat = $this->getRequest()->getVal( 'feed' );
if ( !$this->including() && $feedFormat ) {
@@ -184,15 +180,15 @@
$out->addJsConfigVars( 'wgStructuredChangeFilters', 
$jsData['groups'] );
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableSaving',
-   $wgStructuredChangeFiltersEnableSaving
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableSaving' )
);
$out->addJsConfigVars(

'wgStructuredChangeFiltersEnableExperimentalViews',
-   
$wgStructuredChangeFiltersEnableExperimentalViews
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableExperimentalViews' )
);
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableLiveUpdate',
-   $wgStructuredChangeFiltersEnableLiveUpdate
+   $this->getConfig()->get( 
'StructuredChangeFiltersEnableLiveUpdate' )
);
$out->addJsConfigVars(
'wgRCFiltersChangeTags',

-- 
To view, visit https://gerrit.wikimedia.org/r/363976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ca7aead42ffee1e891525fc80f3438157f4fb2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits