diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-23 11:44:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 11:44:12 +0200 |
| commit | 531abf25517fd6b130bc5a1f799becf33684bb43 (patch) | |
| tree | 76d45af609ba25efce252d6ec276c0da7b223046 /toolkit | |
| parent | 1916969baaa5d2bd84f323ca0510ba2c8a04ef58 (diff) | |
| parent | b9ecf99332786f0040e63d868fa0d799ed1ab765 (diff) | |
| download | UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.gz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.lz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.xz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.zip | |
Merge pull request #234 from janekptacijarabaci/about_errors_1
moebius#65: Fix: various "about:..." system pages errors
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/aboutcache/content/aboutCache.js | 4 | ||||
| -rw-r--r-- | toolkit/modules/sessionstore/FormData.jsm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/toolkit/components/aboutcache/content/aboutCache.js index 07067cce3..e945d683e 100644 --- a/toolkit/components/aboutcache/content/aboutCache.js +++ b/toolkit/components/aboutcache/content/aboutCache.js @@ -40,5 +40,9 @@ function navigate() if ($('priv').checked) context += 'p,'; + if (storage == null) { + storage = ""; + } + window.location.href = 'about:cache?storage=' + storage + '&context=' + context; } diff --git a/toolkit/modules/sessionstore/FormData.jsm b/toolkit/modules/sessionstore/FormData.jsm index f90ba5825..d4fb08d93 100644 --- a/toolkit/modules/sessionstore/FormData.jsm +++ b/toolkit/modules/sessionstore/FormData.jsm @@ -216,7 +216,7 @@ var FormDataInternal = { // We want to avoid saving data for about:sessionrestore as a string. // Since it's stored in the form as stringified JSON, stringifying further // causes an explosion of escape characters. cf. bug 467409 - if (isRestorationPage(ret.url)) { + if (isRestorationPage(ret.url) && ret.id && ret.id.sessionData) { ret.id.sessionData = JSON.parse(ret.id.sessionData); } |