Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== --- branches/5.2.x/units/orders/orders_event_handler.php +++ branches/5.2.x/units/orders/orders_event_handler.php @@ -520,8 +520,15 @@ WHERE '.$order_idfield.' = '.$order_id; $this->Conn->Query($sql); + // Remember order ID for use on "Thank You" page. $this->Application->StoreVar('front_order_id', $order_id); + + // Remove globals, set from "_createNewCart" method. + $this->Application->DeleteVar('ord_id'); $this->Application->RemoveVar('ord_id'); + + // Prevent accidental access to non-Incomplete order. + $this->Application->removeObject($event->getPrefixSpecial()); $this->Application->Session->SetCookie('shop_cart_cookie', '', strtotime('-1 month')); }