From 58ffcd13c8cd0cdbd25c7d85e04fc3ee815929e1 Mon Sep 17 00:00:00 2001
From: Slowlife <slowlife1165@gmail.com>
Date: Sun, 8 Mar 2026 22:43:21 +0700
Subject: [PATCH 1/4] fix: allow all cross-origin loads for live folders,
 b=closes #12685, p=#12686

* fix: allow all cross-origin loads for live folders, b=closes #12685, c=folders

* chore: undo style changes
---
 src/zen/live-folders/ZenLiveFolder.sys.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zen/live-folders/ZenLiveFolder.sys.mjs b/src/zen/live-folders/ZenLiveFolder.sys.mjs
index 36d17d42f..8085b9a26 100644
--- a/src/zen/live-folders/ZenLiveFolder.sys.mjs
+++ b/src/zen/live-folders/ZenLiveFolder.sys.mjs
@@ -146,7 +146,8 @@ export class nsZenLiveFolderProvider {
       contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD,
       loadingPrincipal: principal,
       securityFlags:
-        Ci.nsILoadInfo.SEC_REQUIRE_CORS_INHERITS_SEC_CONTEXT | Ci.nsILoadInfo.SEC_COOKIES_INCLUDE,
+        Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL |
+        Ci.nsILoadInfo.SEC_COOKIES_INCLUDE,
       triggeringPrincipal: principal,
     }).QueryInterface(Ci.nsIHttpChannel);
 

From dac4575a91789971f4694cc97533462339412c26 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 11:04:23 +0100
Subject: [PATCH 2/4] chore: Add `.DS_Store` to gitignore, p=#12695

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e31fcdecd..0239f5075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ target/
 locales/firefox-l10n/
 
 !src/toolkit/themes/shared/design-system/dist/
+.DS_Store

From 64fc35658da24a735cc53af1c6aae6cb4be0aecd Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 13:42:15 +0100
Subject: [PATCH 3/4] feat: Change selected tab when resetting pinned tab,
 p=#12696

---
 src/zen/tabs/ZenPinnedTabManager.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 8bf52f019..ae994feb5 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -111,6 +111,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
   _onTabResetPinButton(event, tab) {
     event.stopPropagation();
     this._resetTabToStoredState(tab);
+    gBrowser.selectedTab = tab;
   }
 
   get enabled() {

From 25c57403314814510364fd6c89dae22711bfa917 Mon Sep 17 00:00:00 2001
From: Ruben Fricke <rubenfricke@gmail.com>
Date: Mon, 9 Mar 2026 18:04:08 +0100
Subject: [PATCH 4/4] fix: set zenDefaultUserContextId on live folder tabs,
 p=#12702

---
 src/zen/live-folders/ZenLiveFoldersManager.sys.mjs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
index ef7b515a1..7fe382914 100644
--- a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
+++ b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
@@ -407,6 +407,9 @@ class nsZenLiveFoldersManager {
         });
         // createLazyBrowser can't be pinned by default
         this.window.gBrowser.pinTab(tab);
+        if (userContextId) {
+          tab.setAttribute("zenDefaultUserContextId", "true");
+        }
         if (item.icon) {
           this.window.gBrowser.setIcon(tab, item.icon);
           if (tab.linkedBrowser) {