Skip to content

Test PR: Prevent non-WC_Orders on the order received page #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boblinthorst wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Test PR: Prevent non-WC_Orders on the order received page #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3a179f
Prevent non-WC_Orders on the order received page
boblinthorst Aug 17, 2023
8884418
Also check for instanceof WC_Order here to be consistent with the imp…
boblinthorst Aug 25, 2023
413e569
Add changefile(s) from automation for the following project(s): wooco…
invalid-email-address Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions plugins/woocommerce/changelog/BL-prevent-non-orders-on-order-received-page
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Avoid a fatal error on the order received page if the order ID is not for a valid order.
2 changes: 1 addition & 1 deletion plugins/woocommerce/includes/shortcodes/class-wc-shortcode-checkout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private static function order_received( $order_id = 0 ) {
if ( $order_id > 0 ) {
$order = wc_get_order( $order_id );

if ( ! $order || ! hash_equals( $order->get_order_key(), $order_key ) ) {
if ( ( ! $order instanceof WC_Order ) || ! hash_equals( $order->get_order_key(), $order_key ) ) {
$order = false;
}
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/woocommerce/includes/wc-cart-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ function wc_clear_cart_after_payment() {
if ( $order_id > 0 ) {
$order = wc_get_order( $order_id );

if ( $order && hash_equals( $order->get_order_key(), $order_key ) ) {
if ( $order instanceof WC_Order && hash_equals( $order->get_order_key(), $order_key ) ) {
WC()->cart->empty_cart();
}
}
Expand All @@ -185,7 +185,7 @@ function wc_clear_cart_after_payment() {
if ( WC()->session->order_awaiting_payment > 0 ) {
$order = wc_get_order( WC()->session->order_awaiting_payment );

if ( $order && $order->get_id() > 0 ) {
if ( $order instanceof WC_Order && $order->get_id() > 0 ) {
// If the order has not failed, or is not pending, the order must have gone through.
if ( ! $order->has_status( array( 'failed', 'pending', 'cancelled' ) ) ) {
WC()->cart->empty_cart();
Expand Down