https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114168
Revision: 114168
Author: wikinaut
Date: 2012-03-19 18:56:58 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
removed the redundant code for handling tracking categories. By using '-' for
the message text rss-tracking-category , this can be disabled easily.
Modified Paths:
--------------
trunk/extensions/RSS/RSS.php
trunk/extensions/RSS/RSSParser.php
Modified: trunk/extensions/RSS/RSS.php
===================================================================
--- trunk/extensions/RSS/RSS.php 2012-03-19 18:50:32 UTC (rev 114167)
+++ trunk/extensions/RSS/RSS.php 2012-03-19 18:56:58 UTC (rev 114168)
@@ -4,7 +4,7 @@
*
* @file
* @ingroup Extensions
- * @version 2.14
+ * @version 2.15
* @author mutante, Daniel Kinzler, Rdb, Mafs, Thomas Gries, Alxndr, Chris
Reigrut, K001
* @author Kellan Elliott-McCrea <[email protected]> -- author of MagpieRSS
* @author Jeroen De Dauw
@@ -14,7 +14,7 @@
* @link http://www.mediawiki.org/wiki/Extension:RSS Documentation
*/
-define( "EXTENSION_RSS_VERSION", "2.14 20120309" );
+define( "EXTENSION_RSS_VERSION", "2.15 20120319" );
if ( !defined( 'MEDIAWIKI' ) ) {
die( "This is not a valid entry point.\n" );
@@ -98,20 +98,3 @@
// You can choose to allow active links in feed items; default: false
$wgRSSAllowLinkTag = false;
-
-// If you want to see images in feed items, then you need to globally allow
-// image tags in your wiki by using the MediaWiki parameter; default: false
-// $wgAllowImageTag = true;
-
-// Parameter to enable the automatic tracking category
-// for all pages using this parser extension
-//
-// Category name [[MediaWiki:Rss-tracking-category]] (default)
-// $wgRSSTrackingCategory = true;
-//
-// you can assign a specific category name [[MediaWiki:Rss-mycategory]]
-// $wgRSSTrackingCategory = 'rss-mycategory';
-//
-// you can disable the use of a tracking category
-// $wgRSSTrackingCategory = false;
-$wgRSSTrackingCategory = true;
Modified: trunk/extensions/RSS/RSSParser.php
===================================================================
--- trunk/extensions/RSS/RSSParser.php 2012-03-19 18:50:32 UTC (rev 114167)
+++ trunk/extensions/RSS/RSSParser.php 2012-03-19 18:56:58 UTC (rev 114168)
@@ -328,7 +328,6 @@
* @param $frame the frame param to pass to recursiveTagParse()
*/
function renderFeed( $parser, $frame ) {
- global $wgRSSTrackingCategory;
$renderedFeed = '';
@@ -353,12 +352,8 @@
$renderedFeed = $this->sandboxParse( $renderedFeed );
}
- if ( $wgRSSTrackingCategory === true ) {
- $parser->addTrackingCategory( 'rss-tracking-category' );
- } elseif ( is_string( $wgRSSTrackingCategory ) ) {
- $parser->addTrackingCategory( $wgRSSTrackingCategory );
- }
+ $parser->addTrackingCategory( 'rss-tracking-category' );
return $renderedFeed;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
