jenkins-bot has submitted this change and it was merged.
Change subject: Prevent JSON parsing errors
......................................................................
Prevent JSON parsing errors
Bug: 61137
Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
---
M resources/js/ext.uls.preferences.js
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.preferences.js
b/resources/js/ext.uls.preferences.js
index f4f99ff..cebc20e 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -180,8 +180,15 @@
this.preferences = preferenceStore().get(
this.preferenceName );
} else {
var options = mw.user.options.get(
this.preferenceName );
- this.preferences = JSON.parse( options );
+
+ // Try to parse JSON
+ try {
+ this.preferences = JSON.parse( options
);
+ } catch ( e ) {
+ this.preferences = {};
+ }
}
+
this.preferences = this.preferences || {};
},
--
To view, visit https://gerrit.wikimedia.org/r/112444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
