Index: trunk/phase3/includes/ChangesFeed.php |
— | — | @@ -20,14 +20,14 @@ |
21 | 21 | |
22 | 22 | public function execute( $feed, $rows, $limit=0, $hideminor=false, $lastmod=false, $target='' ) { |
23 | 23 | global $messageMemc, $wgFeedCacheTimeout; |
24 | | - global $wgSitename, $wgContLanguageCode; |
| 24 | + global $wgSitename, $wgLang; |
25 | 25 | |
26 | 26 | if ( !FeedUtils::checkFeedOutput( $this->format ) ) { |
27 | 27 | return; |
28 | 28 | } |
29 | 29 | |
30 | 30 | $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' ); |
31 | | - $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $target ); |
| 31 | + $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $target, $wgLang->getCode() ); |
32 | 32 | |
33 | 33 | FeedUtils::checkPurge($timekey, $key); |
34 | 34 | |
— | — | @@ -55,7 +55,7 @@ |
56 | 56 | public function saveToCache( $feed, $timekey, $key ) { |
57 | 57 | global $messageMemc; |
58 | 58 | $expire = 3600 * 24; # One day |
59 | | - $messageMemc->set( $key, $feed ); |
| 59 | + $messageMemc->set( $key, $feed, $expire ); |
60 | 60 | $messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire ); |
61 | 61 | } |
62 | 62 | |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -628,6 +628,7 @@ |
629 | 629 | * (bug 21470) MediaWiki:Sp-contributions-explain is now wrapped in a <p> with |
630 | 630 | id "mw-sp-contributions-explain" |
631 | 631 | * (bug 19159) Fixed \overleftrightarrow in texvc |
| 632 | +* (bug 19391) Fix caching for Recent ChangesFeed. |
632 | 633 | |
633 | 634 | == API changes in 1.16 == |
634 | 635 | |