From: Jeroen De Dauw <jeroendedauw@users.mediawiki.org>
Date: Tue, 13 Dec 2011 21:37:19 +0000 (+0000)
Subject: comment out another to soon placed warning
X-Git-Tag: 1.31.0-rc.0~25982
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=04b9a5d834c18ec3375af4391d116934dd3fa3ee;p=lhc%2Fweb%2Fwiklou.git

comment out another to soon placed warning
---

diff --git a/includes/User.php b/includes/User.php
index a9e4bc2bd7..5f91eb94e5 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3186,14 +3186,14 @@ class User {
 
 	/**
 	 * Alias for getEditToken.
-	 * @deprecated since 1.19, use getEditToken instead.
+	 * @deprecated since 1.19, use getEditToken instead. Warnings in 1.21.
 	 *
 	 * @param $salt String|Array of Strings Optional function-specific data for hashing
 	 * @param $request WebRequest object to use or null to use $wgRequest
 	 * @return String The new edit token
 	 */
 	public function editToken( $salt = '', $request = null ) {
-		wfDeprecated( __METHOD__, '1.19' );
+		# wfDeprecated( __METHOD__, '1.19' );
 		return $this->getEditToken( $salt, $request );
 	}