X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=blobdiff_plain;f=includes%2Fapi%2FApiMain.php;h=ea619321f56b3703fc736b1a534aada47e9c93bd;hb=3de8536d3e096761a364d2709afac562eeb1842d;hp=f69d3ffaa148ad726f14fbdce057e80aa025bbd9;hpb=d31b22967f41eed3991ce1962b2dcc38d4a6e683;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index f69d3ffaa1..ea619321f5 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -292,16 +292,6 @@ class ApiMain extends ApiBase {
 		$this->mCacheMode = $mode;
 	}
 
-	/**
-	 * @deprecated since 1.17 Private caching is now the default, so there is usually no
-	 * need to call this function. If there is a need, you can use
-	 * $this->setCacheMode('private')
-	 */
-	public function setCachePrivate() {
-		wfDeprecated( __METHOD__, '1.17' );
-		$this->setCacheMode( 'private' );
-	}
-
 	/**
 	 * Set directives (key/value pairs) for the Cache-Control header.
 	 * Boolean values will be formatted as such, by including or omitting
@@ -316,21 +306,6 @@ class ApiMain extends ApiBase {
 		$this->mCacheControl = $directives + $this->mCacheControl;
 	}
 
-	/**
-	 * Make sure Vary: Cookie and friends are set. Use this when the output of a request
-	 * may be cached for anons but may not be cached for logged-in users.
-	 *
-	 * WARNING: This function must be called CONSISTENTLY for a given URL. This means that a
-	 * given URL must either always or never call this function; if it sometimes does and
-	 * sometimes doesn't, stuff will break.
-	 *
-	 * @deprecated since 1.17 Use setCacheMode( 'anon-public-user-private' )
-	 */
-	public function setVaryCookie() {
-		wfDeprecated( __METHOD__, '1.17' );
-		$this->setCacheMode( 'anon-public-user-private' );
-	}
-
 	/**
 	 * Create an instance of an output formatter by its name
 	 *