From 66ae68ee44dc7560d431db1b141f5385d0dddbd4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Wed, 9 Aug 2017 21:07:10 +0200
Subject: [PATCH] mw.util: Add a deprecation message to escapeId()

Bug: T172493
Change-Id: Ie1468a4c1b56ca79b5f978a8bba80e98d8871f51
---
 resources/src/mediawiki/mediawiki.util.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js
index d0ec58501c..0e423beecf 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -65,17 +65,6 @@
 		 */
 		rawurlencode: rawurlencode,
 
-		/**
-		 * Encode the string like Sanitizer::escapeId() in PHP
-		 * @deprecated since 1.30 use escapeIdForAttribute() or escapeIdForLink()
-		 *
-		 * @param {string} str String to be encoded.
-		 * @return {string} Encoded string
-		 */
-		escapeId: function ( str ) {
-			return escapeIdInternal( str, 'legacy' );
-		},
-
 		/**
 		 * Encode string into HTML id compatible form suitable for use in HTML
 		 * Analog to PHP Sanitizer::escapeIdForAttribute()
@@ -604,6 +593,18 @@
 		return true;
 	}, 'Use mw.notify instead.' );
 
+	/**
+	 * Encode the string like Sanitizer::escapeId() in PHP
+	 *
+	 * @method escapeId
+	 * @deprecated since 1.30 use escapeIdForAttribute() or escapeIdForLink()
+	 * @param {string} str String to be encoded.
+	 * @return {string} Encoded string
+	 */
+	mw.log.deprecate( util, 'escapeId', function ( str ) {
+		return escapeIdInternal( str, 'legacy' );
+	}, 'Use mw.util.escapeIdForAttribute or mw.util.escapeIdForLink instead.' );
+
 	/**
 	 * Initialisation of mw.util.$content
 	 */
-- 
2.20.1