Merge pull request #4343 from craftcms/tommysvr-patch-1

Adjust CP request handling for console requests

Author: lukeholder

src/services/Carts.php

@@ -457,14 +457,21 @@ public function getLoadCartUrl(Order $cart): string
 
         $request = Craft::$app->getRequest();
         $isCpRequest = $request->getIsCpRequest();
-        $request->setIsCpRequest(false);
-        $url = UrlHelper::actionUrl('commerce/cart/load-cart', [
-            'number' => $cart->number,
-            'code' => $token,
-        ]);
-        $request->setIsCpRequest($isCpRequest);
 
-        return $url;
+        if ($isCpRequest) {
+            $request->setIsCpRequest(false);
+        }
+
+        try {
+            return UrlHelper::actionUrl('commerce/cart/load-cart', [
+                'number' => $cart->number,
+                'code' => $token,
+            ]);
+        } finally {
+            if ($isCpRequest) {
+                $request->setIsCpRequest($isCpRequest);
+            }
+        }
     }
 
     /**

src/services/Pdfs.php

@@ -510,11 +510,18 @@ public function getPdfUrl(Order $order, string $option = null, string $pdfHandle
 
         $request = Craft::$app->getRequest();
         $isCpRequest = $request->getIsCpRequest();
-        $request->setIsCpRequest(false);
-        $url = UrlHelper::actionUrl('commerce/downloads/pdf', $params);
-        $request->setIsCpRequest($isCpRequest);
 
-        return $url;
+        if ($isCpRequest) {
+            $request->setIsCpRequest(false);
+        }
+
+        try {
+            return UrlHelper::actionUrl('commerce/downloads/pdf', $params);
+        } finally {
+            if ($isCpRequest) {
+                $request->setIsCpRequest($isCpRequest);
+            }
+        }
     }
 
     /**