From 7627358fb40acc0d8176d9f1771b2a984e4b5256 Mon Sep 17 00:00:00 2001
From: "Amir E. Aharoni" <amir.aharoni@mail.huji.ac.il>
Date: Mon, 10 Feb 2014 15:25:37 +0200
Subject: [PATCH] Prevent JSON parsing errors

Bug: 61137
Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
---
 resources/js/ext.uls.preferences.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/js/ext.uls.preferences.js b/resources/js/ext.uls.preferences.js
index f4f99ffb..cebc20eb 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 || {};
 		},