Merge branch 'v3' into develop

# Conflicts: # CHANGELOG.md # composer.json # src/elements/Product.php # src/elements/Variant.php
craftcms · Oct 13, 2023 · dcf2dbb · dcf2dbb
2 parents e0ed13c + 8b8920a
commit dcf2dbb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/base/Gateway.php b/src/base/Gateway.php
@@ -62,7 +62,12 @@ public function getWebhookUrl(array $params = []): string
 
         $url = UrlHelper::actionUrl('commerce/webhooks/process-webhook', $params);
 
-        return StringHelper::replace($url, Craft::$app->getConfig()->getGeneral()->cpTrigger . '/', '');
+        // Remove the cpTrigger from the url if it's there.
+        if (Craft::$app->getConfig()->getGeneral()->cpTrigger) {
+            $url = StringHelper::replace($url, Craft::$app->getConfig()->getGeneral()->cpTrigger . '/', '');
+        }
+
+        return $url;
     }
 
     /**