Merge "Fix IE9's lack of support for console.warn.apply"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.js

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 57f85d8..3025260 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -471,7 +471,7 @@ var mw = ( function ( $, undefined ) {
                 *
                 * This was reserved for future use but never ended up being used.
                 *
-                * @deprecated since 1.22: Let deprecated identifiers keep their original name
+                * @deprecated since 1.22 Let deprecated identifiers keep their original name
                 *  and use mw.log#deprecate to create an access container for tracking.
                 * @property
                 */
@@ -538,7 +538,7 @@ var mw = ( function ( $, undefined ) {
                         */
                        log.warn = function () {
                                var console = window.console;
-                               if ( console && console.warn ) {
+                               if ( console && console.warn && console.warn.apply ) {
                                        console.warn.apply( console, arguments );
                                        if ( console.trace ) {
                                                console.trace();
@@ -2371,7 +2371,9 @@ var mw = ( function ( $, undefined ) {
                         * @return {mw.hook}
                         */
                        return function ( name ) {
-                               var list = lists[name] || ( lists[name] = $.Callbacks( 'memory' ) );
+                               var list = hasOwn.call( lists, name ) ?
+                                       lists[name] :
+                                       lists[name] = $.Callbacks( 'memory' );
 
                                return {
                                        /**