Move $wgFeedClasses to DefaultSettings where they belong. This has been bothering...

Somewhat in the spirit of r87637, except I didn't put them in WebStart because that doesn't make sense.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d145f5e..debae38 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4372,6 +4372,16 @@ $wgFeedDiffCutoff = 32768;
  */
 $wgOverrideSiteFeed = array();
 
+/**
+ * Available feeds objects
+ * Should probably only be defined when a page is syndicated ie when
+ * $wgOut->isSyndicated() is true
+ */
+$wgFeedClasses = array(
+       'rss' => 'RSSFeed',
+       'atom' => 'AtomFeed',
+);
+
 /**
  * Which feed types should we provide by default?  This can include 'rss',
  * 'atom', neither, or both.

diff --git a/includes/Defines.php b/includes/Defines.php
index a9b2e56..0252c40 100644 (file)
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -85,16 +85,6 @@ define( 'NS_IMAGE', NS_FILE );
 define( 'NS_IMAGE_TALK', NS_FILE_TALK );
 /**@}*/
 
-/**
- * Available feeds objects
- * Should probably only be defined when a page is syndicated ie when
- * $wgOut->isSyndicated() is true
- */
-$wgFeedClasses = array(
-       'rss' => 'RSSFeed',
-       'atom' => 'AtomFeed',
-);
-
 /**@{
  * Cache type
  */