| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -111,9 +111,13 @@ |
| 112 | 112 | */ |
| 113 | 113 | public function getOptions() { |
| 114 | 114 | if ( $this->rcOptions === null ) { |
| 115 | | - global $wgRequest; |
| 116 | | - $feedFormat = $wgRequest->getVal( 'feed' ); |
| 117 | | - $this->rcOptions = $feedFormat ? $this->feedSetup() : $this->setup( $this->rcSubpage ); |
| | 115 | + if ( $this->including() ) { |
| | 116 | + $isFeed = false; |
| | 117 | + } else { |
| | 118 | + global $wgRequest; |
| | 119 | + $isFeed = (bool)$wgRequest->getVal( 'feed' ); |
| | 120 | + } |
| | 121 | + $this->rcOptions = $isFeed ? $this->feedSetup() : $this->setup( $this->rcSubpage ); |
| 118 | 122 | } |
| 119 | 123 | return $this->rcOptions; |
| 120 | 124 | } |
| — | — | @@ -127,7 +131,7 @@ |
| 128 | 132 | public function execute( $subpage ) { |
| 129 | 133 | global $wgRequest, $wgOut; |
| 130 | 134 | $this->rcSubpage = $subpage; |
| 131 | | - $feedFormat = $wgRequest->getVal( 'feed' ); |
| | 135 | + $feedFormat = $this->including() ? null : $wgRequest->getVal( 'feed' ); |
| 132 | 136 | |
| 133 | 137 | # 10 seconds server-side caching max |
| 134 | 138 | $wgOut->setSquidMaxage( 10 ); |