Merge branch '4.x' into 4.7

craftcms · Oct 16, 2024 · c8e7cdf · c8e7cdf
2 parents 0225837 + 1b36426
commit c8e7cdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a PHP error that could occur when creating a subscription. ([#3710](https://github.com/craftcms/commerce/issues/))
+
 ## 4.6.13 - 2024-10-02
 
 - Fixed a PHP error that could occur when deleting a user with orders. ([#3686](https://github.com/craftcms/commerce/issues/3686))

diff --git a/src/controllers/SubscriptionsController.php b/src/controllers/SubscriptionsController.php
@@ -236,7 +236,7 @@ public function actionSubscribe(): ?Response
             $error = $exception->getMessage();
         }
 
-        if ($returnUrl) {
+        if (!$error && $returnUrl) {
             $returnUrl = $this->getView()->renderObjectTemplate($returnUrl, $subscription);
             $subscriptionRecord = SubscriptionRecord::findOne($subscription->id);
             $subscriptionRecord->returnUrl = $returnUrl;