(bug 16884) Fixed feed links in sidebar not complying with URL parameters of the...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7ef10db..e1ad8f6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -640,6 +640,8 @@ Hopefully we will remove this configuration var soon)
 * (bug 21551) Make Squid reponse limit configurable
 * Fixed corruption of long UDP debug log messages by using socket_sendto() 
   instead of fsockopen() with fwrite().
+* (bug 16884) Fixed feed links in sidebar not complying with URL parameters
+  of the displayed page
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 9cb8570..fae8281 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -133,12 +133,8 @@ class SpecialContributions extends SpecialPage {
        
        protected function setSyndicated() {
                global $wgOut;
-               $queryParams = array(
-                       'namespace' => $this->opts['namespace'],
-                       'target'  => $this->opts['target']
-               );
                $wgOut->setSyndicated( true );
-               $wgOut->setFeedAppendQuery( wfArrayToCGI( $queryParams ) );
+               $wgOut->setFeedAppendQuery( wfArrayToCGI( $this->opts ) );
        }
 
        /**

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index cf1e1af..49938db 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -232,12 +232,8 @@ class SpecialNewpages extends SpecialPage {
 
        protected function setSyndicated() {
                global $wgOut;
-               $queryParams = array(
-                       'namespace' => $this->opts->getValue( 'namespace' ),
-                       'username' => $this->opts->getValue( 'username' )
-               );
                $wgOut->setSyndicated( true );
-               $wgOut->setFeedAppendQuery( wfArrayToCGI( $queryParams ) );
+               $wgOut->setFeedAppendQuery( wfArrayToCGI( $this->opts->getAllValues() ) );
        }
 
        /**