Merge branch '4.x' into 5.x

# Conflicts: # CHANGELOG.md # src/controllers/SubscriptionsController.php
craftcms · Oct 16, 2024 · cb911ff · cb911ff
2 parents 9e33559 + 1b36426
commit cb911ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Fixed a PHP error that could occur when creating a subscription. ([#3710](https://github.com/craftcms/commerce/issues/))
 - Fixed a bug where inventory items could appear with blank descriptions on the Inventory management screen. ([#3706](https://github.com/craftcms/commerce/issues/3706))
 - Fixed a bug where additional buttons defined with `Order::EVENT_DEFINE_ADDITIONAL_BUTTONS` weren’t displayed on the Edit Order screen. ([#3692](https://github.com/craftcms/commerce/issues/3692))
 - Fixed a bug where email errors weren’t displayed on the Edit Order screen. ([#3693](https://github.com/craftcms/commerce/issues/3693))

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