From 56040b941c20d1d2ed2abf3f1993ea550bc13086 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 06 Feb 2015 03:27:44 -0500
Subject: [PATCH] Fix so JSON.parse() errors on localStorage items are ignored (#1490249)
---
CHANGELOG | 1 +
program/js/app.js | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index b77215c..2df3bf6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
- Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239)
- Fix security issue in DBMail driver of password plugin (#1490261)
- Enable FollowSymLinks option in .htaccess file which is required by rewrite rules (#1490255)
+- Fix so JSON.parse() errors on localStorage items are ignored (#1490249)
RELEASE 1.1-rc
--------------
diff --git a/program/js/app.js b/program/js/app.js
index 55a4799..227ba32 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -8159,15 +8159,16 @@
// wrapper for localStorage.getItem(key)
this.local_storage_get_item = function(key, deflt, encrypted)
{
- var item;
+ var item, result;
// TODO: add encryption
try {
item = localStorage.getItem(this.get_local_storage_prefix() + key);
+ result = JSON.parse(item);
}
catch (e) { }
- return item !== null ? JSON.parse(item) : (deflt || null);
+ return result || deflt || null;
};
// wrapper for localStorage.setItem(key, data)
--
Gitblit v1.9.1