From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 23 Dec 2010 14:07:25 +0000 (+0000)
Subject: Followup r78539: don't renew a cookie that expires at the end of the session anyway... 
X-Git-Tag: 1.31.0-rc.0~33152
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=2c6789f82984e6710853c560d6f6b4f4bbdcc6b3;p=lhc%2Fweb%2Fwiklou.git

Followup r78539: don't renew a cookie that expires at the end of the session anyway, no point in doing that.
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index ea1a9ef8df..992aff81f5 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -349,9 +349,8 @@ window.mediaWiki = new ( function( $ ) {
 			var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
 			if ( typeof sessionId == 'undefined' || sessionId == null ) {
 				sessionId = generateId();
+				$.cookie( 'mediaWiki.user.sessionId', sessionId, { 'expires': null, 'path': '/' } );
 			}
-			// Set cookie if not set, or renew it if already set
-			$.cookie( 'mediaWiki.user.sessionId', sessionId, { 'expires': null, 'path': '/' } );
 			return sessionId;
 		};