From 198475f310235009091a33c7c0ace5bb758ecdd0 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Mon, 13 Dec 2010 23:51:29 +0000 Subject: [PATCH] Fixed issue in r78104 where jquery.cookie wouldn't load properly. Changed the mediaWiki User object to load jquery.cookie on demand. --- resources/Resources.php | 1 - resources/mediawiki/mediawiki.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/Resources.php b/resources/Resources.php index c1c09793b2..96489042ea 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -326,7 +326,6 @@ return array( 'mediawiki' => array( 'scripts' => 'resources/mediawiki/mediawiki.js', 'debugScripts' => 'resources/mediawiki/mediawiki.log.js', - 'dependencies' => array( 'jquery.cookie' ), 'debugRaw' => false ), 'mediawiki.util' => array( diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index 7f20504fd0..0f3a10b27e 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -274,6 +274,7 @@ window.mediaWiki = new ( function( $ ) { if ( name ) { return name; } + mediaWiki.loader.load( 'jquery.cookie' ); var sessionId = $.cookie( 'mediaWiki.user.sessionId' ); if ( typeof sessionId == 'undefined' || sessionId == null ) { sessionId = generateSessionId(); -- 2.20.1