Merge "mw.log.deprecate: Use mw.log.warn instead of log.warn"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 28 Feb 2014 21:02:01 +0000 (21:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Feb 2014 21:02:01 +0000 (21:02 +0000)
1  2 
resources/mediawiki/mediawiki.js

@@@ -558,19 -558,20 +558,19 @@@ var mw = ( function ( $, undefined ) 
                        log.deprecate = !Object.defineProperty ? function ( obj, key, val ) {
                                obj[key] = val;
                        } : function ( obj, key, val, msg ) {
 -                              msg = 'MWDeprecationWarning: Use of "' + key + '" property is deprecated.' +
 -                                      ( msg ? ( ' ' + msg ) : '' );
 +                              msg = 'Use of "' + key + '" is deprecated.' + ( msg ? ( ' ' + msg ) : '' );
                                try {
                                        Object.defineProperty( obj, key, {
                                                configurable: true,
                                                enumerable: true,
                                                get: function () {
                                                        mw.track( 'mw.deprecate', key );
-                                                       log.warn( msg );
+                                                       mw.log.warn( msg );
                                                        return val;
                                                },
                                                set: function ( newVal ) {
                                                        mw.track( 'mw.deprecate', key );
-                                                       log.warn( msg );
+                                                       mw.log.warn( msg );
                                                        val = newVal;
                                                }
                                        } );