From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 10 Feb 2016 15:59:18 +0000 (+0000)
Subject: Merge "resourceloader: Disable localStorage cache on FF, Opera"
X-Git-Tag: 1.31.0-rc.0~8026
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=39c254ad3a38ab032cdf75439aefe1109e04913c;hp=0a20c6eae1672c248065259b3f2b1d50941884cc;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Disable localStorage cache on FF, Opera"
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 90b93dceee..2aada9e66f 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2034,10 +2034,7 @@
 					// Whether the store is in use on this page.
 					enabled: null,
 
-					// Modules whose string representation exceeds 100 kB (30 kB on FF) are
-					// ineligible for storage due to bug T66721. The quota is stricter on
-					// Firefox due to <https://bugzilla.mozilla.org/show_bug.cgi?id=1064466>.
-					MODULE_SIZE_MAX: ( /Firefox/.test( navigator.userAgent ) ? 30 : 100 ) * 1000,
+					MODULE_SIZE_MAX: 100 * 1000,
 
 					// The contents of the store, mapping '[module name]@[version]' keys
 					// to module implementations.
@@ -2108,8 +2105,15 @@
 							return;
 						}
 
-						if ( !mw.config.get( 'wgResourceLoaderStorageEnabled' ) ) {
+						if (
+							// Disabled because localStorage quotas are tight and (in Firefox's case)
+							// shared by multiple origins.
+							// See T66721, and <https://bugzilla.mozilla.org/show_bug.cgi?id=1064466>.
+							/Firefox|Opera/.test( navigator.userAgent ) ||
+
 							// Disabled by configuration.
+							!mw.config.get( 'wgResourceLoaderStorageEnabled' )
+						) {
 							// Clear any previous store to free up space. (T66721)
 							mw.loader.store.clear();
 							mw.loader.store.enabled = false;