Reedy has submitted this change and it was merged.

Change subject: Fix use of deprecated configs for Extension:RSS
......................................................................


Fix use of deprecated configs for Extension:RSS

If you browse to a page on mediawikiwiki that uses the <rss> tag, you'll find
its content replaced with the following notice:

> Extension:RSS -- Error: The deprecated variable $wgRSSAllowedFeeds has been
> detected. Since RSS version 2.0 this variable has to be replaced by
> $wgRSSUrlWhitelist as described in the manual page Extension:RSS.

This change updates our configuration to set the correct variable. The name is
not the only thing that has changed, though -- setting $wgRSSAllowedFeeds to an
empty array (which is what we configured) would previously allow all feeds,
whereas now they need to be explicitly whitelisted. We'll have to add things
like gerritweb by hand, but it's better than allowing content from anywhere.

Change-Id: I556287a9e5f7993a11130701260a76914b8199d6
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4779bff..64887e6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1319,7 +1319,7 @@
 if ( $wmgUseRSSExtension ) {
        include( "$IP/extensions/RSS/RSS.php" );
        # $wgRSSProxy = 'url-downloader.wikimedia.org:8080';
-       $wgRSSAllowedFeeds = $wmgRSSAllowedFeeds;
+       $wgRSSUrlWhitelist = $wmgRSSUrlWhitelist;
 }
 
 wfProfileOut( "$fname-ext-include2" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e4cd536..8e269e6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10293,8 +10293,8 @@
        'mediawikiwiki' => true,
        'uawikimedia' => true,
 ),
-'wmgRSSAllowedFeeds' => array(
-       'default' => array(),
+'wmgRSSUrlWhitelist' => array(
+       'default' => array(),  // as of Ext:RSS v2, this means no URLs are 
allowed.
        'uawikimedia' => array( 'http://wikimediaukraine.wordpress.com/feed/' ),
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I556287a9e5f7993a11130701260a76914b8199d6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to