| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -393,7 +393,13 @@ |
| 394 | 394 | public function disable() { $this->mDoNothing = true; } |
| 395 | 395 | public function isDisabled() { return $this->mDoNothing; } |
| 396 | 396 | |
| 397 | | - public function setSyndicated( $show = true ) { $this->mShowFeedLinks = $show; } |
| | 397 | + public function setSyndicated( $show = true ) { |
| | 398 | + if ( $show ) { |
| | 399 | + $this->setFeedAppendQuery( false ); |
| | 400 | + } else { |
| | 401 | + $this->mFeedLinks = array(); |
| | 402 | + } |
| | 403 | + } |
| 398 | 404 | |
| 399 | 405 | public function setFeedAppendQuery( $val ) { |
| 400 | 406 | global $wgFeedClasses; |
| — | — | @@ -401,7 +407,9 @@ |
| 402 | 408 | $this->mFeedLinks = array(); |
| 403 | 409 | |
| 404 | 410 | foreach( $wgFeedClasses as $type => $class ) { |
| 405 | | - $query = "feed=$type&".$val; |
| | 411 | + $query = "feed=$type"; |
| | 412 | + if ( is_string( $val ) ) |
| | 413 | + $query .= '&' . $val; |
| 406 | 414 | $this->mFeedLinks[$type] = $this->getTitle()->getLocalURL( $query ); |
| 407 | 415 | } |
| 408 | 416 | } |