diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-02 11:23:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-02 11:23:10 +0200 |
| commit | de117cd8ecbed0abdc387c21f82a8d17c00465ef (patch) | |
| tree | cb6d4bafde6afafdae26a58888d41423e8ef13e4 | |
| parent | a6ed98c4c405647a747b4bf29bf61da5ea6756ac (diff) | |
| parent | 1c3ee251f0213b2fb83de99be8a50e630447e191 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 3906 chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140402092310-ixv8m1z53j107024
| -rw-r--r-- | addons/web/static/src/js/core.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index b92ca1d3ba5..90c84ba9cda 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -271,7 +271,12 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ for(var i=0; i<cookies.length; ++i) { var cookie = cookies[i].replace(/^\s*/, ''); if(cookie.indexOf(nameEQ) === 0) { - return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length))); + try { + return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length))); + } catch(err) { + // wrong cookie, delete it + this.set_cookie(name, '', -1); + } } } return null; |