Merge branch 'trunk' into wooplug-5275-avoid-multiple-card-info-retrieval-calls-for-woopayments

RadoslavGeorgiev · web-flow · commit a0109043a4fa · 2025-08-07T17:31:12.000+03:00
diff --git a/.github/workflows/release-compile-changelog.yml b/.github/workflows/release-compile-changelog.yml
@@ -162,7 +162,9 @@ jobs:
           echo "Using branch: $SELECTED_BRANCH"
           echo "Generating changelog for version: $VERSION"
 
-          # Normalize the version by removing .0 patch if present, as the changelog command does not support it
+          # Normalize version for use with changelog command.
+          VERSION=$(echo "$VERSION" | grep -oP '\d+\.\d+\.\d+')
+
           if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
             VERSION=${VERSION%.0}
           fi
diff --git a/plugins/woocommerce/changelog/fix-product-not-an-object b/plugins/woocommerce/changelog/fix-product-not-an-object
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix an issue when a product is not an object in html order item
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php
@@ -104,7 +104,7 @@
 			?>
 		</div>
 		<?php
-			$step = $product->get_purchase_quantity_step();
+			$step = $product ? $product->get_purchase_quantity_step() : 1;
 
 			/**
 			* Filter to change the product quantity stepping in the order editor of the admin area.
