Fix broken console.error.call in IE9

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

diff --git a/resources/mediawiki/mediawiki.user.js b/resources/mediawiki/mediawiki.user.js
index ac3204c..7f881b0 100644 (file)
--- a/resources/mediawiki/mediawiki.user.js
+++ b/resources/mediawiki/mediawiki.user.js
@@ -1,5 +1,5 @@
 /*
- * Implementation for mediaWiki.log stub
+ * Implementation for mediaWiki.user
  */
 
 (function( $ ) {
@@ -7,7 +7,7 @@
        /**
         * User object
         */
-       function User() {
+       function User( options, tokens ) {
 
                /* Private Members */
 
@@ -15,9 +15,9 @@
 
                /* Public Members */
 
-               this.options = new mw.Map();
+               this.options = options || new mw.Map();
 
-               this.tokens = new mw.Map();
+               this.tokens = tokens || new mw.Map();
 
                /* Public Methods */
 
@@ -29,7 +29,7 @@
                 *
                 * @return String: Random set of 32 alpha-numeric characters
                 */
-               this.generateId = function() {
+               function generateId() {
                        var id = '';
                        var seed = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
                        for ( var i = 0, r; i < 32; i++ ) {
@@ -37,7 +37,7 @@
                                id += seed.substring( r, r + 1 );
                        }
                        return id;
-               };
+               }
 
                /**
                 * Gets the current user's name.
@@ -68,7 +68,7 @@
                this.sessionId = function () {
                        var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
                        if ( typeof sessionId == 'undefined' || sessionId === null ) {
-                               sessionId = that.generateId();
+                               sessionId = generateId();
                                $.cookie( 'mediaWiki.user.sessionId', sessionId, { 'expires': null, 'path': '/' } );
                        }
                        return sessionId;
@@ -90,7 +90,7 @@
                        }
                        var id = $.cookie( 'mediaWiki.user.id' );
                        if ( typeof id == 'undefined' || id === null ) {
-                               id = that.generateId();
+                               id = generateId();
                        }
                        // Set cookie if not set, or renew it if already set
                        $.cookie( 'mediaWiki.user.id', id, { 'expires': 365, 'path': '/' } );
@@ -176,6 +176,8 @@
                };
        }
 
-       mw.user = new User();
+       // Extend the skeleton mw.user from mediawiki.js
+       // This is kind of ugly but we're stuck with this for b/c reasons
+       mw.user = new User( mw.user.options, mw.user.tokens );
 
 })(jQuery);
\ No newline at end of file