| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -46,17 +46,17 @@ |
| 47 | 47 | */ |
| 48 | 48 | public function execute( $feed, $rows, $lastmod, $opts ) { |
| 49 | 49 | global $messageMemc, $wgFeedCacheTimeout; |
| 50 | | - global $wgSitename, $wgLang; |
| | 50 | + global $wgSitename, $wgLang, $wgRenderHashAppend; |
| 51 | 51 | |
| 52 | 52 | if ( !FeedUtils::checkFeedOutput( $this->format ) ) { |
| 53 | 53 | return; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | | - $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' ); |
| 57 | | - $optionsHash = md5( serialize( $opts->getAllValues() ) ); |
| | 56 | + $optionsHash = md5( serialize( $opts->getAllValues() ) ) . $wgRenderHashAppend; |
| | 57 | + $timekey = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash, 'timestamp' ); |
| 58 | 58 | $key = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash ); |
| 59 | 59 | |
| 60 | | - FeedUtils::checkPurge($timekey, $key); |
| | 60 | + FeedUtils::checkPurge( $timekey, $key ); |
| 61 | 61 | |
| 62 | 62 | /* |
| 63 | 63 | * Bumping around loading up diffs can be pretty slow, so where |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -81,6 +81,7 @@ |
| 82 | 82 | when using rebuildFileCache.php |
| 83 | 83 | * (bug 22496) Viewing diff of a redirect page without specifying "oldid" |
| 84 | 84 | parameter no longer makes the page displayed as being the redirect target |
| | 85 | +* (bug 22918) Feed cache keys now use $wgRenderHashAppend |
| 85 | 86 | |
| 86 | 87 | === API changes in 1.17 === |
| 87 | 88 | * (bug 22738) Allow filtering by action type on query=logevent |