From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 15 Oct 2010 17:13:38 +0000 (+0000)
Subject: * (bug 24792) API help caching doesn't vary on $wgUser->isAnon(), causes staleness
X-Git-Tag: 1.31.0-rc.0~34491
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=14b6fbb3beaadf021fa3f1ca712786ad587ce93a;p=lhc%2Fweb%2Fwiklou.git

* (bug 24792) API help caching doesn't vary on $wgUser->isAnon(), causes staleness
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5243154f62..52eae73e5a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -374,7 +374,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 23548) Allow access of another users watchlist through watchlistraw
   using token and username.
 * (bug 23524) Api Modules as followup to bug 14473 (Add iwlinks table to
-  track inline interwiki link usage.
+  track inline interwiki link usage).
 * Add pltitles and tltemplates to prop=links and prop=templates respectively,
   similar to prop=categories's clcategorie
 * (bug 23834) Invalid "thumbwidth" and "thumbheight" in "imageinfo" query when
@@ -432,6 +432,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 25303) Fix API parameter integer validation to actually enforce validation
   on the input values in addition to giving a warning. Also add flag to enforce (die)
   if integer out of range (breaking change!)
+* (bug 24792) API help caching doesn't vary on $wgUser->isAnon(), causes staleness
 
 === Languages updated in 1.17 ===
 
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 19ad59a688..d88a5f21a7 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -805,10 +805,10 @@ class ApiMain extends ApiBase {
 	 * Override the parent to generate help messages for all available modules.
 	 */
 	public function makeHelpMsg() {
-		global $wgMemc, $wgAPICacheHelp, $wgAPICacheHelpTimeout;
+		global $wgMemc, $wgAPICacheHelp, $wgAPICacheHelpTimeout, $wgUser;
 		$this->setHelp();
 		// Get help text from cache if present
-		$key = wfMemcKey( 'apihelp', $this->getModuleName(),
+		$key = wfMemcKey( 'apihelp', $this->getModuleName(), $wgUser->isAnon(),
 			SpecialVersion::getVersion( 'nodb' ) .
 			$this->getMain()->getShowVersions() );
 		if ( $wgAPICacheHelp ) {