| Index: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -350,15 +350,15 @@ |
| 351 | 351 | 'tracked': false, |
| 352 | 352 | 'expires': 30 |
| 353 | 353 | }, options || {} ); |
| 354 | | - var cookie = $.cookie( 'mw.user.bucket:' + key ); |
| | 354 | + var cookie = $.cookie( 'mediaWiki.user.bucket:' + key ); |
| 355 | 355 | var bucket = null; |
| 356 | 356 | var version = 0; |
| 357 | 357 | // Bucket information is stored as 2 integers, together as version:bucket like: "1:2" |
| 358 | 358 | if ( typeof cookie === 'string' && cookie.length > 2 && cookie.indexOf( ':' ) > 0 ) { |
| 359 | 359 | var parts = cookie.split( ':' ); |
| 360 | | - if ( parts.length > 1 && parts[1] == options.version ) { |
| | 360 | + if ( parts.length > 1 && parts[0] == options.version ) { |
| 361 | 361 | version = Number( parts[0] ); |
| 362 | | - bucket = Number( parts[1] ); |
| | 362 | + bucket = String( parts[1] ); |
| 363 | 363 | } |
| 364 | 364 | } |
| 365 | 365 | if ( bucket === null ) { |
| — | — | @@ -384,11 +384,13 @@ |
| 385 | 385 | } |
| 386 | 386 | if ( options.tracked ) { |
| 387 | 387 | mw.loader.using( 'jquery.clickTracking', function() { |
| 388 | | - $.trackAction( 'mw.user.bucket:' + key + '@' + version + ':' + bucket ); |
| | 388 | + $.trackAction( |
| | 389 | + 'mediaWiki.user.bucket:' + key + '@' + version + ':' + bucket |
| | 390 | + ); |
| 389 | 391 | } ); |
| 390 | 392 | } |
| 391 | 393 | $.cookie( |
| 392 | | - 'mw.user.bucket:' + key, |
| | 394 | + 'mediaWiki.user.bucket:' + key, |
| 393 | 395 | version + ':' + bucket, |
| 394 | 396 | { 'path': '/', 'expires': Number( options.expires ) } |
| 395 | 397 | ); |
| Property changes on: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 396 | 398 | Merged /trunk/phase3/resources/mediawiki/mediawiki.js:r86587,86590 |