From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 9 Feb 2019 22:16:53 +0000 (+0000)
Subject: Merge "resourceloader: Misc optimisations in startup module"
X-Git-Tag: 1.34.0-rc.0~2878
X-Git-Url: https://git.cyclocoop.org/%2C?a=commitdiff_plain;h=44532bdd3b8a56dcc07fc92da7538b9e7f35657b;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Misc optimisations in startup module"
---

44532bdd3b8a56dcc07fc92da7538b9e7f35657b
diff --cc resources/src/startup/mediawiki.js
index 44e48e5bc7,5f02bd466f..967c52992a
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@@ -328,11 -322,10 +323,11 @@@
  				}
  				if ( !stacks.has( trace ) ) {
  					stacks.add( trace );
 -					name = logName || key;
 -					mw.track( 'mw.deprecate', name );
 +					if ( logName || obj === window ) {
 +						mw.track( 'mw.deprecate', name );
 +					}
  					mw.log.warn(
- 						'Use of "' + name + '" is deprecated.' + ( msg ? ( ' ' + msg ) : '' )
+ 						'Use of "' + name + '" is deprecated.' + ( msg ? ' ' + msg : '' )
  					);
  				}
  			}