| Index: trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php |
| — | — | @@ -363,7 +363,8 @@ |
| 364 | 364 | global $wgWikiArticleFeedsSkipCache; |
| 365 | 365 | if ( !$wgWikiArticleFeedsSkipCache && is_string( $cachedFeed ) ) { |
| 366 | 366 | wfDebug( "WikiArticleFeedsExtension: Outputting cached feed\n" ); |
| 367 | | - $feed = new $wgFeedClasses[$feedFormat]( $wgSitename . ' - ' . $title->getText(), '', $title->getFullURL() ); |
| | 367 | + $feed = new $wgFeedClasses[$feedFormat]( $title->getText(), '', $title->getFullURL(). " - Feed" ); |
| | 368 | + ob_start(); |
| 368 | 369 | $feed->httpHeaders(); |
| 369 | 370 | echo $cachedFeed; |
| 370 | 371 | } else { |
| — | — | @@ -373,7 +374,7 @@ |
| 374 | 375 | $cachedFeed = ob_get_contents(); |
| 375 | 376 | ob_end_flush(); |
| 376 | 377 | |
| 377 | | - $expire = 3600 * 24; # One day |
| | 378 | + $expire = 3600; # One hour |
| 378 | 379 | $messageMemc->set( $key, $cachedFeed ); |
| 379 | 380 | $messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire ); |
| 380 | 381 | } |
| — | — | @@ -522,7 +523,7 @@ |
| 523 | 524 | $strippedSeg, |
| 524 | 525 | $matches |
| 525 | 526 | ); |
| 526 | | - if ( $matches[2] ) { |
| | 527 | + if ( !empty( $matches[2] ) ) { |
| 527 | 528 | $url = $matches[2]; |
| 528 | 529 | if ( preg_match( '#^/#', $url ) ) { |
| 529 | 530 | $url = $wgServer . $url; |
| — | — | @@ -539,7 +540,7 @@ |
| 540 | 541 | } |
| 541 | 542 | |
| 542 | 543 | # Programmatically determine the feed title and id. |
| 543 | | - $feedTitle = $wgSitename . ' - ' . $title->getPrefixedText(); |
| | 544 | + $feedTitle = $title->getPrefixedText() . " - Feed"; |
| 544 | 545 | $feedId = $title->getFullUrl(); |
| 545 | 546 | |
| 546 | 547 | # Create feed |