Pass the url to ChangesFeed::getFeedObject() instead of grabbing it from $wgTitle

(no use of that function in extensions)

diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index f07b650..8a17ef8 100644 (file)
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -24,15 +24,19 @@ class ChangesFeed {
         *
         * @param $title String: feed's title
         * @param $description String: feed's description
+        * @param $url String: url of origin page
         * @return ChannelFeed subclass or false on failure
         */
-       public function getFeedObject( $title, $description ) {
-               global $wgSitename, $wgLanguageCode, $wgFeedClasses, $wgTitle;
-               $feedTitle = "$wgSitename  - {$title} [$wgLanguageCode]";
-               if( !isset($wgFeedClasses[$this->format] ) )
+       public function getFeedObject( $title, $description, $url ) {
+               global $wgSitename, $wgLanguageCode, $wgFeedClasses;
+
+               if ( !isset( $wgFeedClasses[$this->format] ) ) {
                        return false;
+               }
+
+               $feedTitle = "$wgSitename  - {$title} [$wgLanguageCode]";
                return new $wgFeedClasses[$this->format](
-                       $feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() );
+                       $feedTitle, htmlspecialchars( $description ), $url );
        }
 
        /**

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 3ec4ae4..dea902b 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -169,7 +169,8 @@ class SpecialRecentChanges extends IncludableSpecialPage {
                $changesFeed = new ChangesFeed( $feedFormat, 'rcfeed' );
                $formatter = $changesFeed->getFeedObject(
                        wfMsgForContent( 'recentchanges' ),
-                       wfMsgForContent( 'recentchanges-feed-description' )
+                       wfMsgForContent( 'recentchanges-feed-description' ),
+                       $this->getTitle()->getFullUrl()
                );
                return array( $changesFeed, $formatter );
        }

diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index db0f554..49cce03 100644 (file)
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -56,7 +56,8 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
                $feed = new ChangesFeed( $feedFormat, false );
                $feedObj = $feed->getFeedObject(
                        wfMsgForContent( 'recentchangeslinked-title', $this->getTargetTitle()->getPrefixedText() ),
-                       wfMsgForContent( 'recentchangeslinked-feed' )
+                       wfMsgForContent( 'recentchangeslinked-feed' ),
+                       $this->getTitle()->getFullUrl()
                );
                return array( $feed, $feedObj );
        }