Merge "Prevent JSON parsing errors"

This commit is contained in:
jenkins-bot authored and Gerrit Code Review committed 2014-02-11 08:27:23 +00:00
commit 10580dbbdf
1 file changed
+8 -1
+8 -1
View File
@@ -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 || {};
},