summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
commit01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125 (patch)
tree69438df6a5406510ead01d5406872a9ca0ee1122 /application/palemoon/components
parent25370b7f0cc8709821acc8b7826c2c6e38268c67 (diff)
parent64204fdb8302c8bf483d724430dd83f43c1cb6ff (diff)
downloadUXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.gz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.lz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.xz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP and resolve conflicts
Diffstat (limited to 'application/palemoon/components')
-rw-r--r--application/palemoon/components/sessionstore/SessionStore.jsm2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/palemoon/components/sessionstore/SessionStore.jsm b/application/palemoon/components/sessionstore/SessionStore.jsm
index 5e09ff5c8..3185dee9b 100644
--- a/application/palemoon/components/sessionstore/SessionStore.jsm
+++ b/application/palemoon/components/sessionstore/SessionStore.jsm
@@ -2404,7 +2404,7 @@ let SessionStoreInternal = {
for (var [host, isPinned] in Iterator(internalWindow.hosts)) {
let list;
try {
- list = Services.cookies.getCookiesFromHost(host);
+ list = Services.cookies.getCookiesFromHost(host, {});
}
catch (ex) {
debug("getCookiesFromHost failed. Host: " + host);