summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-02 00:24:24 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-05-02 00:24:24 +0200
commitc94f39b488f9ae6bd24cbdbb5cfa877e29f199e3 (patch)
tree75444dee1c9eac5a38d072ca010d9f54946cb91b
parent93b63cf3755d3f1295c976c308b81c6340883abb (diff)
parent98e0db15a22ced037b6caea4389ccf729e453cdf (diff)
downloadnextcloud-server-c94f39b488f9ae6bd24cbdbb5cfa877e29f199e3.tar.gz
nextcloud-server-c94f39b488f9ae6bd24cbdbb5cfa877e29f199e3.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
-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));
}
};