aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorunknown <Alain@Alain-PC.(none)>2012-05-01 17:54:35 +0200
committerRobin Appelman <icewind@owncloud.com>2012-05-01 23:46:51 +0200
commit98e0db15a22ced037b6caea4389ccf729e453cdf (patch)
tree78c1ed55ec690457a3f1e26c0197d6fb0aaa8723 /core
parente48f511606a1ef64aa39099055dd6ae437f45d03 (diff)
downloadnextcloud-server-98e0db15a22ced037b6caea4389ccf729e453cdf.tar.gz
nextcloud-server-98e0db15a22ced037b6caea4389ccf729e453cdf.zip
correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details) solved Signed-off-by: bourgeoa
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 12303d7dd91..f697f2b8537 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -171,6 +171,7 @@ if(typeof localStorage !='undefined'){
return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
},
getItem:function(name){
+ if(localStorage.getItem(OC.localStorage.namespace+name)==null){return null;}
return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
}
};